From ceda42151037c20571635e7bd3f8c1ee89d1ecd9 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Sat, 1 Sep 2012 15:59:38 +0200
Subject: [PATCH] Cleanup error handling of bad GStreamer settings.

No need to have a GStreamerError, we can just let the GErrors bubble now that
we are initialising in the main thread.

Conflicts:

	mopidy/gstreamer.py
---
 mopidy/core.py      | 4 +---
 mopidy/gstreamer.py | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/mopidy/core.py b/mopidy/core.py
index 6e6972f5..9ae461d8 100644
--- a/mopidy/core.py
+++ b/mopidy/core.py
@@ -20,7 +20,7 @@ sys.argv[1:] = gstreamer_args
 
 from mopidy import (get_version, settings, OptionalDependencyError,
     SettingsError, DATA_PATH, SETTINGS_PATH, SETTINGS_FILE)
-from mopidy.gstreamer import GStreamer, GStreamerError
+from mopidy.gstreamer import GStreamer
 from mopidy.utils import get_class
 from mopidy.utils.deps import list_deps_optparse_callback
 from mopidy.utils.log import setup_logging
@@ -46,8 +46,6 @@ def main():
         loop.run()
     except SettingsError as e:
         logger.error(e.message)
-    except GStreamerError as e:
-        logger.error(e)
     except KeyboardInterrupt:
         logger.info(u'Interrupted. Exiting...')
     except Exception as e:
diff --git a/mopidy/gstreamer.py b/mopidy/gstreamer.py
index ab4fd59b..866c8868 100644
--- a/mopidy/gstreamer.py
+++ b/mopidy/gstreamer.py
@@ -11,13 +11,10 @@ from pykka.registry import ActorRegistry
 from mopidy import settings
 from mopidy.backends.base import Backend
 
+
 logger = logging.getLogger('mopidy.gstreamer')
 
 
-class GStreamerError(Exception):
-    pass
-
-
 class GStreamer(ThreadingActor):
     """
     Audio output through `GStreamer <http://gstreamer.freedesktop.org/>`_.