[MPlayer-cvslog] r29529 - trunk/libmpdemux/demux_rawaudio.c

[reimar]

Author: reimar
Date: Mon Aug 17 07:56:36 2009
New Revision: 29529

Log:
Get rid of rawaudio control code again that only duplicates the fallback code in
demuxer.c now.

Modified:
   trunk/libmpdemux/demux_rawaudio.c

Modified: trunk/libmpdemux/demux_rawaudio.c
==============================================================================
--- trunk/libmpdemux/demux_rawaudio.c	Mon Aug 17 07:55:40 2009	(r29528)
+++ trunk/libmpdemux/demux_rawaudio.c	Mon Aug 17 07:56:36 2009	(r29529)
@@ -112,25 +112,6 @@ static void demux_rawaudio_seek(demuxer_
 //  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_rawaud
   demux_rawaudio_open,
   NULL,
   demux_rawaudio_seek,
-  demux_rawaudio_control
 };