diff options
| author | wm4 <wm4@nowhere> | 2013-07-08 01:26:13 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-08 01:36:02 +0200 |
| commit | 05ae5afd6249af9770eb1e55104fbd4f510c2342 (patch) | |
| tree | ed527373fe42a37f24d4eb43a7a7721d7145fd38 /demux/demux_rawaudio.c | |
| parent | 50808bab8db030acd07433e58465d1e71bca2269 (diff) | |
| download | mpv-05ae5afd6249af9770eb1e55104fbd4f510c2342.tar.bz2 mpv-05ae5afd6249af9770eb1e55104fbd4f510c2342.tar.xz | |
demux: remove separate arrays for audio/video/sub streams, simplify
These separate arrays were used by the old demuxers and are not needed
anymore. We can simplify track switching as well.
One interesting thing is that stream/tv.c (which is a demuxer) won't
respect --no-audio anymore. It will probably work as expected, but it
will still open an audio device etc. - this is because track selection
is now always done with the runtime track switching mechanism. Maybe
the TV code could be updated to do proper runtime switching, but I
can't test this stuff.
Diffstat (limited to 'demux/demux_rawaudio.c')
| -rw-r--r-- | demux/demux_rawaudio.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/demux/demux_rawaudio.c b/demux/demux_rawaudio.c index 5f47efe936..50e4e4a68b 100644 --- a/demux/demux_rawaudio.c +++ b/demux/demux_rawaudio.c @@ -69,15 +69,11 @@ static demuxer_t* demux_rawaudio_open(demuxer_t* demuxer) { demuxer->movi_start = demuxer->stream->start_pos; demuxer->movi_end = demuxer->stream->end_pos; - demuxer->audio->id = 0; - demuxer->audio->sh = sh_audio; - sh_audio->ds = demuxer->audio; - return demuxer; } static int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) { - sh_audio_t* sh_audio = demuxer->audio->sh; + sh_audio_t* sh_audio = demuxer->audio->gsh->audio; int l = sh_audio->wf->nAvgBytesPerSec; int64_t spos = stream_tell(demuxer->stream); demux_packet_t* dp; @@ -98,7 +94,7 @@ static int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) { static void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ stream_t* s = demuxer->stream; - sh_audio_t* sh_audio = demuxer->audio->sh; + sh_audio_t* sh_audio = demuxer->audio->gsh->audio; int64_t base,pos; base = (flags & SEEK_ABSOLUTE) ? demuxer->movi_start : stream_tell(s); |