[MPlayer-cvslog] CVS: main/libmpdemux demux_mpc.c,1.5,1.6

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv14900

Modified Files:
	demux_mpc.c 
Log Message:
Changes forgotten during demuxer API change, introduce a check function.


Index: demux_mpc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demux_mpc.c	5 Aug 2005 19:57:46 -0000	1.5
+++ demux_mpc.c	6 Sep 2005 19:40:19 -0000	1.6
@@ -46,11 +46,9 @@
   return out & mask;
 }
 
-static int demux_mpc_open(demuxer_t* demuxer) {
+static int demux_mpc_check(demuxer_t* demuxer) {
   stream_t *s = demuxer->stream;
-  sh_audio_t* sh_audio;
   uint8_t hdr[HDR_SIZE];
-  da_priv_t* priv;
   int i;
 
   if (stream_read(s, hdr, HDR_SIZE) != HDR_SIZE)
@@ -64,6 +62,15 @@
 
   if (hdr[0] != 'M' || hdr[1] != 'P' || hdr[2] != '+')
     return 0;
+  demuxer->priv = malloc(HDR_SIZE);
+  memcpy(demuxer->priv, hdr, HDR_SIZE);
+  return DEMUXER_TYPE_MPC;
+}
+
+static demuxer_t *demux_mpc_open(demuxer_t* demuxer) {
+  stream_t *s = demuxer->stream;
+  sh_audio_t* sh_audio;
+  da_priv_t* priv = demuxer->priv;
 
   sh_audio = new_sh_audio(demuxer,0);
 
@@ -72,7 +79,8 @@
     char *header = &wf[sizeof(WAVEFORMATEX)];
     const int freqs[4] = {44100, 48000, 37800, 32000};
     sh_audio->format = mmioFOURCC('M', 'P', 'C', ' ');
-    memcpy(header, hdr, HDR_SIZE);
+    memcpy(header, priv, HDR_SIZE);
+    free(priv);
     sh_audio->wf = (WAVEFORMATEX *)wf;
     sh_audio->wf->wFormatTag = sh_audio->format;
     sh_audio->wf->nChannels = 2;
@@ -101,15 +109,14 @@
   sh_audio->audio.dwScale = 32 * 36;
   sh_audio->audio.dwRate = sh_audio->samplerate;
 
-  return DEMUXER_TYPE_MPC;
+  return demuxer;
 }
 
-static int demux_mpc_fill_buffer(demux_stream_t *ds, demux_stream_t *dsds) {
+static int demux_mpc_fill_buffer(demuxer_t *demux, demux_stream_t *ds) {
   int l;
   int bit_len;
   demux_packet_t* dp;
   sh_audio_t* sh_audio = ds->sh;
-  demuxer_t* demux = ds->demuxer;
   da_priv_t* priv = demux->priv;
   stream_t* s = demux->stream;
   sh_audio = ds->sh;
@@ -159,9 +166,9 @@
   "supports v7 bitstream only",
   DEMUXER_TYPE_MPC,
   0, // unsafe autodetect
-  demux_mpc_open,
+  demux_mpc_check,
   demux_mpc_fill_buffer,
-  NULL,
+  demux_mpc_open,
   demux_close_mpc,
   demux_mpc_seek,
   demux_mpc_control