summaryrefslogtreecommitdiffstats
path: root/demux/demux_timeline.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-09-07 23:10:14 +0200
committerwm4 <wm4@nowhere>2019-09-19 20:37:04 +0200
commit18180ae89b7d162e04d84d36fa04ac14a58db1f7 (patch)
tree83c1f9aa319d12a5f1b34f8322f08bbe7cd18d2d /demux/demux_timeline.c
parent5114c69c7f85e7cd38d6928e874c5b44c951be60 (diff)
downloadmpv-18180ae89b7d162e04d84d36fa04ac14a58db1f7.tar.bz2
mpv-18180ae89b7d162e04d84d36fa04ac14a58db1f7.tar.xz
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.
Diffstat (limited to 'demux/demux_timeline.c')
-rw-r--r--demux/demux_timeline.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c
index d0c1740e9e..49046222d9 100644
--- a/demux/demux_timeline.c
+++ b/demux/demux_timeline.c
@@ -435,14 +435,9 @@ static void d_close(struct demuxer *demuxer)
demux_free(master);
}
-static int d_control(struct demuxer *demuxer, int cmd, void *arg)
+static void d_switched_tracks(struct demuxer *demuxer)
{
- if (cmd == DEMUXER_CTRL_SWITCHED_TRACKS) {
- reselect_streams(demuxer);
- return CONTROL_OK;
- }
-
- return CONTROL_UNKNOWN;
+ reselect_streams(demuxer);
}
const demuxer_desc_t demuxer_desc_timeline = {
@@ -452,5 +447,5 @@ const demuxer_desc_t demuxer_desc_timeline = {
.open = d_open,
.close = d_close,
.seek = d_seek,
- .control = d_control,
+ .switched_tracks = d_switched_tracks,
};