Merge remote-tracking branch 'bok/fix-59' into develop

This commit is contained in:
Stein Magnus Jodal 2011-06-07 15:23:37 +02:00
commit b9caba3db2
2 changed files with 21 additions and 0 deletions

View File

@ -0,0 +1,16 @@
import logging
from spotify.manager import SpotifyContainerManager as PyspotifyContainerManager
logger = logging.getLogger('mopidy.backends.spotify.container_manager')
class SpotifyContainerManager(PyspotifyContainerManager):
def __init__(self, session_manager):
PyspotifyContainerManager.__init__(self)
self.session_manager = session_manager
def container_loaded(self, container, userdata):
"""Callback used by pyspotify."""
logger.debug(u'Container loaded')
self.session_manager.refresh_stored_playlists()

View File

@ -12,6 +12,7 @@ from mopidy.backends.spotify.translator import SpotifyTranslator
from mopidy.models import Playlist
from mopidy.gstreamer import GStreamer
from mopidy.utils.process import BaseThread
from mopidy.backends.spotify.container_manager import SpotifyContainerManager
logger = logging.getLogger('mopidy.backends.spotify.session_manager')
@ -35,6 +36,8 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager):
self.connected = threading.Event()
self.session = None
self.container_manager = None
def run_inside_try(self):
self.setup()
self.connect()
@ -61,6 +64,8 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager):
else:
logger.debug(u'Preferring normal bitrate from Spotify')
self.session.set_preferred_bitrate(0)
self.container_manager = SpotifyContainerManager(self)
self.container_manager.watch(self.session.playlist_container())
self.connected.set()
def logged_out(self, session):