From def361578733d9f26c64d0bf500dd3e15f73f263 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 16 Oct 2012 15:33:26 +0200
Subject: [PATCH] Move registration of audio mixers into a function (#211)

---
 mopidy/audio/__init__.py        |  3 ++-
 mopidy/audio/mixers/__init__.py | 10 ++++++++++
 mopidy/audio/mixers/auto.py     |  5 -----
 mopidy/audio/mixers/fake.py     |  4 ----
 mopidy/audio/mixers/nad.py      |  4 ----
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/mopidy/audio/__init__.py b/mopidy/audio/__init__.py
index a342799b..4a0b0000 100644
--- a/mopidy/audio/__init__.py
+++ b/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):
     """
diff --git a/mopidy/audio/mixers/__init__.py b/mopidy/audio/mixers/__init__.py
index 08ecda0d..26faff02 100644
--- a/mopidy/audio/mixers/__init__.py
+++ b/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])
diff --git a/mopidy/audio/mixers/auto.py b/mopidy/audio/mixers/auto.py
index a4bd8bdb..45806040 100644
--- a/mopidy/audio/mixers/auto.py
+++ b/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)
diff --git a/mopidy/audio/mixers/fake.py b/mopidy/audio/mixers/fake.py
index 0e397e55..e0f1ae1f 100644
--- a/mopidy/audio/mixers/fake.py
+++ b/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)
diff --git a/mopidy/audio/mixers/nad.py b/mopidy/audio/mixers/nad.py
index 39a7b25e..df8c3ec9 100644
--- a/mopidy/audio/mixers/nad.py
+++ b/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