andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move GStreamerOutput up one level to mopidy.gstreamer and rename to GStreamer

Browse Source
This commit is contained in:
Thomas Adamcik 2011-04-24 21:46:19 +02:00
parent 7016a20811
commit 4a1df118fb
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/backends/local/__init__.py
View File

@ -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()

4
mopidy/backends/spotify/__init__.py
View File

@ -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()

2
mopidy/outputs/gstreamer.py → mopidy/gstreamer.py
View File

@ -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 <http://gstreamer.freedesktop.org/>`_.

0
mopidy/outputs/__init__.py
View File

4
tests/backends/base/current_playlist.py
View File

@ -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

4
tests/backends/base/playback.py
View File

@ -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

36
tests/outputs/gstreamer_test.py → tests/gstreamer_test.py
View File

@ -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)