Rename mopidy.mixers to mopidy.audio.mixers

mopidy/audio/__init__.py

@@ -13,7 +13,7 @@ from mopidy.backends.base import Backend
 from mopidy.utils import process
 
 # Trigger install of gst mixer plugins
-from mopidy import mixers
+from mopidy.audio import mixers
 
 logger = logging.getLogger('mopidy.audio')
 

mopidy/audio/mixers/__init__.py

@@ -38,6 +38,6 @@ def create_track(label, initial_volume, min_volume, max_volume,
 #
 # Keep these imports at the bottom of the file to avoid cyclic import problems
 # when mixers use the above code.
-from mopidy.mixers.auto import AutoAudioMixer
-from mopidy.mixers.fake import FakeMixer
-from mopidy.mixers.nad import NadMixer
+from .auto import AutoAudioMixer
+from .fake import FakeMixer
+from .nad import NadMixer

mopidy/audio/mixers/auto.py

@@ -5,7 +5,7 @@ import gst
 
 import logging
 
-logger = logging.getLogger('mopidy.mixers.auto')
+logger = logging.getLogger('mopidy.audio.mixers.auto')
 
 
 # TODO: we might want to add some ranking to the mixers we know about?

mopidy/audio/mixers/fake.py

@@ -3,7 +3,7 @@ pygst.require('0.10')
 import gobject
 import gst
 
-from mopidy.mixers import create_track
+from mopidy.audio.mixers import create_track
 
 
 class FakeMixer(gst.Element, gst.ImplementsInterface, gst.interfaces.Mixer):

mopidy/audio/mixers/nad.py

@@ -12,10 +12,10 @@ except ImportError:
 
 from pykka.actor import ThreadingActor
 
-from mopidy.mixers import create_track
+from mopidy.audio.mixers import create_track
 
 
-logger = logging.getLogger('mopidy.mixers.nad')
+logger = logging.getLogger('mopidy.audio.mixers.nad')
 
 
 class NadMixer(gst.Element, gst.ImplementsInterface, gst.interfaces.Mixer):