summaryrefslogtreecommitdiffstats
path: root/stream/stream_dvd.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-06 21:32:44 +0100
committerwm4 <wm4@nowhere>2015-02-06 21:43:52 +0100
commit5de29b860b25bb4ba8b1e02d9b3aee7a81009be0 (patch)
tree48e2b98f35ceb2aecef8a0706e921e3219b6994d /stream/stream_dvd.c
parent347cf972310c0de5565015190c1cd6e7d3d3d30c (diff)
downloadmpv-5de29b860b25bb4ba8b1e02d9b3aee7a81009be0.tar.bz2
mpv-5de29b860b25bb4ba8b1e02d9b3aee7a81009be0.tar.xz
stream: get rid of remaining uses of the end_pos field
Most things stopped using this field for better support of growing files. Go through the trouble to repalce the remaining uses, so it can be removed. Also move the "streaming" field; saves 4 bytes (wow!).
Diffstat (limited to 'stream/stream_dvd.c')
-rw-r--r--stream/stream_dvd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 5be70b2d1d..0906796986 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -649,6 +649,10 @@ static int control(stream_t *stream,int cmd,void* arg)
*(char**)arg = talloc_strdup(NULL, buffer);
return STREAM_OK;
}
+ case STREAM_CTRL_GET_SIZE:
+ *(int64_t *)arg =
+ (d->cur_pgc->cell_playback[d->last_cell-1].last_sector)*2048LL;
+ return STREAM_OK;
}
return STREAM_UNSUPPORTED;
}
@@ -917,7 +921,6 @@ static int open_s(stream_t *stream)
stream->fill_buffer = fill_buffer;
stream->control = control;
stream->close = stream_dvd_close;
- stream->end_pos = (int64_t)(d->cur_pgc->cell_playback[d->last_cell-1].last_sector)*2048;
MP_VERBOSE(stream, "DVD start=%d end=%d \n",d->cur_pack,d->cur_pgc->cell_playback[d->last_cell-1].last_sector);
stream->priv = (void*)d;
return STREAM_OK;