summaryrefslogtreecommitdiffstats
path: root/demux/demux.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-09 23:38:28 +0200
committerwm4 <wm4@nowhere>2014-06-11 00:34:41 +0200
commite033f3c8bcf66de44b0cc25e543a85f19fc9f964 (patch)
tree08cfecb3736fd7b6cc0803a4f28cc8c42651b53f /demux/demux.h
parent9420eb5a073da434c31f5123dff93c22e5ba32fa (diff)
downloadmpv-e033f3c8bcf66de44b0cc25e543a85f19fc9f964.tar.bz2
mpv-e033f3c8bcf66de44b0cc25e543a85f19fc9f964.tar.xz
command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not sure what to do with this.) Also, internally, don't access stream details directly, but dispatch commands with stream ctrls. Many of the new properties are a bit strange, because they're write- only. Also remove some OSD output these commands produced, because I couldn't be bothered to port these. In general, this makes everything much cleaner, and will also make it easier to e.g. move the demuxer to its own thread. Don't bother updating input.conf, but changes.rst documents how old commands map to the new ones. Mostly untested, due to lack of hardware.
Diffstat (limited to 'demux/demux.h')
-rw-r--r--demux/demux.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/demux/demux.h b/demux/demux.h
index 81568b96b9..2bcfc241c1 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -56,6 +56,13 @@ enum demux_ctrl {
DEMUXER_CTRL_GET_START_TIME,
DEMUXER_CTRL_RESYNC,
DEMUXER_CTRL_IDENTIFY_PROGRAM,
+ DEMUXER_CTRL_STREAM_CTRL, // stupid workaround for legacy TV code
+};
+
+struct demux_ctrl_stream_ctrl {
+ int ctrl;
+ void *arg;
+ int res;
};
#define SEEK_ABSOLUTE (1 << 0)