Mercurial > mplayer.hg
changeset 29487:53ff77686a5c
Get rid of rawaudio control code again that only duplicates the fallback code in
demuxer.c now.
| author | reimar |
|---|---|
| date | Mon, 17 Aug 2009 05:56:36 +0000 |
| parents | a373af1e3b24 |
| children | 6f7e97c44353 |
| files | libmpdemux/demux_rawaudio.c |
| diffstat | 1 files changed, 0 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_rawaudio.c Mon Aug 17 05:55:40 2009 +0000 +++ b/libmpdemux/demux_rawaudio.c Mon Aug 17 05:56:36 2009 +0000 @@ -112,25 +112,6 @@ // printf("demux_rawaudio: streamtell=%d\n",(int)stream_tell(demuxer->stream)); } -static int demux_rawaudio_control(demuxer_t *demuxer,int cmd, void *arg) -{ - sh_audio_t *sh_audio = demuxer->audio->sh; - switch(cmd) { - case DEMUXER_CTRL_GET_TIME_LENGTH: - if (!sh_audio->i_bps || demuxer->movi_start >= demuxer->movi_end) return DEMUXER_CTRL_DONTKNOW; - *(double *)arg = (double)(demuxer->movi_end - demuxer->movi_start) / sh_audio->i_bps; - return DEMUXER_CTRL_GUESS; - - case DEMUXER_CTRL_GET_PERCENT_POS: - if (demuxer->movi_start >= demuxer->movi_end) return DEMUXER_CTRL_DONTKNOW; - *(int *)arg = (stream_tell(demuxer->stream) - demuxer->movi_start) * 100 / (demuxer->movi_end - demuxer->movi_start); - return DEMUXER_CTRL_GUESS; - } - return DEMUXER_CTRL_NOTIMPL; -} - - - const demuxer_desc_t demuxer_desc_rawaudio = { "Raw audio demuxer", "rawaudio", @@ -144,5 +125,4 @@ demux_rawaudio_open, NULL, demux_rawaudio_seek, - demux_rawaudio_control };