andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unify naming of output settings

Browse Source
This commit is contained in:
Thomas Adamcik 2011-04-25 17:30:55 +02:00
parent 5c19bf8434
commit eceba71273
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mopidy/outputs.py
View File

@ -3,8 +3,8 @@ from mopidy.gstreamer import BaseOutput
class LocalOutput(BaseOutput):
def describe_bin(self):
if settings.LOCALOUTPUT_OVERRIDE:
return settings.LOCALOUTPUT_OVERRIDE
if settings.LOCAL_OUTPUT_OVERRIDE:
return settings.LOCAL_OUTPUT_OVERRIDE
return 'autoaudiosink'
class NullOutput(BaseOutput):
@ -13,19 +13,19 @@ class NullOutput(BaseOutput):
class ShoutcastOutput(BaseOutput):
def describe_bin(self):
if settings.SHOUTCAST_OVERRIDE:
return settings.SHOUTCAST_OVERRIDE
if settings.SHOUTCAST_OUTPUT_OVERRIDE:
return settings.SHOUTCAST_OUTPUT_OVERRIDE
return 'audioconvert ! %s ! shout2send name=shoutcast' \
% settings.SHOUTCAST_ENCODER
% settings.SHOUTCAST_OUTPUT_ENCODER
def modify_bin(self, output):
if settings.SHOUTCAST_OVERRIDE:
if settings.SHOUTCAST_OUTPUT_OVERRIDE:
return
self.set_properties(output.get_by_name('shoutcast'), {
u'ip': settings.SHOUTCAST_SERVER,
u'mount': settings.SHOUTCAST_MOUNT,
u'port': settings.SHOUTCAST_PORT,
u'username': settings.SHOUTCAST_USER,
u'password': settings.SHOUTCAST_PASSWORD,
u'ip': settings.SHOUTCAST_OUTPUT_SERVER,
u'mount': settings.SHOUTCAST_OUTPUT_MOUNT,
u'port': settings.SHOUTCAST_OUTPUT_PORT,
u'username': settings.SHOUTCAST_OUTPUT_USER,
u'password': settings.SHOUTCAST_OUTPUT_PASSWORD,
})

34
mopidy/settings.py
View File

@ -70,8 +70,8 @@ FRONTENDS = (
#:
#: Default::
#:
#: LOCALOUTPUT_OVERRIDE = None
LOCALOUTPUT_OVERRIDE = None
#: LOCAL_OUTPUT_OVERRIDE = None
LOCAL_OUTPUT_OVERRIDE = None
#: Your `Last.fm <http://www.last.fm/>`_ username.
#:
@ -183,46 +183,46 @@ MPD_SERVER_PORT = 6600
#:
#: Default::
#:
#: SHOUTCAST_SERVER = u'127.0.0.1'
SHOUTCAST_SERVER = u'127.0.0.1'
#: SHOUTCAST_OUTPUT_SERVER = u'127.0.0.1'
SHOUTCAST_OUTPUT_SERVER = u'127.0.0.1'
#: User to authenticate as against Shoutcast server.
#:
#: Default::
#:
#: SHOUTCAST_USER = u'source'
SHOUTCAST_USER = u'source'
#: SHOUTCAST_OUTPUT_USER = u'source'
SHOUTCAST_OUTPUT_USER = u'source'
#: Password to authenticate with against Shoutcast server.
#:
#: Default::
#:
#: SHOUTCAST_PASSWORD = u'hackme'
SHOUTCAST_PASSWORD = u'hackme'
#: SHOUTCAST_OUTPUT_PASSWORD = u'hackme'
SHOUTCAST_OUTPUT_PASSWORD = u'hackme'
#: Port to use for streaming to Shoutcast server.
#:
#: Default::
#:
#: SHOUTCAST_PORT = 8000
SHOUTCAST_PORT = 8000
#: SHOUTCAST_OUTPUT_PORT = 8000
SHOUTCAST_OUTPUT_PORT = 8000
#: Mountpoint to use for the stream on the Shoutcast server.
#:
#: Default::
#:
#: SHOUTCAST_MOUNT = u'/stream'
SHOUTCAST_MOUNT = u'/stream'
#: SHOUTCAST_OUTPUT_MOUNT = u'/stream'
SHOUTCAST_OUTPUT_MOUNT = u'/stream'
#: Encoder to use to process audio data before streaming.
#:
#: Default::
#:
#: SHOUTCAST_ENCODER = u'lame mode=stereo bitrate=320'
SHOUTCAST_ENCODER = u'lame mode=stereo bitrate=320'
#: SHOUTCAST_OUTPUT_ENCODER = u'lame mode=stereo bitrate=320'
SHOUTCAST_OUTPUT_ENCODER = u'lame mode=stereo bitrate=320'
#: Overrides to allow advanced setup of shoutcast. Using this settings implies
#: that all other SHOUTCAST_* settings will be ignored.
#: that all other SHOUTCAST_OUTPUT_* settings will be ignored.
#:
#: Examples:
#:
@ -235,8 +235,8 @@ SHOUTCAST_ENCODER = u'lame mode=stereo bitrate=320'
#:
#: Default::
#:
#: SHOUTCAST_OVERRIDE = None
SHOUTCAST_OVERRIDE = None
#: SHOUTCAST_OUTPUT_OVERRIDE = None
SHOUTCAST_OUTPUT_OVERRIDE = None
#: Path to the Spotify cache.
#:

2
mopidy/utils/settings.py
View File

@ -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': 'LOCALOUTPUT_OVERRIDE',
'GSTREAMER_AUDIO_SINK': 'LOCAL_OUTPUT_OVERRIDE',
'LOCAL_MUSIC_FOLDER': 'LOCAL_MUSIC_PATH',
'LOCAL_PLAYLIST_FOLDER': 'LOCAL_PLAYLIST_PATH',
'LOCAL_TAG_CACHE': 'LOCAL_TAG_CACHE_FILE',