audio: Remove deprecated audio APIs

Fixes mopidy#1465
jodal · Sep 30, 2018 · cbb9529 · cbb9529
1 parent 186b670
commit cbb9529
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 22 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -68,7 +68,8 @@ Stream backend
 Audio
 -----
 
-- (no changes yet)
+- Remove the method :meth:`mopidy.audio.Audio.emit_end_of_stream`, which has
+  been deprecated since 1.0. (Fixes: :issue:`1465`)
 
 
 v2.2.0 (2018-09-30)

diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py
@@ -10,7 +10,7 @@
 from mopidy.audio import tags as tags_lib, utils
 from mopidy.audio.constants import PlaybackState
 from mopidy.audio.listener import AudioListener
-from mopidy.internal import deprecation, process
+from mopidy.internal import process
 from mopidy.internal.gi import GObject, Gst, GstPbutils
 
 
@@ -615,20 +615,6 @@ def emit_data(self, buffer_):
         """
         return self._appsrc.push(buffer_)
 
-    def emit_end_of_stream(self):
-        """
-        Put an end-of-stream token on the playbin. This is typically used in
-        combination with :meth:`emit_data`.
-
-        We will get a GStreamer message when the stream playback reaches the
-        token, and can then do any end-of-stream related tasks.
-
-        .. deprecated:: 1.0
-            Use :meth:`emit_data` with a :class:`None` buffer instead.
-        """
-        deprecation.warn('audio.emit_end_of_stream')
-        self._appsrc.push(None)
-
     def set_about_to_finish_callback(self, callback):
         """
         Configure audio to use an about-to-finish callback.

diff --git a/mopidy/internal/deprecation.py b/mopidy/internal/deprecation.py
@@ -16,9 +16,6 @@
     'mpd.protocol.current_playlist.playlist':
         'Do not use this, instead use playlistinfo',
 
-    # Deprecated features in audio:
-    'audio.emit_end_of_stream': 'audio.emit_end_of_stream() is deprecated',
-
     # Deprecated features in core libary:
     'core.library.find_exact': 'library.find_exact() is deprecated',
     'core.library.lookup:uri_arg':

diff --git a/tests/dummy_audio.py b/tests/dummy_audio.py
@@ -42,9 +42,6 @@ def set_appsrc(self, *args, **kwargs):
     def emit_data(self, buffer_):
         pass
 
-    def emit_end_of_stream(self):
-        pass
-
     def get_position(self):
         return self._position