diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index 3d10a63c..cc09271a 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -12,7 +12,7 @@ from mopidy.backends.base import (Backend, CurrentPlaylistController, BasePlaybackProvider, StoredPlaylistsController, BaseStoredPlaylistsProvider) from mopidy.models import Playlist, Track, Album -from mopidy.outputs.gstreamer import GStreamerOutput +from mopidy.gstreamer import GStreamer from .translator import parse_m3u, parse_mpd_tag_cache @@ -53,7 +53,7 @@ class LocalBackend(ThreadingActor, Backend): self.output = None def on_start(self): - output_refs = ActorRegistry.get_by_class(GStreamerOutput) + 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/backends/spotify/__init__.py b/mopidy/backends/spotify/__init__.py index 79750a5d..641f5377 100644 --- a/mopidy/backends/spotify/__init__.py +++ b/mopidy/backends/spotify/__init__.py @@ -6,7 +6,7 @@ from pykka.registry import ActorRegistry from mopidy import settings from mopidy.backends.base import (Backend, CurrentPlaylistController, LibraryController, PlaybackController, StoredPlaylistsController) -from mopidy.outputs.gstreamer import GStreamerOutput +from mopidy.gstreamer import GStreamer logger = logging.getLogger('mopidy.backends.spotify') @@ -67,7 +67,7 @@ class SpotifyBackend(ThreadingActor, Backend): self.spotify = None def on_start(self): - output_refs = ActorRegistry.get_by_class(GStreamerOutput) + 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/outputs/gstreamer.py b/mopidy/gstreamer.py similarity index 99% rename from mopidy/outputs/gstreamer.py rename to mopidy/gstreamer.py index 738c346d..e3edf69c 100644 --- a/mopidy/outputs/gstreamer.py +++ b/mopidy/gstreamer.py @@ -12,7 +12,7 @@ from mopidy.backends.base import Backend logger = logging.getLogger('mopidy.outputs.gstreamer') -class GStreamerOutput(ThreadingActor): +class GStreamer(ThreadingActor): """ Audio output through `GStreamer `_. diff --git a/mopidy/outputs/__init__.py b/mopidy/outputs/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/backends/base/current_playlist.py b/tests/backends/base/current_playlist.py index fa5e760c..a298817a 100644 --- a/tests/backends/base/current_playlist.py +++ b/tests/backends/base/current_playlist.py @@ -3,7 +3,7 @@ import multiprocessing import random from mopidy.models import Playlist, Track -from mopidy.outputs.gstreamer import GStreamerOutput +from mopidy.gstreamer import GStreamer from tests.backends.base import populate_playlist @@ -12,7 +12,7 @@ class CurrentPlaylistControllerTest(object): def setUp(self): self.backend = self.backend_class() - self.backend.output = mock.Mock(spec=GStreamerOutput) + self.backend.output = mock.Mock(spec=GStreamer) self.controller = self.backend.current_playlist self.playback = self.backend.playback diff --git a/tests/backends/base/playback.py b/tests/backends/base/playback.py index d5f04655..972e5b5e 100644 --- a/tests/backends/base/playback.py +++ b/tests/backends/base/playback.py @@ -4,7 +4,7 @@ import random import time from mopidy.models import Track -from mopidy.outputs.gstreamer import GStreamerOutput +from mopidy.gstreamer import GStreamer from tests import SkipTest from tests.backends.base import populate_playlist @@ -16,7 +16,7 @@ class PlaybackControllerTest(object): def setUp(self): self.backend = self.backend_class() - self.backend.output = mock.Mock(spec=GStreamerOutput) + self.backend.output = mock.Mock(spec=GStreamer) self.playback = self.backend.playback self.current_playlist = self.backend.current_playlist diff --git a/tests/outputs/gstreamer_test.py b/tests/gstreamer_test.py similarity index 74% rename from tests/outputs/gstreamer_test.py rename to tests/gstreamer_test.py index 9f380815..5601160e 100644 --- a/tests/outputs/gstreamer_test.py +++ b/tests/gstreamer_test.py @@ -9,26 +9,26 @@ if sys.platform == 'win32': raise SkipTest from mopidy import settings -from mopidy.outputs.gstreamer import GStreamerOutput +from mopidy.gstreamer import GStreamer from mopidy.utils.path import path_to_uri from tests import path_to_data_dir -class GStreamerOutputTest(unittest.TestCase): +class GStreamerTest(unittest.TestCase): def setUp(self): settings.BACKENDS = ('mopidy.backends.local.LocalBackend',) self.song_uri = path_to_uri(path_to_data_dir('song1.wav')) - self.output = GStreamerOutput() - self.output.on_start() + self.gstreamer = GStreamer() + self.gstreamer.on_start() def tearDown(self): settings.runtime.clear() def test_play_uri_existing_file(self): - self.assertTrue(self.output.play_uri(self.song_uri)) + self.assertTrue(self.gstreamer.play_uri(self.song_uri)) def test_play_uri_non_existing_file(self): - self.assertFalse(self.output.play_uri(self.song_uri + 'bogus')) + self.assertFalse(self.gstreamer.play_uri(self.song_uri + 'bogus')) @SkipTest def test_deliver_data(self): @@ -39,19 +39,19 @@ class GStreamerOutputTest(unittest.TestCase): pass # TODO def test_default_get_volume_result(self): - self.assertEqual(100, self.output.get_volume()) + self.assertEqual(100, self.gstreamer.get_volume()) def test_set_volume(self): - self.assertTrue(self.output.set_volume(50)) - self.assertEqual(50, self.output.get_volume()) + self.assertTrue(self.gstreamer.set_volume(50)) + self.assertEqual(50, self.gstreamer.get_volume()) def test_set_volume_to_zero(self): - self.assertTrue(self.output.set_volume(0)) - self.assertEqual(0, self.output.get_volume()) + self.assertTrue(self.gstreamer.set_volume(0)) + self.assertEqual(0, self.gstreamer.get_volume()) def test_set_volume_to_one_hundred(self): - self.assertTrue(self.output.set_volume(100)) - self.assertEqual(100, self.output.get_volume()) + self.assertTrue(self.gstreamer.set_volume(100)) + self.assertEqual(100, self.gstreamer.get_volume()) @SkipTest def test_set_state(self): @@ -62,7 +62,7 @@ class GStreamerOutputTest(unittest.TestCase): pass # TODO def test_build_shoutcast_description_without_server(self): - self.assertEqual(None, self.output._build_shoutcast_description()) + self.assertEqual(None, self.gstreamer._build_shoutcast_description()) def test_build_shoutcast_description_with_server(self): settings.SHOUTCAST_SERVER = '127.0.0.1' @@ -70,7 +70,7 @@ class GStreamerOutputTest(unittest.TestCase): expected = u'audioconvert ! %s ! ' % settings.SHOUTCAST_ENCODER + \ u'shout2send ip="127.0.0.1" mount="/stream" ' \ u'password="hackme" port="8000" username="source"' - result = self.output._build_shoutcast_description() + result = self.gstreamer._build_shoutcast_description() self.assertEqual(expected, result) def test_build_shoutcast_description_with_mount(self): @@ -98,19 +98,19 @@ class GStreamerOutputTest(unittest.TestCase): def test_build_shoutcast_description_with_override(self): settings.SHOUTCAST_OVERRIDE = 'foobar' - result = self.output._build_shoutcast_description() + result = self.gstreamer._build_shoutcast_description() self.assertEqual('foobar', result) def test_build_shoutcast_description_with_override_and_server(self): settings.SHOUTCAST_OVERRIDE = 'foobar' settings.SHOUTCAST_SERVER = '127.0.0.1' - result = self.output._build_shoutcast_description() + result = self.gstreamer._build_shoutcast_description() self.assertEqual('foobar', result) def check_shoutcast_options(self, options): expected = u'audioconvert ! %s ! shout2send ' % settings.SHOUTCAST_ENCODER expected += options - result = self.output._build_shoutcast_description() + result = self.gstreamer._build_shoutcast_description() self.assertEqual(expected, result)