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, 23 insertions, 6 deletions

diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c
index 2d273f2ea6..a4ab0f63fd 100644
--- a/libmpdemux/demux_vqf.c
+++ b/libmpdemux/demux_vqf.c
@@ -11,18 +11,18 @@
 
 extern void resync_audio_stream(sh_audio_t *sh_audio);
 
-int demux_probe_vqf(demuxer_t* demuxer) 
+static int demux_probe_vqf(demuxer_t* demuxer) 
 {
   char buf[KEYWORD_BYTES];
   stream_t *s;
   s = demuxer->stream;
   if(stream_read(s,buf,KEYWORD_BYTES)!=KEYWORD_BYTES)
     return 0;
-  if(memcmp(buf,"TWIN",KEYWORD_BYTES)==0) return 1; /*version: 97012000*/
+  if(memcmp(buf,"TWIN",KEYWORD_BYTES)==0) return DEMUXER_TYPE_VQF; /*version: 97012000*/
   return 0;
 }
 
-demuxer_t* demux_open_vqf(demuxer_t* demuxer) {
+static demuxer_t* demux_open_vqf(demuxer_t* demuxer) {
   sh_audio_t* sh_audio;
   WAVEFORMATEX* w;
   stream_t *s;
@@ -161,7 +161,7 @@ demuxer_t* demux_open_vqf(demuxer_t* demuxer) {
   return demuxer;
 }
 
-int demux_vqf_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
+static int demux_vqf_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);
@@ -181,7 +181,7 @@ int demux_vqf_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
   return 1;
 }
 
-void demux_seek_vqf(demuxer_t *demuxer,float rel_seek_secs,int flags){
+static void demux_seek_vqf(demuxer_t *demuxer,float rel_seek_secs,int flags){
 #if 0
   stream_t* s = demuxer->stream;
   sh_audio_t* sh_audio = demuxer->audio->sh;
@@ -199,4 +199,21 @@ void demux_seek_vqf(demuxer_t *demuxer,float rel_seek_secs,int flags){
 #endif
 }
 
-void demux_close_vqf(demuxer_t* demuxer) {}
+static void demux_close_vqf(demuxer_t* demuxer) {}
+
+
+demuxer_desc_t demuxer_desc_vqf = {
+  "TwinVQ demuxer",
+  "vqf",
+  "VQF",
+  "Nick Kurshev",
+  "ported frm MPlayerXP",
+  DEMUXER_TYPE_VQF,
+  1, // safe autodetect
+  demux_probe_vqf,
+  demux_vqf_fill_buffer,
+  demux_open_vqf,
+  demux_close_vqf,
+  demux_seek_vqf,
+  NULL
+};