diff --git a/docs/installation/index.rst b/docs/installation/index.rst index 3ef5af99..d1fbd0f6 100644 --- a/docs/installation/index.rst +++ b/docs/installation/index.rst @@ -25,7 +25,7 @@ Otherwise, make sure you got the required dependencies installed. - Python >= 2.6, < 3 -- `Pykka `_ >= 0.11 +- `Pykka `_ >= 0.12 - GStreamer >= 0.10, with Python bindings. See :doc:`gstreamer`. diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index b4a407f9..58cb405d 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -52,7 +52,7 @@ class LocalBackend(ThreadingActor, Backend): self.output = None - def post_start(self): + def pre_start(self): output_refs = ActorRegistry.get_by_class(BaseOutput) assert len(output_refs) == 1, 'Expected exactly one running output.' self.output = output_refs[0].proxy() diff --git a/mopidy/backends/spotify/__init__.py b/mopidy/backends/spotify/__init__.py index ff8e542c..9f2cd99f 100644 --- a/mopidy/backends/spotify/__init__.py +++ b/mopidy/backends/spotify/__init__.py @@ -66,7 +66,7 @@ class SpotifyBackend(ThreadingActor, Backend): self.output = None self.spotify = None - def post_start(self): + def pre_start(self): output_refs = ActorRegistry.get_by_class(BaseOutput) assert len(output_refs) == 1, 'Expected exactly one running output.' self.output = output_refs[0].proxy() diff --git a/mopidy/frontends/lastfm.py b/mopidy/frontends/lastfm.py index 84e612fa..8d6cf2a8 100644 --- a/mopidy/frontends/lastfm.py +++ b/mopidy/frontends/lastfm.py @@ -40,7 +40,7 @@ class LastfmFrontend(ThreadingActor, BaseFrontend): self.lastfm = None self.last_start_time = None - def post_start(self): + def pre_start(self): try: username = settings.LASTFM_USERNAME password_hash = pylast.md5(settings.LASTFM_PASSWORD) diff --git a/mopidy/frontends/mpd/__init__.py b/mopidy/frontends/mpd/__init__.py index 608d9586..6c39a09b 100644 --- a/mopidy/frontends/mpd/__init__.py +++ b/mopidy/frontends/mpd/__init__.py @@ -23,7 +23,7 @@ class MpdFrontend(ThreadingActor, BaseFrontend): def __init__(self): self._thread = None - def post_start(self): + def pre_start(self): self._thread = MpdThread() self._thread.start() diff --git a/mopidy/mixers/alsa.py b/mopidy/mixers/alsa.py index f19819e8..a7f5431e 100644 --- a/mopidy/mixers/alsa.py +++ b/mopidy/mixers/alsa.py @@ -25,7 +25,7 @@ class AlsaMixer(ThreadingActor, BaseMixer): def __init__(self): self._mixer = None - def post_start(self): + def pre_start(self): self._mixer = alsaaudio.Mixer(self._get_mixer_control()) assert self._mixer is not None diff --git a/mopidy/mixers/denon.py b/mopidy/mixers/denon.py index 832e7d1a..966f804a 100644 --- a/mopidy/mixers/denon.py +++ b/mopidy/mixers/denon.py @@ -30,7 +30,7 @@ class DenonMixer(ThreadingActor, BaseMixer): self._levels = ['99'] + ["%(#)02d" % {'#': v} for v in range(0, 99)] self._volume = 0 - def post_start(self): + def pre_start(self): if self._device is None: from serial import Serial self._device = Serial(port=settings.MIXER_EXT_PORT, timeout=0.2) diff --git a/mopidy/mixers/gstreamer_software.py b/mopidy/mixers/gstreamer_software.py index 2125aab3..b93e1b52 100644 --- a/mopidy/mixers/gstreamer_software.py +++ b/mopidy/mixers/gstreamer_software.py @@ -10,7 +10,7 @@ class GStreamerSoftwareMixer(ThreadingActor, BaseMixer): def __init__(self): self.output = None - def post_start(self): + def pre_start(self): output_refs = ActorRegistry.get_by_class(BaseOutput) assert len(output_refs) == 1, 'Expected exactly one running output.' self.output = output_refs[0].proxy() diff --git a/mopidy/mixers/nad.py b/mopidy/mixers/nad.py index 65eff58c..db4b40c1 100644 --- a/mopidy/mixers/nad.py +++ b/mopidy/mixers/nad.py @@ -73,7 +73,7 @@ class NadTalker(ThreadingActor): def __init__(self): self._device = None - def post_start(self): + def pre_start(self): self._open_connection() self._set_device_to_known_state() diff --git a/mopidy/outputs/gstreamer.py b/mopidy/outputs/gstreamer.py index 0eb716ec..37bfb35c 100644 --- a/mopidy/outputs/gstreamer.py +++ b/mopidy/outputs/gstreamer.py @@ -26,7 +26,7 @@ class GStreamerOutput(ThreadingActor, BaseOutput): def __init__(self): self.gst_pipeline = None - def post_start(self): + def pre_start(self): self._setup_gstreamer() def _setup_gstreamer(self): diff --git a/requirements/core.txt b/requirements/core.txt index f0f0bd39..aaae84f8 100644 --- a/requirements/core.txt +++ b/requirements/core.txt @@ -1 +1 @@ -Pykka >= 0.11 +Pykka >= 0.12 diff --git a/tests/outputs/gstreamer_test.py b/tests/outputs/gstreamer_test.py index 801f476e..4e101319 100644 --- a/tests/outputs/gstreamer_test.py +++ b/tests/outputs/gstreamer_test.py @@ -19,7 +19,7 @@ class GStreamerOutputTest(unittest.TestCase): settings.BACKENDS = ('mopidy.backends.local.LocalBackend',) self.song_uri = path_to_uri(data_folder('song1.wav')) self.output = GStreamerOutput() - self.output.post_start() + self.output.pre_start() def tearDown(self): settings.runtime.clear()