summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-09-01 11:54:28 +0200
committerwm4 <wm4@nowhere>2019-09-13 17:32:21 +0200
commitddcbe66768a8a29f6e6538939c57046e9efe48fc (patch)
tree669d2654a51b3eb6e1a46f6d3688c3e09df0199b
parentb30e85508a305d668db8419556d295a65ab08707 (diff)
downloadmpv-ddcbe66768a8a29f6e6538939c57046e9efe48fc.tar.bz2
mpv-ddcbe66768a8a29f6e6538939c57046e9efe48fc.tar.xz
stream: remove some more optical disc leftovers
-rw-r--r--stream/stream.h14
-rw-r--r--stream/stream_dvb.c1
2 files changed, 0 insertions, 15 deletions
diff --git a/stream/stream.h b/stream/stream.h
index baa26c76de..2b91d43bfd 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -67,17 +67,6 @@ enum stream_ctrl {
STREAM_CTRL_OPTICAL_CRAP_HACK2,
};
-struct stream_lang_req {
- int type; // STREAM_AUDIO, STREAM_SUB
- int id;
- char name[50];
-};
-
-struct stream_dvd_info_req {
- unsigned int palette[16];
- int num_subs;
-};
-
// for STREAM_CTRL_AVSEEK
struct stream_avseek {
int stream_index;
@@ -106,8 +95,6 @@ typedef struct stream {
// Seek
int (*seek)(struct stream *s, int64_t pos);
// Control
- // Will be later used to let streams like dvd and cdda report
- // their structure (ie tracks, chapters, etc)
int (*control)(struct stream *s, int cmd, void *arg);
// Close
void (*close)(struct stream *s);
@@ -130,7 +117,6 @@ typedef struct stream {
bool is_local_file : 1; // from the filesystem
bool is_directory : 1; // directory on the filesystem
bool access_references : 1; // open other streams
- bool extended_ctrls : 1; // supports some of BD/DVD/DVB/TV controls
struct mp_log *log;
struct mpv_global *global;
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index f87b95416c..899851641c 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -1127,7 +1127,6 @@ static int dvb_open(stream_t *stream)
stream->streaming = true;
stream->demuxer = "lavf";
stream->lavf_type = "mpegts";
- stream->extended_ctrls = true;
return STREAM_OK;