Move registration of audio mixers into a function (#211)

mopidy/audio/__init__.py

@@ -10,12 +10,13 @@ from pykka.actor import ThreadingActor
 from mopidy import settings, utils
 from mopidy.utils import process
 
-# Trigger install of gst mixer plugins
 from . import mixers
 from .listener import AudioListener
 
 logger = logging.getLogger('mopidy.audio')
 
+mixers.register_mixers()
+
 
 class Audio(ThreadingActor):
     """

mopidy/audio/mixers/__init__.py

@@ -42,3 +42,13 @@ def create_track(label, initial_volume, min_volume, max_volume,
 from .auto import AutoAudioMixer
 from .fake import FakeMixer
 from .nad import NadMixer
+
+
+def register_mixer(mixer_class):
+    gobject.type_register(mixer_class)
+    gst.element_register(
+        mixer_class, mixer_class.__name__.lower(), gst.RANK_MARGINAL)
+
+
+def register_mixers():
+    map(register_mixer, [AutoAudioMixer, FakeMixer, NadMixer])

mopidy/audio/mixers/auto.py

@@ -1,6 +1,5 @@
 import pygst
 pygst.require('0.10')
-import gobject
 import gst
 
 import logging
@@ -67,7 +66,3 @@ class AutoAudioMixer(gst.Bin):
             if track.flags & flags:
                 return True
         return False
-
-
-gobject.type_register(AutoAudioMixer)
-gst.element_register(AutoAudioMixer, 'autoaudiomixer', gst.RANK_MARGINAL)

mopidy/audio/mixers/fake.py

@@ -42,7 +42,3 @@ class FakeMixer(gst.Element, gst.ImplementsInterface, gst.interfaces.Mixer):
 
     def set_record(self, track, record):
         pass
-
-
-gobject.type_register(FakeMixer)
-gst.element_register(FakeMixer, 'fakemixer', gst.RANK_MARGINAL)

mopidy/audio/mixers/nad.py

@@ -76,10 +76,6 @@ class NadMixer(gst.Element, gst.ImplementsInterface, gst.interfaces.Mixer):
         ).proxy()
 
 
-gobject.type_register(NadMixer)
-gst.element_register(NadMixer, 'nadmixer', gst.RANK_MARGINAL)
-
-
 class NadTalker(ThreadingActor):
     """
     Independent thread which does the communication with the NAD amplifier