diff options
Diffstat (limited to 'src/libxineadec')
-rw-r--r-- | src/libxineadec/28k8.c | 6 | ||||
-rw-r--r-- | src/libxineadec/adpcm.c | 22 | ||||
-rw-r--r-- | src/libxineadec/fooaudio.c | 4 | ||||
-rw-r--r-- | src/libxineadec/gsm610.c | 4 | ||||
-rw-r--r-- | src/libxineadec/interplayaudio.c | 4 | ||||
-rw-r--r-- | src/libxineadec/logpcm.c | 4 | ||||
-rw-r--r-- | src/libxineadec/nsf.c | 4 | ||||
-rw-r--r-- | src/libxineadec/pcm.c | 2 | ||||
-rw-r--r-- | src/libxineadec/roqaudio.c | 4 |
9 files changed, 27 insertions, 27 deletions
diff --git a/src/libxineadec/28k8.c b/src/libxineadec/28k8.c index c64ec6a45..e8ae06f81 100644 --- a/src/libxineadec/28k8.c +++ b/src/libxineadec/28k8.c @@ -22,7 +22,7 @@ * Based on public domain source code from: * http://www.honeypot.net/audio/ * - * $Id: 28k8.c,v 1.3 2003/11/15 13:01:19 miguelfreitas Exp $ + * $Id: 28k8.c,v 1.4 2003/11/16 23:33:47 f1rmb Exp $ */ #include <stdio.h> @@ -410,10 +410,10 @@ static void ra28k8_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { } else if (buf->decoder_flags & BUF_FLAG_HEADER) { - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 28.8"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 28.8"); this->decoder_ok = 1; if (!this->decoder_ok) - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0); } else if (this->decoder_ok ) { audio_buffer_t *audio_buffer; diff --git a/src/libxineadec/adpcm.c b/src/libxineadec/adpcm.c index e2bcb462c..f395a7959 100644 --- a/src/libxineadec/adpcm.c +++ b/src/libxineadec/adpcm.c @@ -31,7 +31,7 @@ * this is also useful for extracting streams from Playstation discs * * - * $Id: adpcm.c,v 1.32 2003/11/15 13:01:19 miguelfreitas Exp $ + * $Id: adpcm.c,v 1.33 2003/11/16 23:33:47 f1rmb Exp $ */ #include <stdio.h> @@ -1409,52 +1409,52 @@ static void adpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { switch (buf->type & 0xFFFF0000) { case BUF_AUDIO_MSADPCM: - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Microsoft ADPCM"); break; case BUF_AUDIO_MSIMAADPCM: - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Microsoft IMA ADPCM"); break; case BUF_AUDIO_QTIMAADPCM: - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "QT IMA ADPCM"); break; case BUF_AUDIO_DK3ADPCM: - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Duck DK3 ADPCM"); break; case BUF_AUDIO_DK4ADPCM: - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Duck DK4 ADPCM"); break; case BUF_AUDIO_SMJPEG_IMA: - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "SMJPEG IMA ADPCM"); break; case BUF_AUDIO_VQA_IMA: - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "VQA IMA ADPCM"); break; case BUF_AUDIO_EA_ADPCM: - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "EA ADPCM"); break; case BUF_AUDIO_DIALOGIC_IMA: - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Dialogic IMA ADPCM"); break; case BUF_AUDIO_XA_ADPCM: - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "CD-ROM/XA ADPCM"); break; diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c index c94073fd8..40b143004 100644 --- a/src/libxineadec/fooaudio.c +++ b/src/libxineadec/fooaudio.c @@ -21,7 +21,7 @@ * player. It really works too! It will output a continuous sine wave in * place of the data it should actually send. * - * $Id: fooaudio.c,v 1.7 2003/11/15 13:01:20 miguelfreitas Exp $ + * $Id: fooaudio.c,v 1.8 2003/11/16 23:33:47 f1rmb Exp $ */ #include <stdio.h> @@ -98,7 +98,7 @@ static void fooaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) this->size = 0; /* take this opportunity to initialize stream/meta information */ - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "fooaudio"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "fooaudio"); /* peform any other required initialization */ this->last_pts = -1; diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c index e4c037aa7..ac03d940c 100644 --- a/src/libxineadec/gsm610.c +++ b/src/libxineadec/gsm610.c @@ -44,7 +44,7 @@ * Carsten Bormann * -------------------------------------------------------------------- * - * $Id: gsm610.c,v 1.9 2003/11/15 13:01:20 miguelfreitas Exp $ + * $Id: gsm610.c,v 1.10 2003/11/16 23:33:47 f1rmb Exp $ * */ @@ -109,7 +109,7 @@ static void gsm610_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { this->size = 0; /* stream/meta info */ - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "GSM 6.10"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "GSM 6.10"); return; } diff --git a/src/libxineadec/interplayaudio.c b/src/libxineadec/interplayaudio.c index e1057766f..41680ee98 100644 --- a/src/libxineadec/interplayaudio.c +++ b/src/libxineadec/interplayaudio.c @@ -21,7 +21,7 @@ * For more information regarding the Interplay MVE file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: interplayaudio.c,v 1.3 2003/11/15 13:01:20 miguelfreitas Exp $ + * $Id: interplayaudio.c,v 1.4 2003/11/16 23:33:47 f1rmb Exp $ */ #include <stdio.h> @@ -137,7 +137,7 @@ static void interplay_decode_data (audio_decoder_t *this_gen, buf_element_t *buf this->size = 0; /* take this opportunity to initialize stream/meta information */ - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Interplay MVE DPCM"); return; diff --git a/src/libxineadec/logpcm.c b/src/libxineadec/logpcm.c index 4cf95f28f..cc972eac6 100644 --- a/src/libxineadec/logpcm.c +++ b/src/libxineadec/logpcm.c @@ -30,7 +30,7 @@ * http://sox.sourceforge.net/ * which listed the code as being lifted from Sun Microsystems. * - * $Id: logpcm.c,v 1.13 2003/11/15 13:01:21 miguelfreitas Exp $ + * $Id: logpcm.c,v 1.14 2003/11/16 23:33:47 f1rmb Exp $ * */ @@ -160,7 +160,7 @@ static void logpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { this->size = 0; /* stream/meta info */ - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, (buf->type == BUF_AUDIO_MULAW) ? "mu-law log PCM" : "A-law log PCM" ); diff --git a/src/libxineadec/nsf.c b/src/libxineadec/nsf.c index 9c65d2157..aff552039 100644 --- a/src/libxineadec/nsf.c +++ b/src/libxineadec/nsf.c @@ -20,7 +20,7 @@ * NSF Audio "Decoder" using the Nosefart NSF engine by Matt Conte * http://www.baisoku.org/ * - * $Id: nsf.c,v 1.3 2003/11/15 13:01:21 miguelfreitas Exp $ + * $Id: nsf.c,v 1.4 2003/11/16 23:33:47 f1rmb Exp $ */ #include <stdio.h> @@ -86,7 +86,7 @@ static void nsf_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { this->channels = buf->decoder_info[3]; /* take this opportunity to initialize stream/meta information */ - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "NES Music (Nosefart)"); this->song_number = buf->content[4]; diff --git a/src/libxineadec/pcm.c b/src/libxineadec/pcm.c index 122f6c855..554a2e6fc 100644 --- a/src/libxineadec/pcm.c +++ b/src/libxineadec/pcm.c @@ -74,7 +74,7 @@ static void pcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {\ buf->decoder_flags, buf->decoder_info[1], buf->decoder_info[0]); #endif - if (xine_get_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_MODE) == 0) { + if (_x_stream_info_get(this->stream, XINE_STREAM_INFO_AUDIO_MODE) == 0) { #ifdef LOG printf(__FILE__ ": Someone changed the audio mode. Closing device\r"); #endif diff --git a/src/libxineadec/roqaudio.c b/src/libxineadec/roqaudio.c index 6ed30c42e..e446c7051 100644 --- a/src/libxineadec/roqaudio.c +++ b/src/libxineadec/roqaudio.c @@ -21,7 +21,7 @@ * For more information regarding the RoQ file format, visit: * http://www.csse.monash.edu.au/~timf/ * - * $Id: roqaudio.c,v 1.16 2003/11/15 13:01:22 miguelfreitas Exp $ + * $Id: roqaudio.c,v 1.17 2003/11/16 23:33:47 f1rmb Exp $ * */ @@ -83,7 +83,7 @@ static void roqaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) this->size = 0; /* stream/meta info */ - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "RoQ DPCM Audio"); return; |