diff options
Diffstat (limited to 'src/libxineadec')
| -rw-r--r-- | src/libxineadec/adpcm.c | 5 | ||||
| -rw-r--r-- | src/libxineadec/logpcm.c | 32 | ||||
| -rw-r--r-- | src/libxineadec/roqaudio.c | 3 |
3 files changed, 17 insertions, 23 deletions
diff --git a/src/libxineadec/adpcm.c b/src/libxineadec/adpcm.c index b84af1739..f556e599c 100644 --- a/src/libxineadec/adpcm.c +++ b/src/libxineadec/adpcm.c @@ -24,7 +24,7 @@ * formats can be found here: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: adpcm.c,v 1.14 2002/09/05 20:44:41 mroi Exp $ + * $Id: adpcm.c,v 1.15 2002/09/05 22:19:01 mroi Exp $ */ #include <stdio.h> @@ -1146,7 +1146,6 @@ static void *init_audio_decoder_plugin (xine_t *xine, void *data) { this->audio_decoder.close = adpcm_close; this->audio_decoder.get_identifier = adpcm_get_id; this->audio_decoder.dispose = adpcm_dispose; - this->audio_decoder.priority = 9; return this; } @@ -1159,7 +1158,7 @@ static uint32_t audio_types[] = { static decoder_info_t dec_info_audio = { audio_types, /* supported types */ - 1 /* priority */ + 9 /* priority */ }; plugin_info_t xine_plugin_info[] = { diff --git a/src/libxineadec/logpcm.c b/src/libxineadec/logpcm.c index d36b83aee..499937be2 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.4 2002/09/05 20:44:41 mroi Exp $ + * $Id: logpcm.c,v 1.5 2002/09/05 22:19:01 mroi Exp $ * */ @@ -137,13 +137,6 @@ static int alaw2linear(unsigned char a_val) { } -static int logpcm_can_handle (audio_decoder_t *this_gen, int buf_type) { - - return (buf_type == BUF_AUDIO_MULAW || - buf_type == BUF_AUDIO_ALAW); - -} - static void logpcm_reset (audio_decoder_t *this_gen) { } @@ -250,17 +243,9 @@ static void logpcm_dispose (audio_decoder_t *this_gen) { free (this_gen); } -static void *init_audio_decoder_plugin (int iface_version, xine_t *xine) { +static void *init_audio_decoder_plugin (xine_t *xine, void *data) { logpcm_decoder_t *this; - if (iface_version != 9) { - printf(_("logpcm: plugin doesn't support plugin API version %d.\n" - "logpcm: this means there's a version mismatch between xine and this\n" - "logpcm: decoder plugin.\nInstalling current plugins should help.\n"), - iface_version); - - return NULL; - } this = (logpcm_decoder_t *) malloc (sizeof (logpcm_decoder_t)); @@ -270,8 +255,19 @@ static void *init_audio_decoder_plugin (int iface_version, xine_t *xine) { this->audio_decoder.close = logpcm_close; this->audio_decoder.get_identifier = logpcm_get_id; this->audio_decoder.dispose = logpcm_dispose; - this->audio_decoder.priority = 5; return (audio_decoder_t *) this; } +static uint32_t audio_types[] = { BUF_AUDIO_MULAW, BUF_AUDIO_ALAW, 0 }; + +static decoder_info_t dec_info_audio = { + audio_types, /* supported types */ + 5 /* priority */ +}; + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_AUDIO_DECODER, 9, "Logarithmic PCM", XINE_VERSION_CODE, &dec_info_audio, &init_audio_decoder_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/libxineadec/roqaudio.c b/src/libxineadec/roqaudio.c index 2f0b83da4..59da90eb4 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.6 2002/09/05 20:44:41 mroi Exp $ + * $Id: roqaudio.c,v 1.7 2002/09/05 22:19:01 mroi Exp $ * */ @@ -194,7 +194,6 @@ static void *init_audio_decoder_plugin (xine_t *xine, void *data) { this->audio_decoder.close = roqaudio_close; this->audio_decoder.get_identifier = roqaudio_get_id; this->audio_decoder.dispose = roqaudio_dispose; - this->audio_decoder.priority = 5; return (audio_decoder_t *) this; } |