diff --git a/mopidy/backends/gstreamer.py b/mopidy/backends/gstreamer.py index c594c305..329d9b7d 100644 --- a/mopidy/backends/gstreamer.py +++ b/mopidy/backends/gstreamer.py @@ -108,14 +108,6 @@ class GStreamerPlaybackController(BasePlaybackController): gst.SEEK_FLAG_FLUSH, time_position * gst.MSECOND) self._set_state(gst.STATE_PLAYING) - @property - def volume(self): - return int(self._bin.get_property('volume') * 100) - - @volume.setter - def volume(self, value): - return self._bin.set_property('volume', float(value) / 100) - @property def time_position(self): try: diff --git a/tests/backends/base.py b/tests/backends/base.py index a747cd09..420577e9 100644 --- a/tests/backends/base.py +++ b/tests/backends/base.py @@ -194,7 +194,6 @@ class BaseCurrentPlaylistControllerTest(object): class BasePlaybackControllerTest(object): tracks = [] backend_class = None - supports_volume = False def setUp(self): self.backend = self.backend_class() @@ -664,22 +663,23 @@ class BasePlaybackControllerTest(object): self.assertEqual(first, second) - def test_volume(self): - if not self.supports_volume: - self.assertEqual(self.playback.volume, None) - else: - self.assertEqual(self.playback.volume, 100) - self.playback.volume = 50 - self.assertEqual(self.playback.volume, 50) - self.playback.volume = 0 - self.assertEqual(self.playback.volume, 0) - - def test_volume_is_not_float(self): - if not self.supports_volume: - return - - self.playback.volume = 1.0 / 3 * 100 - self.assertEqual(self.playback.volume, 33) +# FIXME move to mixer tests +# def test_volume(self): +# if not self.supports_volume: +# self.assertEqual(self.playback.volume, None) +# else: +# self.assertEqual(self.playback.volume, 100) +# self.playback.volume = 50 +# self.assertEqual(self.playback.volume, 50) +# self.playback.volume = 0 +# self.assertEqual(self.playback.volume, 0) +# +# def test_volume_is_not_float(self): +# if not self.supports_volume: +# return +# +# self.playback.volume = 1.0 / 3 * 100 +# self.assertEqual(self.playback.volume, 33) @populate_playlist def test_play_with_consume(self): diff --git a/tests/backends/gstreamer_test.py b/tests/backends/gstreamer_test.py index 2a390fb3..0ba64c99 100644 --- a/tests/backends/gstreamer_test.py +++ b/tests/backends/gstreamer_test.py @@ -23,7 +23,6 @@ class GStreamerPlaybackControllerTest(BasePlaybackControllerTest, unittest.TestC tracks = [Track(uri=song % i, id=i, length=4464) for i in range(1, 4)] backend_class = GStreamerBackend - supports_volume = True if __name__ == '__main__': unittest.main()