From 18180ae89b7d162e04d84d36fa04ac14a58db1f7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 7 Sep 2018 23:10:14 +0200
Subject: demux: get rid of ->control callback

The only thing left is the notification for track switching. Just get
rid of that.

There's probably no real reason to get rid of control(), but why not. I
think I was actually trying to do some real work but fuck that.
---
 demux/demux_lavf.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'demux/demux_lavf.c')

diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index eae78f9b4c..d6e14b8617 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -1185,15 +1185,9 @@ static void demux_seek_lavf(demuxer_t *demuxer, double seek_pts, int flags)
     update_read_stats(demuxer);
 }
 
-static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg)
+static void demux_lavf_switched_tracks(struct demuxer *demuxer)
 {
-    switch (cmd) {
-    case DEMUXER_CTRL_SWITCHED_TRACKS:
-        select_tracks(demuxer, 0);
-        return CONTROL_OK;
-    default:
-        return CONTROL_UNKNOWN;
-    }
+    select_tracks(demuxer, 0);
 }
 
 static void demux_close_lavf(demuxer_t *demuxer)
@@ -1235,5 +1229,5 @@ const demuxer_desc_t demuxer_desc_lavf = {
     .open = demux_open_lavf,
     .close = demux_close_lavf,
     .seek = demux_seek_lavf,
-    .control = demux_lavf_control,
+    .switched_tracks = demux_lavf_switched_tracks,
 };
-- 
cgit v1.2.3