From 133a22ef978108fdfd61706558729fee7c2a5925 Mon Sep 17 00:00:00 2001 From: Johannes Knutsen Date: Tue, 23 Nov 2010 00:26:23 +0100 Subject: [PATCH 1/3] add SPOTIFY_HIGH_BITRATE setting to enable streaming of Spotify's high bitrate streams --- mopidy/backends/libspotify/session_manager.py | 6 ++++++ mopidy/settings.py | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/mopidy/backends/libspotify/session_manager.py b/mopidy/backends/libspotify/session_manager.py index 5831b713..e70e8cfa 100644 --- a/mopidy/backends/libspotify/session_manager.py +++ b/mopidy/backends/libspotify/session_manager.py @@ -36,6 +36,12 @@ class LibspotifySessionManager(SpotifySessionManager, BaseThread): logger.info(u'Connected to Spotify') self.session = session self.connected.set() + if settings.SPOTIFY_HIGH_BITRATE: + logger.debug(u'Prefer high bitrate') + self.session.set_preferred_bitrate(1) + else: + logger.debug(u'Prefer normal bitrate') + self.session.set_preferred_bitrate(0) def logged_out(self, session): """Callback used by pyspotify""" diff --git a/mopidy/settings.py b/mopidy/settings.py index 4f60ee99..dc315064 100644 --- a/mopidy/settings.py +++ b/mopidy/settings.py @@ -183,3 +183,8 @@ SPOTIFY_USERNAME = u'' #: #: Used by :mod:`mopidy.backends.libspotify`. SPOTIFY_PASSWORD = u'' + +#: Do you prefer high bitrate (320k)? +#: +#: Used by :mod:`mopidy.backends.libspotify`. +SPOTIFY_HIGH_BITRATE = False From 975b264c2d70797184c806f65b03cf3549448895 Mon Sep 17 00:00:00 2001 From: Johannes Knutsen Date: Tue, 23 Nov 2010 00:33:14 +0100 Subject: [PATCH 2/3] set connection connected after preferred bitrate is set --- mopidy/backends/libspotify/session_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mopidy/backends/libspotify/session_manager.py b/mopidy/backends/libspotify/session_manager.py index e70e8cfa..8a79088f 100644 --- a/mopidy/backends/libspotify/session_manager.py +++ b/mopidy/backends/libspotify/session_manager.py @@ -35,13 +35,13 @@ class LibspotifySessionManager(SpotifySessionManager, BaseThread): """Callback used by pyspotify""" logger.info(u'Connected to Spotify') self.session = session - self.connected.set() if settings.SPOTIFY_HIGH_BITRATE: logger.debug(u'Prefer high bitrate') self.session.set_preferred_bitrate(1) else: logger.debug(u'Prefer normal bitrate') self.session.set_preferred_bitrate(0) + self.connected.set() def logged_out(self, session): """Callback used by pyspotify""" From 73ed9920c43d741751ba5c17318d94c5fd1bffe5 Mon Sep 17 00:00:00 2001 From: Johannes Knutsen Date: Tue, 23 Nov 2010 00:36:02 +0100 Subject: [PATCH 3/3] Document the default value on the Spotify preferred bitrate setting --- mopidy/settings.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mopidy/settings.py b/mopidy/settings.py index dc315064..1aaa4318 100644 --- a/mopidy/settings.py +++ b/mopidy/settings.py @@ -187,4 +187,8 @@ SPOTIFY_PASSWORD = u'' #: Do you prefer high bitrate (320k)? #: #: Used by :mod:`mopidy.backends.libspotify`. +# +#: Default:: +#: +#: SPOTIFY_HIGH_BITRATE = False # 160k SPOTIFY_HIGH_BITRATE = False