summaryrefslogtreecommitdiffstats
path: root/stream/stream.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-05 01:59:04 +0200
committerwm4 <wm4@nowhere>2013-06-09 22:06:02 +0200
commit005375bb7d095d06c46a1d47223e0381439dc3ea (patch)
tree67ab3869e46afe1e3752392e7650e3a6e07cbe9f /stream/stream.h
parent97887895308d8912ffa78400fcccd1ddb2c58680 (diff)
downloadmpv-005375bb7d095d06c46a1d47223e0381439dc3ea.tar.bz2
mpv-005375bb7d095d06c46a1d47223e0381439dc3ea.tar.xz
core: use STREAM_CTRL instead of accessing stream_dvd internals
Some code in mplayer.c did stuff like accessing (dvd_priv_t *)st->priv. Do this indirectly by introducing STREAM_CTRL_GET_DVD_INFO. This is extremely specific to DVD, so it's not worth abstracting this further. This is a preparation for turning the cache into an actual stream, which simply wraps the cached stream. There are other streams which are accessed in the way DVD was, at least TV/radio/DVB. We assume these can't be used with the cache. The code doesn't look thread-safe or fork aware.
Diffstat (limited to 'stream/stream.h')
-rw-r--r--stream/stream.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/stream/stream.h b/stream/stream.h
index e4a482f737..360f65e008 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -103,6 +103,7 @@
#define STREAM_CTRL_MANAGES_TIMELINE 19
#define STREAM_CTRL_GET_START_TIME 20
#define STREAM_CTRL_GET_CHAPTER_TIME 21
+#define STREAM_CTRL_GET_DVD_INFO 22
struct stream_lang_req {
int type; // STREAM_AUDIO, STREAM_SUB
@@ -110,6 +111,11 @@ struct stream_lang_req {
char name[50];
};
+struct stream_dvd_info_req {
+ unsigned int palette[16];
+ int num_subs;
+};
+
typedef enum {
streaming_stopped_e,
streaming_playing_e