Upgrade to work with final release of Pykka 0.12

This commit is contained in:
Stein Magnus Jodal 2011-03-30 23:28:54 +02:00
parent 62f07cdd7f
commit 4703783eed
10 changed files with 12 additions and 12 deletions

View File

@ -52,7 +52,7 @@ class LocalBackend(ThreadingActor, Backend):
self.output = None
def pre_start(self):
def on_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()

View File

@ -66,7 +66,7 @@ class SpotifyBackend(ThreadingActor, Backend):
self.output = None
self.spotify = None
def pre_start(self):
def on_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()

View File

@ -40,7 +40,7 @@ class LastfmFrontend(ThreadingActor, BaseFrontend):
self.lastfm = None
self.last_start_time = None
def pre_start(self):
def on_start(self):
try:
username = settings.LASTFM_USERNAME
password_hash = pylast.md5(settings.LASTFM_PASSWORD)
@ -57,7 +57,7 @@ class LastfmFrontend(ThreadingActor, BaseFrontend):
logger.error(u'Error during Last.fm setup: %s', e)
self.stop()
def react(self, message):
def on_receive(self, message):
if message.get('command') == 'started_playing':
self.started_playing(message['track'])
elif message.get('command') == 'stopped_playing':

View File

@ -23,11 +23,11 @@ class MpdFrontend(ThreadingActor, BaseFrontend):
def __init__(self):
self._thread = None
def pre_start(self):
def on_start(self):
self._thread = MpdThread()
self._thread.start()
def react(self, message):
def on_receive(self, message):
pass # Ignore any messages

View File

@ -25,7 +25,7 @@ class AlsaMixer(ThreadingActor, BaseMixer):
def __init__(self):
self._mixer = None
def pre_start(self):
def on_start(self):
self._mixer = alsaaudio.Mixer(self._get_mixer_control())
assert self._mixer is not None

View File

@ -30,7 +30,7 @@ class DenonMixer(ThreadingActor, BaseMixer):
self._levels = ['99'] + ["%(#)02d" % {'#': v} for v in range(0, 99)]
self._volume = 0
def pre_start(self):
def on_start(self):
if self._device is None:
from serial import Serial
self._device = Serial(port=settings.MIXER_EXT_PORT, timeout=0.2)

View File

@ -10,7 +10,7 @@ class GStreamerSoftwareMixer(ThreadingActor, BaseMixer):
def __init__(self):
self.output = None
def pre_start(self):
def on_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()

View File

@ -73,7 +73,7 @@ class NadTalker(ThreadingActor):
def __init__(self):
self._device = None
def pre_start(self):
def on_start(self):
self._open_connection()
self._set_device_to_known_state()

View File

@ -26,7 +26,7 @@ class GStreamerOutput(ThreadingActor, BaseOutput):
def __init__(self):
self.gst_pipeline = None
def pre_start(self):
def on_start(self):
self._setup_gstreamer()
def _setup_gstreamer(self):

View File

@ -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.pre_start()
self.output.on_start()
def tearDown(self):
settings.runtime.clear()