diff --git a/mopidy/__main__.py b/mopidy/__main__.py index 06b7658d..1d9e8314 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -22,8 +22,8 @@ except ImportError: instructions on how to install the required dependencies. """)) raise - -Gst.init() +else: + Gst.init() try: # Make GObject's mainloop the event loop for python-dbus diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index 80462767..c5de90dc 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -7,6 +7,7 @@ import threading import gi gi.require_version('Gst', '1.0') from gi.repository import GObject, Gst, GstPbutils +Gst.is_initialized() or Gst.init() import pykka diff --git a/mopidy/audio/scan.py b/mopidy/audio/scan.py index fdd97784..f4bbd3a0 100644 --- a/mopidy/audio/scan.py +++ b/mopidy/audio/scan.py @@ -7,6 +7,7 @@ import time import gi gi.require_version('Gst', '1.0') from gi.repository import Gst, GstPbutils +Gst.is_initialized() or Gst.init() from mopidy import exceptions from mopidy.audio import utils @@ -193,8 +194,6 @@ if __name__ == '__main__': from mopidy.internal import path - Gst.init() - scanner = Scanner(5000) for uri in sys.argv[1:]: if not Gst.uri_is_valid(uri): diff --git a/mopidy/internal/deps.py b/mopidy/internal/deps.py index 6c93a8fa..8947025f 100644 --- a/mopidy/internal/deps.py +++ b/mopidy/internal/deps.py @@ -8,6 +8,7 @@ import sys import gi gi.require_version('Gst', '1.0') from gi.repository import Gst +Gst.is_initialized() or Gst.init() import pkg_resources diff --git a/tests/audio/test_actor.py b/tests/audio/test_actor.py index 0cf89418..41f730e8 100644 --- a/tests/audio/test_actor.py +++ b/tests/audio/test_actor.py @@ -7,8 +7,6 @@ import gi gi.require_version('Gst', '1.0') from gi.repository import Gst -Gst.init() - import mock import pykka diff --git a/tests/audio/test_scan.py b/tests/audio/test_scan.py index 6e3ba001..411ce805 100644 --- a/tests/audio/test_scan.py +++ b/tests/audio/test_scan.py @@ -3,12 +3,6 @@ from __future__ import absolute_import, unicode_literals import os import unittest -import gi -gi.require_version('Gst', '1.0') -from gi.repository import Gst - -Gst.init() - from mopidy import exceptions from mopidy.audio import scan from mopidy.internal import path as path_lib