From c7ccd0c2d4d332c1d24c1f956c5863decdd37480 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Sun, 24 Apr 2011 23:06:33 +0200
Subject: [PATCH] More fixes with respect to refactoring

---
 mopidy/backends/spotify/session_manager.py | 4 ++--
 mopidy/core.py                             | 7 ++++---
 mopidy/mixers/gstreamer_software.py        | 4 ++--
 mopidy/settings.py                         | 7 -------
 mopidy/utils/settings.py                   | 2 ++
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/mopidy/backends/spotify/session_manager.py b/mopidy/backends/spotify/session_manager.py
index e92fe89e..2b768b20 100644
--- a/mopidy/backends/spotify/session_manager.py
+++ b/mopidy/backends/spotify/session_manager.py
@@ -10,7 +10,7 @@ from mopidy import get_version, settings
 from mopidy.backends.base import Backend
 from mopidy.backends.spotify.translator import SpotifyTranslator
 from mopidy.models import Playlist
-from mopidy.outputs.base import BaseOutput
+from mopidy.gstreamer import GStreamer
 from mopidy.utils.process import BaseThread
 
 logger = logging.getLogger('mopidy.backends.spotify.session_manager')
@@ -40,7 +40,7 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager):
         self.connect()
 
     def setup(self):
-        output_refs = ActorRegistry.get_by_class(BaseOutput)
+        output_refs = ActorRegistry.get_by_class(GStreamer)
         assert len(output_refs) == 1, 'Expected exactly one running output.'
         self.output = output_refs[0].proxy()
 
diff --git a/mopidy/core.py b/mopidy/core.py
index 093f783d..60e25ef1 100644
--- a/mopidy/core.py
+++ b/mopidy/core.py
@@ -5,6 +5,7 @@ import time
 from pykka.registry import ActorRegistry
 
 from mopidy import get_version, settings, OptionalDependencyError
+from mopidy.gstreamer import GStreamer
 from mopidy.utils import get_class
 from mopidy.utils.log import setup_logging
 from mopidy.utils.path import get_or_create_folder, get_or_create_file
@@ -18,7 +19,7 @@ def main():
     setup_logging(options.verbosity_level, options.save_debug_log)
     setup_settings()
     setup_gobject_loop()
-    setup_output()
+    setup_gstreamer()
     setup_mixer()
     setup_backend()
     setup_frontends()
@@ -54,8 +55,8 @@ def setup_gobject_loop():
     gobject_loop.start()
     return gobject_loop
 
-def setup_output():
-    return get_class(settings.OUTPUT).start().proxy()
+def setup_gstreamer():
+    return GStreamer().start().proxy()
 
 def setup_mixer():
     return get_class(settings.MIXER).start().proxy()
diff --git a/mopidy/mixers/gstreamer_software.py b/mopidy/mixers/gstreamer_software.py
index d6365b4b..87602772 100644
--- a/mopidy/mixers/gstreamer_software.py
+++ b/mopidy/mixers/gstreamer_software.py
@@ -2,7 +2,7 @@ from pykka.actor import ThreadingActor
 from pykka.registry import ActorRegistry
 
 from mopidy.mixers.base import BaseMixer
-from mopidy.outputs.base import BaseOutput
+from mopidy.gstreamer import GStreamer
 
 class GStreamerSoftwareMixer(ThreadingActor, BaseMixer):
     """Mixer which uses GStreamer to control volume in software."""
@@ -11,7 +11,7 @@ class GStreamerSoftwareMixer(ThreadingActor, BaseMixer):
         self.output = None
 
     def on_start(self):
-        output_refs = ActorRegistry.get_by_class(BaseOutput)
+        output_refs = ActorRegistry.get_by_class(GStreamer)
         assert len(output_refs) == 1, 'Expected exactly one running output.'
         self.output = output_refs[0].proxy()
 
diff --git a/mopidy/settings.py b/mopidy/settings.py
index 7f41cf69..e2d85c88 100644
--- a/mopidy/settings.py
+++ b/mopidy/settings.py
@@ -143,13 +143,6 @@ MIXER_EXT_SPEAKERS_B = None
 #:     MIXER_MAX_VOLUME = 100
 MIXER_MAX_VOLUME = 100
 
-#: Audio output handler to use.
-#:
-#: Default::
-#:
-#:     OUTPUT = u'mopidy.outputs.gstreamer.GStreamerOutput'
-OUTPUT = u'mopidy.outputs.gstreamer.GStreamerOutput'
-
 #: Which address Mopidy's MPD server should bind to.
 #:
 #:Examples:
diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py
index 529c6fb1..b907e85f 100644
--- a/mopidy/utils/settings.py
+++ b/mopidy/utils/settings.py
@@ -97,9 +97,11 @@ def validate_settings(defaults, settings):
         'DUMP_LOG_FILENAME': 'DEBUG_LOG_FILENAME',
         'DUMP_LOG_FORMAT': 'DEBUG_LOG_FORMAT',
         'FRONTEND': 'FRONTENDS',
+        'GSTREAMER_AUDIO_SINK': 'CUSTOM_OUTPUT',
         'LOCAL_MUSIC_FOLDER': 'LOCAL_MUSIC_PATH',
         'LOCAL_PLAYLIST_FOLDER': 'LOCAL_PLAYLIST_PATH',
         'LOCAL_TAG_CACHE': 'LOCAL_TAG_CACHE_FILE',
+        'OUTPUT': None,
         'SERVER': None,
         'SERVER_HOSTNAME': 'MPD_SERVER_HOSTNAME',
         'SERVER_PORT': 'MPD_SERVER_PORT',