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
This commit is contained in:
parent
5f8374a174
commit
ceda421510
@ -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:
|
||||
|
||||
@ -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/>`_.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user