From 1c233a3f8a971377de4ee594ba3f3e9817bb40db Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Mon, 25 Apr 2011 17:14:31 +0200 Subject: [PATCH] Replace CustomOutput with override for LocalOutput --- mopidy/outputs.py | 8 +++----- mopidy/settings.py | 4 ++-- mopidy/utils/settings.py | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/mopidy/outputs.py b/mopidy/outputs.py index 229f273e..6aff0a0f 100644 --- a/mopidy/outputs.py +++ b/mopidy/outputs.py @@ -1,14 +1,12 @@ from mopidy import settings from mopidy.gstreamer import BaseOutput -class LocalAudioOutput(BaseOutput): +class LocalOutput(BaseOutput): def describe_bin(self): + if settings.LOCALOUTPUT_OVERRIDE: + return settings.LOCALOUTPUT_OVERRIDE return 'autoaudiosink' -class CustomOutput(BaseOutput): - def describe_bin(self): - return settings.CUSTOM_OUTPUT - class NullOutput(BaseOutput): def describe_bin(self): return 'fakesink' diff --git a/mopidy/settings.py b/mopidy/settings.py index 9db30a11..915363b4 100644 --- a/mopidy/settings.py +++ b/mopidy/settings.py @@ -70,8 +70,8 @@ FRONTENDS = ( #: #: Default:: #: -#: CUSTOM_OUTPUT = None -CUSTOM_OUTPUT= None +#: LOCALOUTPUT_OVERRIDE = None +LOCALOUTPUT_OVERRIDE = None #: Your `Last.fm `_ username. #: diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py index b907e85f..6c678e4b 100644 --- a/mopidy/utils/settings.py +++ b/mopidy/utils/settings.py @@ -97,7 +97,7 @@ def validate_settings(defaults, settings): 'DUMP_LOG_FILENAME': 'DEBUG_LOG_FILENAME', 'DUMP_LOG_FORMAT': 'DEBUG_LOG_FORMAT', 'FRONTEND': 'FRONTENDS', - 'GSTREAMER_AUDIO_SINK': 'CUSTOM_OUTPUT', + 'GSTREAMER_AUDIO_SINK': 'LOCALOUTPUT_OVERRIDE', 'LOCAL_MUSIC_FOLDER': 'LOCAL_MUSIC_PATH', 'LOCAL_PLAYLIST_FOLDER': 'LOCAL_PLAYLIST_PATH', 'LOCAL_TAG_CACHE': 'LOCAL_TAG_CACHE_FILE',