Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/libxineadec 28k8.c,1.2,1.3 adpcm.c,1.31,1.32 fooaudio.c,1.6,1.7 gsm610.c,1.8,1.9 interplayaudio.c,1.2,1.3 logpcm.c,1.12,1.13 nsf.c,1.2,1.3 pcm.c,1.1,1.2 roqaudio.c,1.15,1.16
|
From: Miguel F. <mig...@us...> - 2003-11-15 13:01:56
|
Update of /cvsroot/xine/xine-lib/src/libxineadec
In directory sc8-pr-cvs1:/tmp/cvs-serv22600/libxineadec
Modified Files:
28k8.c adpcm.c fooaudio.c gsm610.c interplayaudio.c logpcm.c
nsf.c pcm.c roqaudio.c
Log Message:
more helper functions cleanup (stream info, meta info)
Index: 28k8.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxineadec/28k8.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 28k8.c 8 May 2003 19:45:08 -0000 1.2
+++ 28k8.c 15 Nov 2003 13:01:19 -0000 1.3
@@ -410,10 +410,10 @@
} else if (buf->decoder_flags & BUF_FLAG_HEADER) {
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] = strdup ("Real 28.8");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 28.8");
this->decoder_ok = 1;
if (!this->decoder_ok)
- this->stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED] = 0;
+ xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
} else if (this->decoder_ok ) {
audio_buffer_t *audio_buffer;
Index: adpcm.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxineadec/adpcm.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- adpcm.c 6 Jun 2003 14:29:41 -0000 1.31
+++ adpcm.c 15 Nov 2003 13:01:19 -0000 1.32
@@ -1409,53 +1409,53 @@
switch (buf->type & 0xFFFF0000) {
case BUF_AUDIO_MSADPCM:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- strdup("Microsoft ADPCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Microsoft ADPCM");
break;
case BUF_AUDIO_MSIMAADPCM:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- strdup("Microsoft IMA ADPCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Microsoft IMA ADPCM");
break;
case BUF_AUDIO_QTIMAADPCM:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- strdup("QT IMA ADPCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "QT IMA ADPCM");
break;
case BUF_AUDIO_DK3ADPCM:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- strdup("Duck DK3 ADPCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Duck DK3 ADPCM");
break;
case BUF_AUDIO_DK4ADPCM:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- strdup("Duck DK4 ADPCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Duck DK4 ADPCM");
break;
case BUF_AUDIO_SMJPEG_IMA:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- strdup("SMJPEG IMA ADPCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "SMJPEG IMA ADPCM");
break;
case BUF_AUDIO_VQA_IMA:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- strdup("VQA IMA ADPCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "VQA IMA ADPCM");
break;
case BUF_AUDIO_EA_ADPCM:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- strdup("EA ADPCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "EA ADPCM");
break;
case BUF_AUDIO_DIALOGIC_IMA:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- strdup("Dialogic IMA ADPCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Dialogic IMA ADPCM");
break;
case BUF_AUDIO_XA_ADPCM:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- strdup("CD-ROM/XA ADPCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "CD-ROM/XA ADPCM");
break;
}
Index: fooaudio.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxineadec/fooaudio.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fooaudio.c 8 Jan 2003 01:02:31 -0000 1.6
+++ fooaudio.c 15 Nov 2003 13:01:20 -0000 1.7
@@ -98,7 +98,7 @@
this->size = 0;
/* take this opportunity to initialize stream/meta information */
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] = strdup("fooaudio");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "fooaudio");
/* peform any other required initialization */
this->last_pts = -1;
Index: gsm610.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxineadec/gsm610.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gsm610.c 8 Jan 2003 01:02:31 -0000 1.8
+++ gsm610.c 15 Nov 2003 13:01:20 -0000 1.9
@@ -109,7 +109,7 @@
this->size = 0;
/* stream/meta info */
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] = strdup("GSM 6.10");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "GSM 6.10");
return;
}
Index: interplayaudio.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxineadec/interplayaudio.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- interplayaudio.c 8 Jan 2003 01:02:31 -0000 1.2
+++ interplayaudio.c 15 Nov 2003 13:01:20 -0000 1.3
@@ -137,7 +137,8 @@
this->size = 0;
/* take this opportunity to initialize stream/meta information */
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] = strdup("Interplay MVE DPCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Interplay MVE DPCM");
return;
}
Index: logpcm.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxineadec/logpcm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- logpcm.c 8 Jan 2003 01:02:31 -0000 1.12
+++ logpcm.c 15 Nov 2003 13:01:21 -0000 1.13
@@ -160,9 +160,9 @@
this->size = 0;
/* stream/meta info */
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- (buf->type == BUF_AUDIO_MULAW) ? strdup("mu-law log PCM") :
- strdup("A-law log PCM");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ (buf->type == BUF_AUDIO_MULAW) ? "mu-law log PCM" :
+ "A-law log PCM" );
/* pre-calculate the possible log values */
if (buf->type == BUF_AUDIO_MULAW)
Index: nsf.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxineadec/nsf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsf.c 8 Jan 2003 07:36:21 -0000 1.2
+++ nsf.c 15 Nov 2003 13:01:21 -0000 1.3
@@ -86,7 +86,8 @@
this->channels = buf->decoder_info[3];
/* take this opportunity to initialize stream/meta information */
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] = strdup("NES Music (Nosefart)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "NES Music (Nosefart)");
this->song_number = buf->content[4];
/* allocate a buffer for the file */
Index: pcm.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxineadec/pcm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcm.c 16 Jun 2003 16:42:51 -0000 1.1
+++ pcm.c 15 Nov 2003 13:01:21 -0000 1.2
@@ -74,7 +74,7 @@
buf->decoder_flags, buf->decoder_info[1], buf->decoder_info[0]);
#endif
- if (this->stream->stream_info[XINE_STREAM_INFO_AUDIO_MODE] == 0) {
+ if (xine_get_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_MODE) == 0) {
#ifdef LOG
printf(__FILE__ ": Someone changed the audio mode. Closing device\r");
#endif
Index: roqaudio.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libxineadec/roqaudio.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- roqaudio.c 8 Jan 2003 01:02:31 -0000 1.15
+++ roqaudio.c 15 Nov 2003 13:01:22 -0000 1.16
@@ -83,8 +83,8 @@
this->size = 0;
/* stream/meta info */
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] =
- strdup("RoQ DPCM Audio");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "RoQ DPCM Audio");
return;
}
|