summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-08-17 05:56:36 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-08-17 05:56:36 +0000
commiteeaa871baa17c65cc46e3db0e99db590ad542da4 (patch)
tree4dbdd8da7d32986b7cbdbbfe90cbdda87419f0c2 /libmpdemux
parent5d058a67c1f19df9565f8a3a78a7fa377999222a (diff)
downloadmpv-eeaa871baa17c65cc46e3db0e99db590ad542da4.tar.bz2
mpv-eeaa871baa17c65cc46e3db0e99db590ad542da4.tar.xz
Get rid of rawaudio control code again that only duplicates the fallback code in
demuxer.c now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29529 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_rawaudio.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c
index d09f2e3dff..0f78e0a6df 100644
--- a/libmpdemux/demux_rawaudio.c
+++ b/libmpdemux/demux_rawaudio.c
@@ -112,25 +112,6 @@ static void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,float aud
// 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 @@ const demuxer_desc_t demuxer_desc_rawaudio = {
demux_rawaudio_open,
NULL,
demux_rawaudio_seek,
- demux_rawaudio_control
};