From 387da5842582b950c329277bafb169d8682caaa3 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Sat, 1 Sep 2012 11:22:05 +0200
Subject: [PATCH] Deprecate and remove shoutcast settings.

I've also verfied that the examples provided will actually work.
---
 mopidy/settings.py       | 54 ----------------------------------------
 mopidy/utils/settings.py | 16 ++++++------
 2 files changed, 9 insertions(+), 61 deletions(-)

diff --git a/mopidy/settings.py b/mopidy/settings.py
index 0bb04823..e7c5593a 100644
--- a/mopidy/settings.py
+++ b/mopidy/settings.py
@@ -184,60 +184,6 @@ MPD_SERVER_MAX_CONNECTIONS = 20
 #:     OUTPUT = u'autoaudiosink'
 OUTPUT = u'autoaudiosink'
 
-#: Hostname of the SHOUTcast server which Mopidy should stream audio to.
-#:
-#: Used by :mod:`mopidy.outputs.shoutcast`.
-#:
-#: Default::
-#:
-#:    SHOUTCAST_OUTPUT_HOSTNAME = u'127.0.0.1'
-SHOUTCAST_OUTPUT_HOSTNAME = u'127.0.0.1'
-
-#: Port of the SHOUTcast server.
-#:
-#: Used by :mod:`mopidy.outputs.shoutcast`.
-#:
-#: Default::
-#:
-#:    SHOUTCAST_OUTPUT_PORT = 8000
-SHOUTCAST_OUTPUT_PORT = 8000
-
-#: User to authenticate as against SHOUTcast server.
-#:
-#: Used by :mod:`mopidy.outputs.shoutcast`.
-#:
-#: Default::
-#:
-#:    SHOUTCAST_OUTPUT_USERNAME = u'source'
-SHOUTCAST_OUTPUT_USERNAME = u'source'
-
-#: Password to authenticate with against SHOUTcast server.
-#:
-#: Used by :mod:`mopidy.outputs.shoutcast`.
-#:
-#: Default::
-#:
-#:    SHOUTCAST_OUTPUT_PASSWORD = u'hackme'
-SHOUTCAST_OUTPUT_PASSWORD = u'hackme'
-
-#: Mountpoint to use for the stream on the SHOUTcast server.
-#:
-#: Used by :mod:`mopidy.outputs.shoutcast`.
-#:
-#: Default::
-#:
-#:    SHOUTCAST_OUTPUT_MOUNT = u'/stream'
-SHOUTCAST_OUTPUT_MOUNT = u'/stream'
-
-#: Encoder to use to process audio data before streaming to SHOUTcast server.
-#:
-#: Used by :mod:`mopidy.outputs.shoutcast`.
-#:
-#: Default::
-#:
-#:     SHOUTCAST_OUTPUT_ENCODER = u'lame mode=stereo bitrate=320'
-SHOUTCAST_OUTPUT_ENCODER = u'lame mode=stereo bitrate=320'
-
 #: Path to the Spotify cache.
 #:
 #: Used by :mod:`mopidy.backends.spotify`.
diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py
index 8060c667..a07075fb 100644
--- a/mopidy/utils/settings.py
+++ b/mopidy/utils/settings.py
@@ -136,29 +136,31 @@ def validate_settings(defaults, settings):
             else:
                 errors[setting] = u'Deprecated setting. Use %s.' % (
                     changed[setting],)
-            continue
 
-        if setting == 'BACKENDS':
+        elif setting == 'BACKENDS':
             if 'mopidy.backends.despotify.DespotifyBackend' in value:
                 errors[setting] = (
                     u'Deprecated setting value. '
                     u'"mopidy.backends.despotify.DespotifyBackend" is no '
                     u'longer available.')
-                continue
 
-        if setting == 'OUTPUTS':
+        elif setting == 'OUTPUTS':
             errors[setting] = (
                 u'Deprecated setting, please change to OUTPUT. OUTPUT expectes '
                 u'a GStreamer bin describing your desired output.')
-            continue
 
-        if setting == 'SPOTIFY_BITRATE':
+        elif setting == 'SPOTIFY_BITRATE':
             if value not in (96, 160, 320):
                 errors[setting] = (
                     u'Unavailable Spotify bitrate. Available bitrates are 96, '
                     u'160, and 320.')
 
-        if setting not in defaults:
+        elif setting.startswith('SHOUTCAST_OUTPUT_'):
+            errors[setting] = (
+                u'Deprecated setting, please set the value via the GStreamer '
+                u'bin in OUTPUT.')
+
+        elif setting not in defaults:
             errors[setting] = u'Unknown setting. Is it misspelled?'
             continue