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

Use modify_bin and set_property to construct shoutcast output

Browse Source
This commit is contained in:
Thomas Adamcik 2011-04-25 00:59:53 +02:00
parent 4e232c981c
commit ebe9bba9a9
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mopidy/outputs.py
View File

@ -18,11 +18,12 @@ class ShoutcastOutput(BaseOutput):
if settings.SHOUTCAST_OVERRIDE:
return settings.SHOUTCAST_OVERRIDE
if not settings.SHOUTCAST_SERVER:
return None
return 'audioconvert ! %s ! shout2send name=shoutcast' \
% settings.SHOUTCAST_ENCODER
description = ['audioconvert ! %s ! shout2send' % settings.SHOUTCAST_ENCODER]
options = {
def modify_bin(self, output):
shoutcast = output.get_by_name('shoutcast')
properties = {
u'ip': settings.SHOUTCAST_SERVER,
u'mount': settings.SHOUTCAST_MOUNT,
u'port': settings.SHOUTCAST_PORT,
@ -30,8 +31,6 @@ class ShoutcastOutput(BaseOutput):
u'password': settings.SHOUTCAST_PASSWORD,
}
for key, value in sorted(options.items()):
for key, value in properties.items():
if value:
description.append('%s="%s"' % (key, value))
return u' '.join(description)
shoutcast.set_property(key, value)

4
mopidy/settings.py
View File

@ -183,8 +183,8 @@ MPD_SERVER_PORT = 6600
#:
#: Default::
#:
#: SHOUTCAST_SERVER = None # Must be set to enable shoutcase
SHOUTCAST_SERVER = None
#: SHOUTCAST_SERVER = u'127.0.0.1'
SHOUTCAST_SERVER = u'127.0.0.1'
#: User to authenticate as against Shoutcast server.
#: