summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-06 19:02:33 +0200
committerwm4 <wm4@nowhere>2014-07-06 19:02:33 +0200
commit1d55547adf37f94be3bec973b59067c474e9d439 (patch)
tree8b75de0e8248ae6b1d3fad8a0869e42e4c4f5f82
parentde288762222beb1e20883f5d2c890ff7460ba318 (diff)
downloadmpv-1d55547adf37f94be3bec973b59067c474e9d439.tar.bz2
mpv-1d55547adf37f94be3bec973b59067c474e9d439.tar.xz
stream: remove now unused STREAM_CTRL_GET_START_TIME
demux_disc.c takes care of this now.
-rw-r--r--stream/cache.c9
-rw-r--r--stream/stream.h1
-rw-r--r--stream/stream_bluray.c4
-rw-r--r--stream/stream_dvd.c5
4 files changed, 0 insertions, 19 deletions
diff --git a/stream/cache.c b/stream/cache.c
index f96cdef0e7..91662cec47 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -110,7 +110,6 @@ struct priv {
// Cached STREAM_CTRLs
double stream_time_length;
- double stream_start_time;
int64_t stream_size;
unsigned int stream_num_chapters;
int stream_cache_idle;
@@ -377,9 +376,6 @@ static void update_cached_controls(struct priv *s)
s->stream_time_length = 0;
if (stream_control(s->stream, STREAM_CTRL_GET_TIME_LENGTH, &d) == STREAM_OK)
s->stream_time_length = d;
- s->stream_start_time = MP_NOPTS_VALUE;
- if (stream_control(s->stream, STREAM_CTRL_GET_START_TIME, &d) == STREAM_OK)
- s->stream_start_time = d;
s->stream_num_chapters = 0;
if (stream_control(s->stream, STREAM_CTRL_GET_NUM_CHAPTERS, &ui) == STREAM_OK)
s->stream_num_chapters = ui;
@@ -414,11 +410,6 @@ static int cache_get_cached_control(stream_t *cache, int cmd, void *arg)
case STREAM_CTRL_GET_TIME_LENGTH:
*(double *)arg = s->stream_time_length;
return s->stream_time_length ? STREAM_OK : STREAM_UNSUPPORTED;
- case STREAM_CTRL_GET_START_TIME:
- if (s->stream_start_time == MP_NOPTS_VALUE)
- return STREAM_UNSUPPORTED;
- *(double *)arg = s->stream_start_time;
- return STREAM_OK;
case STREAM_CTRL_GET_SIZE:
if (s->stream_size < 0)
return STREAM_UNSUPPORTED;
diff --git a/stream/stream.h b/stream/stream.h
index f2663f3435..344e8b55ef 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -81,7 +81,6 @@ enum stream_ctrl {
STREAM_CTRL_GET_CACHE_IDLE,
STREAM_CTRL_RESUME_CACHE,
STREAM_CTRL_RECONNECT,
- STREAM_CTRL_GET_START_TIME,
STREAM_CTRL_GET_CHAPTER_TIME,
STREAM_CTRL_GET_DVD_INFO,
STREAM_CTRL_SET_CONTENTS,
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index ee6d4b9664..686541b551 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -580,10 +580,6 @@ static int bluray_stream_control(stream_t *s, int cmd, void *arg)
}
return STREAM_ERROR;
}
- case STREAM_CTRL_GET_START_TIME: {
- *((double *)arg) = 0;
- return STREAM_OK;
- }
case STREAM_CTRL_GET_DISC_NAME: {
const struct meta_dl *meta = bd_get_meta(b->bd);
if (!meta || !meta->di_name || !meta->di_name[0])
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 7576dc879b..1dd0324bbb 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -532,11 +532,6 @@ static int control(stream_t *stream,int cmd,void* arg)
*((double *)arg) = (double) mp_get_titleset_length(d->vts_file, d->tt_srpt, d->cur_title)/1000.0;
return 1;
}
- case STREAM_CTRL_GET_START_TIME:
- {
- *((double *)arg) = 0;
- return 1;
- }
case STREAM_CTRL_GET_NUM_TITLES:
{
*((unsigned int *)arg) = d->vmg_file->tt_srpt->nr_of_srpts;