Rename {Base => }PlaybackController

docs/api/backends/controllers.rst

@@ -24,7 +24,7 @@ Playback controller
 Manages playback, with actions like play, pause, stop, next, previous, and
 seek.
 
-.. autoclass:: mopidy.backends.base.BasePlaybackController
+.. autoclass:: mopidy.backends.base.PlaybackController
     :members:
     :undoc-members:
 

mopidy/backends/base/__init__.py

@@ -10,7 +10,7 @@ from mopidy.utils import get_class
 
 from .current_playlist import CurrentPlaylistController
 from .library import LibraryController, BaseLibraryProvider
-from .playback import BasePlaybackController, BasePlaybackProvider
+from .playback import PlaybackController, BasePlaybackProvider
 from .stored_playlists import (StoredPlaylistsController,
     BaseStoredPlaylistsProvider)
 
@@ -53,7 +53,7 @@ class Backend(object):
     mixer = None
 
     #: The playback controller. An instance of
-    #: :class:`mopidy.backends.base.BasePlaybackController`.
+    #: :class:`mopidy.backends.base.PlaybackController`.
     playback = None
 
     #: The stored playlists controller. An instance of

mopidy/backends/base/playback.py

@@ -4,7 +4,7 @@ import time
 
 logger = logging.getLogger('mopidy.backends.base')
 
-class BasePlaybackController(object):
+class PlaybackController(object):
     """
     :param backend: the backend
     :type backend: :class:`mopidy.backends.base.Backend`

mopidy/backends/dummy/__init__.py

@@ -1,5 +1,5 @@
 from mopidy.backends.base import (Backend, CurrentPlaylistController,
-    BasePlaybackController, BasePlaybackProvider, LibraryController,
+    PlaybackController, BasePlaybackProvider, LibraryController,
     BaseLibraryProvider, StoredPlaylistsController,
     BaseStoredPlaylistsProvider)
 from mopidy.models import Playlist
@@ -33,7 +33,7 @@ class DummyBackend(Backend):
             provider=library_provider)
 
         playback_provider = DummyPlaybackProvider(backend=self)
-        self.playback = BasePlaybackController(backend=self,
+        self.playback = PlaybackController(backend=self,
             provider=playback_provider)
 
         stored_playlists_provider = DummyStoredPlaylistsProvider(backend=self)

mopidy/backends/libspotify/__init__.py

@@ -2,7 +2,7 @@ import logging
 
 from mopidy import settings
 from mopidy.backends.base import (Backend, CurrentPlaylistController,
-    LibraryController, BasePlaybackController, StoredPlaylistsController)
+    LibraryController, PlaybackController, StoredPlaylistsController)
 
 logger = logging.getLogger('mopidy.backends.libspotify')
 
@@ -47,7 +47,7 @@ class LibspotifyBackend(Backend):
             provider=library_provider)
 
         playback_provider = LibspotifyPlaybackProvider(backend=self)
-        self.playback = BasePlaybackController(backend=self,
+        self.playback = PlaybackController(backend=self,
             provider=playback_provider)
 
         stored_playlists_provider = LibspotifyStoredPlaylistsProvider(

mopidy/backends/local/__init__.py

@@ -6,7 +6,7 @@ import shutil
 
 from mopidy import settings
 from mopidy.backends.base import (Backend, CurrentPlaylistController,
-    LibraryController, BaseLibraryProvider, BasePlaybackController,
+    LibraryController, BaseLibraryProvider, PlaybackController,
     BasePlaybackProvider, StoredPlaylistsController,
     BaseStoredPlaylistsProvider)
 from mopidy.models import Playlist, Track, Album
@@ -49,7 +49,7 @@ class LocalBackend(Backend):
         self.uri_handlers = [u'file://']
 
 
-class LocalPlaybackController(BasePlaybackController):
+class LocalPlaybackController(PlaybackController):
     def __init__(self, *args, **kwargs):
         super(LocalPlaybackController, self).__init__(*args, **kwargs)
 

tests/backends/base/playback.py

@@ -13,7 +13,7 @@ from tests.backends.base import populate_playlist
 
 # TODO Test 'playlist repeat', e.g. repeat=1,single=0
 
-class BasePlaybackControllerTest(object):
+class PlaybackControllerTest(object):
     tracks = []
 
     def setUp(self):

tests/backends/local/playback_test.py

@@ -12,12 +12,10 @@ from mopidy.models import Track
 from mopidy.utils.path import path_to_uri
 
 from tests import data_folder
-from tests.backends.base.playback import BasePlaybackControllerTest
+from tests.backends.base.playback import PlaybackControllerTest
 from tests.backends.local import generate_song
 
-class LocalPlaybackControllerTest(BasePlaybackControllerTest,
+class LocalPlaybackControllerTest(PlaybackControllerTest, unittest.TestCase):
-        unittest.TestCase):
-
     backend_class = LocalBackend
     tracks = [Track(uri=generate_song(i), length=4464)
         for i in range(1, 4)]