Demuxer modularization

Demuxer selection by name with -demuxer command (bakward compatible)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 21 insertions, 4 deletions

diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c
index ac31c9426d..959bfbfb46 100644
--- a/libmpdemux/demux_rawaudio.c
+++ b/libmpdemux/demux_rawaudio.c
@@ -33,7 +33,7 @@ m_option_t demux_rawaudio_opts[] = {
 
 extern void resync_audio_stream(sh_audio_t *sh_audio);
 
-int demux_rawaudio_open(demuxer_t* demuxer) {
+static demuxer_t* demux_rawaudio_open(demuxer_t* demuxer) {
   sh_audio_t* sh_audio;
   WAVEFORMATEX* w;
 
@@ -59,10 +59,10 @@ int demux_rawaudio_open(demuxer_t* demuxer) {
   demuxer->audio->sh = sh_audio;
   sh_audio->ds = demuxer->audio;
 
-  return 1;
+  return demuxer;
 }
 
-int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
+static int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
   sh_audio_t* sh_audio = demuxer->audio->sh;
   int l = sh_audio->wf->nAvgBytesPerSec;
   off_t spos = stream_tell(demuxer->stream);
@@ -82,7 +82,7 @@ int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
   return 1;
 }
 
-void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
+static void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
   stream_t* s = demuxer->stream;
   sh_audio_t* sh_audio = demuxer->audio->sh;
   off_t base,pos;
@@ -99,3 +99,20 @@ void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
   resync_audio_stream(sh_audio);
 //  printf("demux_rawaudio: streamtell=%d\n",(int)stream_tell(demuxer->stream));
 }
+
+
+demuxer_desc_t demuxer_desc_rawaudio = {
+  "Raw audio demuxer",
+  "rawaudio",
+  "rawaudio",
+  "?",
+  "",
+  DEMUXER_TYPE_RAWAUDIO,
+  0, // no autodetect
+  NULL,
+  demux_rawaudio_fill_buffer,
+  demux_rawaudio_open,
+  NULL,
+  demux_rawaudio_seek,
+  NULL
+};