From 4dd95804f25dd9dee2c260d8a23b2879cb50e2fa Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 14 Sep 2012 00:56:49 +0200
Subject: [PATCH] Rename mopidy.mixers to mopidy.audio.mixers

---
 mopidy/audio/__init__.py              | 2 +-
 mopidy/{ => audio}/mixers/__init__.py | 6 +++---
 mopidy/{ => audio}/mixers/auto.py     | 2 +-
 mopidy/{ => audio}/mixers/fake.py     | 2 +-
 mopidy/{ => audio}/mixers/nad.py      | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename mopidy/{ => audio}/mixers/__init__.py (88%)
 rename mopidy/{ => audio}/mixers/auto.py (97%)
 rename mopidy/{ => audio}/mixers/fake.py (96%)
 rename mopidy/{ => audio}/mixers/nad.py (98%)

diff --git a/mopidy/audio/__init__.py b/mopidy/audio/__init__.py
index 28abd75d..78a53277 100644
--- a/mopidy/audio/__init__.py
+++ b/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')
 
diff --git a/mopidy/mixers/__init__.py b/mopidy/audio/mixers/__init__.py
similarity index 88%
rename from mopidy/mixers/__init__.py
rename to mopidy/audio/mixers/__init__.py
index 317188fc..a0247519 100644
--- a/mopidy/mixers/__init__.py
+++ b/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
diff --git a/mopidy/mixers/auto.py b/mopidy/audio/mixers/auto.py
similarity index 97%
rename from mopidy/mixers/auto.py
rename to mopidy/audio/mixers/auto.py
index f4bd0f92..1233afa3 100644
--- a/mopidy/mixers/auto.py
+++ b/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?
diff --git a/mopidy/mixers/fake.py b/mopidy/audio/mixers/fake.py
similarity index 96%
rename from mopidy/mixers/fake.py
rename to mopidy/audio/mixers/fake.py
index 3c47ef33..c5faa03f 100644
--- a/mopidy/mixers/fake.py
+++ b/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):
diff --git a/mopidy/mixers/nad.py b/mopidy/audio/mixers/nad.py
similarity index 98%
rename from mopidy/mixers/nad.py
rename to mopidy/audio/mixers/nad.py
index de959d41..667dee53 100644
--- a/mopidy/mixers/nad.py
+++ b/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):