From e1cc1dfe483de0658caeb6d1b408148db05982c4 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Thu, 5 May 2011 20:17:28 +0200 Subject: [PATCH] Rename prepare_playback to prepare_change --- mopidy/backends/local/__init__.py | 2 +- mopidy/backends/spotify/playback.py | 4 ++-- mopidy/gstreamer.py | 2 +- tests/gstreamer_test.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index 5fb7f1cb..cc039ce0 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -75,7 +75,7 @@ class LocalPlaybackProvider(BasePlaybackProvider): return self.backend.gstreamer.pause_playback().get() def play(self, track): - self.backend.gstreamer.prepare_playback() + self.backend.gstreamer.prepare_change() self.backend.gstreamer.set_uri(track.uri).get() return self.backend.gstreamer.start_playback().get() diff --git a/mopidy/backends/spotify/playback.py b/mopidy/backends/spotify/playback.py index 7c67a7c1..dc328fc9 100644 --- a/mopidy/backends/spotify/playback.py +++ b/mopidy/backends/spotify/playback.py @@ -19,7 +19,7 @@ class SpotifyPlaybackProvider(BasePlaybackProvider): self.backend.spotify.session.load( Link.from_string(track.uri).as_track()) self.backend.spotify.session.play(1) - self.backend.gstreamer.prepare_playback() + self.backend.gstreamer.prepare_change() self.backend.gstreamer.set_uri('appsrc://') self.backend.gstreamer.start_playback() self.backend.gstreamer.set_metadata(track) @@ -32,7 +32,7 @@ class SpotifyPlaybackProvider(BasePlaybackProvider): return self.seek(self.backend.playback.time_position) def seek(self, time_position): - self.backend.gstreamer.prepare_playback() + self.backend.gstreamer.prepare_change() self.backend.spotify.session.seek(time_position) self.backend.gstreamer.start_playback() return True diff --git a/mopidy/gstreamer.py b/mopidy/gstreamer.py index 66735beb..95953d4a 100644 --- a/mopidy/gstreamer.py +++ b/mopidy/gstreamer.py @@ -189,7 +189,7 @@ class GStreamer(ThreadingActor): def pause_playback(self): return self._set_state(gst.STATE_PAUSED) - def prepare_playback(self): + def prepare_change(self): return self._set_state(gst.STATE_READY) def stop_playback(self): diff --git a/tests/gstreamer_test.py b/tests/gstreamer_test.py index d01e694c..0b9a559e 100644 --- a/tests/gstreamer_test.py +++ b/tests/gstreamer_test.py @@ -24,7 +24,7 @@ class GStreamerTest(unittest.TestCase): self.gstreamer.on_start() def prepare_uri(self, uri): - self.gstreamer.prepare_playback() + self.gstreamer.prepare_change() self.gstreamer.set_uri(uri) def tearDown(self):