From 9267cd43cdb34183dacff3863981b6e207affaf0 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 2 Nov 2010 23:35:56 +0100
Subject: [PATCH] Move BaseMixer from __init__.py to base.py

---
 mopidy/mixers/__init__.py           | 55 -----------------------------
 mopidy/mixers/alsa.py               |  2 +-
 mopidy/mixers/base.py               | 55 +++++++++++++++++++++++++++++
 mopidy/mixers/denon.py              |  2 +-
 mopidy/mixers/dummy.py              |  2 +-
 mopidy/mixers/gstreamer_software.py |  2 +-
 mopidy/mixers/nad.py                |  2 +-
 mopidy/mixers/osa.py                |  2 +-
 8 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100644 mopidy/mixers/base.py

diff --git a/mopidy/mixers/__init__.py b/mopidy/mixers/__init__.py
index 231154ee..e69de29b 100644
--- a/mopidy/mixers/__init__.py
+++ b/mopidy/mixers/__init__.py
@@ -1,55 +0,0 @@
-from mopidy import settings
-
-class BaseMixer(object):
-    """
-    :param backend: a backend instance
-    :type mixer: :class:`mopidy.backends.base.BaseBackend`
-
-    **Settings:**
-
-    - :attr:`mopidy.settings.MIXER_MAX_VOLUME`
-    """
-
-    def __init__(self, backend, *args, **kwargs):
-        self.backend = backend
-        self.amplification_factor = settings.MIXER_MAX_VOLUME / 100.0
-
-    @property
-    def volume(self):
-        """
-        The audio volume
-
-        Integer in range [0, 100]. :class:`None` if unknown. Values below 0 is
-        equal to 0. Values above 100 is equal to 100.
-        """
-        if self._get_volume() is None:
-            return None
-        return int(self._get_volume() / self.amplification_factor)
-
-    @volume.setter
-    def volume(self, volume):
-        volume = int(int(volume) * self.amplification_factor)
-        if volume < 0:
-            volume = 0
-        elif volume > 100:
-            volume = 100
-        self._set_volume(volume)
-
-    def destroy(self):
-        pass
-
-    def _get_volume(self):
-        """
-        Return volume as integer in range [0, 100]. :class:`None` if unknown.
-
-        *MUST be implemented by subclass.*
-        """
-        raise NotImplementedError
-
-    def _set_volume(self, volume):
-        """
-        Set volume as integer in range [0, 100].
-
-        *MUST be implemented by subclass.*
-        """
-        raise NotImplementedError
diff --git a/mopidy/mixers/alsa.py b/mopidy/mixers/alsa.py
index 6eef6da4..f90060ce 100644
--- a/mopidy/mixers/alsa.py
+++ b/mopidy/mixers/alsa.py
@@ -2,7 +2,7 @@ import alsaaudio
 import logging
 
 from mopidy import settings
-from mopidy.mixers import BaseMixer
+from mopidy.mixers.base import BaseMixer
 
 logger = logging.getLogger('mopidy.mixers.alsa')
 
diff --git a/mopidy/mixers/base.py b/mopidy/mixers/base.py
new file mode 100644
index 00000000..231154ee
--- /dev/null
+++ b/mopidy/mixers/base.py
@@ -0,0 +1,55 @@
+from mopidy import settings
+
+class BaseMixer(object):
+    """
+    :param backend: a backend instance
+    :type mixer: :class:`mopidy.backends.base.BaseBackend`
+
+    **Settings:**
+
+    - :attr:`mopidy.settings.MIXER_MAX_VOLUME`
+    """
+
+    def __init__(self, backend, *args, **kwargs):
+        self.backend = backend
+        self.amplification_factor = settings.MIXER_MAX_VOLUME / 100.0
+
+    @property
+    def volume(self):
+        """
+        The audio volume
+
+        Integer in range [0, 100]. :class:`None` if unknown. Values below 0 is
+        equal to 0. Values above 100 is equal to 100.
+        """
+        if self._get_volume() is None:
+            return None
+        return int(self._get_volume() / self.amplification_factor)
+
+    @volume.setter
+    def volume(self, volume):
+        volume = int(int(volume) * self.amplification_factor)
+        if volume < 0:
+            volume = 0
+        elif volume > 100:
+            volume = 100
+        self._set_volume(volume)
+
+    def destroy(self):
+        pass
+
+    def _get_volume(self):
+        """
+        Return volume as integer in range [0, 100]. :class:`None` if unknown.
+
+        *MUST be implemented by subclass.*
+        """
+        raise NotImplementedError
+
+    def _set_volume(self, volume):
+        """
+        Set volume as integer in range [0, 100].
+
+        *MUST be implemented by subclass.*
+        """
+        raise NotImplementedError
diff --git a/mopidy/mixers/denon.py b/mopidy/mixers/denon.py
index 32750f60..e6d752b6 100644
--- a/mopidy/mixers/denon.py
+++ b/mopidy/mixers/denon.py
@@ -4,7 +4,7 @@ from threading import Lock
 from serial import Serial
 
 from mopidy import settings
-from mopidy.mixers import BaseMixer
+from mopidy.mixers.base import BaseMixer
 
 logger = logging.getLogger(u'mopidy.mixers.denon')
 
diff --git a/mopidy/mixers/dummy.py b/mopidy/mixers/dummy.py
index b0ea0e47..12a8137e 100644
--- a/mopidy/mixers/dummy.py
+++ b/mopidy/mixers/dummy.py
@@ -1,4 +1,4 @@
-from mopidy.mixers import BaseMixer
+from mopidy.mixers.base import BaseMixer
 
 class DummyMixer(BaseMixer):
     """Mixer which just stores and reports the chosen volume."""
diff --git a/mopidy/mixers/gstreamer_software.py b/mopidy/mixers/gstreamer_software.py
index 333690ea..9dca3690 100644
--- a/mopidy/mixers/gstreamer_software.py
+++ b/mopidy/mixers/gstreamer_software.py
@@ -1,4 +1,4 @@
-from mopidy.mixers import BaseMixer
+from mopidy.mixers.base import BaseMixer
 
 class GStreamerSoftwareMixer(BaseMixer):
     """Mixer which uses GStreamer to control volume in software."""
diff --git a/mopidy/mixers/nad.py b/mopidy/mixers/nad.py
index 8caa9700..3215a761 100644
--- a/mopidy/mixers/nad.py
+++ b/mopidy/mixers/nad.py
@@ -3,7 +3,7 @@ from serial import Serial
 from multiprocessing import Pipe
 
 from mopidy import settings
-from mopidy.mixers import BaseMixer
+from mopidy.mixers.base import BaseMixer
 from mopidy.utils.process import BaseThread
 
 logger = logging.getLogger('mopidy.mixers.nad')
diff --git a/mopidy/mixers/osa.py b/mopidy/mixers/osa.py
index 3aeaed5c..8d69eb47 100644
--- a/mopidy/mixers/osa.py
+++ b/mopidy/mixers/osa.py
@@ -1,7 +1,7 @@
 from subprocess import Popen, PIPE
 import time
 
-from mopidy.mixers import BaseMixer
+from mopidy.mixers.base import BaseMixer
 
 class OsaMixer(BaseMixer):
     """Mixer which uses ``osascript`` on OS X to control volume."""