From 5a0199ac200ac1707cc0b4ab6f2e7454c1685f66 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Sat, 1 Sep 2012 16:12:38 +0200
Subject: [PATCH] Remove MIXER_MAX_VOLUME setting.

---
 mopidy/mixers/base.py    |  9 ++-------
 mopidy/settings.py       | 11 -----------
 mopidy/utils/settings.py |  1 +
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/mopidy/mixers/base.py b/mopidy/mixers/base.py
index 82783be1..a387c143 100644
--- a/mopidy/mixers/base.py
+++ b/mopidy/mixers/base.py
@@ -5,13 +5,8 @@ from mopidy import listeners, settings
 logger = logging.getLogger('mopidy.mixers')
 
 class BaseMixer(object):
-    """
-    **Settings:**
-
-    - :attr:`mopidy.settings.MIXER_MAX_VOLUME`
-    """
-
-    amplification_factor = settings.MIXER_MAX_VOLUME / 100.0
+    # TODO: remove completly
+    amplification_factor = 1.0
 
     @property
     def volume(self):
diff --git a/mopidy/settings.py b/mopidy/settings.py
index 4e8370e6..72e805bf 100644
--- a/mopidy/settings.py
+++ b/mopidy/settings.py
@@ -126,17 +126,6 @@ MIXER = u'autoaudiomixer'
 #:     MIXER_TRACK = None
 MIXER_TRACK = None
 
-#: The maximum volume. Integer in the range 0 to 100.
-#:
-#: If this settings is set to 80, the mixer will set the actual volume to 80
-#: when asked to set it to 100.
-#:
-#: Default::
-#:
-#:     MIXER_MAX_VOLUME = 100
-# TODO: re-add support for this.
-MIXER_MAX_VOLUME = 100
-
 #: Which address Mopidy's MPD server should bind to.
 #:
 #:Examples:
diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py
index 372dd8a0..70d45721 100644
--- a/mopidy/utils/settings.py
+++ b/mopidy/utils/settings.py
@@ -125,6 +125,7 @@ def validate_settings(defaults, settings):
         'MIXER_EXT_PORT': None,
         'MIXER_EXT_SPEAKERS_A': None,
         'MIXER_EXT_SPEAKERS_B': None,
+        'MIXER_MAX_VOLUME': None,
         'SERVER': None,
         'SERVER_HOSTNAME': 'MPD_SERVER_HOSTNAME',
         'SERVER_PORT': 'MPD_SERVER_PORT',