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

Merge branch 'develop' of github.com:mopidy/mopidy into develop

Browse Source
This commit is contained in:
Thomas Adamcik 2011-07-17 02:12:03 +02:00
commit 6f268cd491
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mopidy/backends/spotify/session_manager.py
View File

@ -118,6 +118,7 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager):
'channels': channels, 'channels': channels,
} }
self.gstreamer.emit_data(capabilites, bytes(frames)) self.gstreamer.emit_data(capabilites, bytes(frames))
return num_frames
def play_token_lost(self, session): def play_token_lost(self, session):
"""Callback used by pyspotify""" """Callback used by pyspotify"""

3
mopidy/settings.py
View File

@ -26,7 +26,8 @@ BACKENDS = (
#: details on the format. #: details on the format.
CONSOLE_LOG_FORMAT = u'%(levelname)-8s %(message)s' CONSOLE_LOG_FORMAT = u'%(levelname)-8s %(message)s'
#: Which GStreamer bin description to use in :class:`mopidy.outputs.CustomOutput`. #: Which GStreamer bin description to use in
#: :class:`mopidy.outputs.custom.CustomOutput`.
#: #:
#: Default:: #: Default::
#: #: