From 51af8918e439e1223a72ef1a81104a8ebc29623a Mon Sep 17 00:00:00 2001 From: Guenter Bartsch Date: Mon, 30 Jul 2001 19:21:28 +0000 Subject: whoups, looks like a priority of 0 is not allowed :> CVS patchset: 371 CVS date: 2001/07/30 19:21:28 --- src/libac3/xine_decoder.c | 4 ++-- src/libmpeg2/xine_decoder.c | 4 ++-- src/libmpg123/xine_decoder.c | 13 ++++++++++--- src/libw32dll/w32codec.c | 4 ++-- src/xine-engine/video_decoder.c | 7 +++---- 5 files changed, 19 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/libac3/xine_decoder.c b/src/libac3/xine_decoder.c index 092582463..3f1da4110 100644 --- a/src/libac3/xine_decoder.c +++ b/src/libac3/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.20 2001/07/30 17:13:21 guenter Exp $ + * $Id: xine_decoder.c,v 1.21 2001/07/30 19:21:28 guenter Exp $ * * stuff needed to turn libac3 into a xine decoder plugin */ @@ -464,7 +464,7 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, config_values_t * this->audio_decoder.decode_data = ac3dec_decode_data; this->audio_decoder.close = ac3dec_close; this->audio_decoder.get_identifier = ac3dec_get_id; - this->audio_decoder.priority = 0; + this->audio_decoder.priority = 1; this->ac3_level = (float) cfg->lookup_int (cfg, "ac3_level", 100) / 100.0; diff --git a/src/libmpeg2/xine_decoder.c b/src/libmpeg2/xine_decoder.c index 613dc3010..fbb108c2f 100644 --- a/src/libmpeg2/xine_decoder.c +++ b/src/libmpeg2/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.12 2001/07/30 17:13:21 guenter Exp $ + * $Id: xine_decoder.c,v 1.13 2001/07/30 19:21:28 guenter Exp $ * * stuff needed to turn libmpeg2 into a xine decoder plugin */ @@ -116,7 +116,7 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, config_values_t * this->video_decoder.decode_data = mpeg2dec_decode_data; this->video_decoder.close = mpeg2dec_close; this->video_decoder.get_identifier = mpeg2dec_get_id; - this->video_decoder.priority = 0; + this->video_decoder.priority = 1; return (video_decoder_t *) this; } diff --git a/src/libmpg123/xine_decoder.c b/src/libmpg123/xine_decoder.c index 339b2a0d6..1e3e9e7a3 100644 --- a/src/libmpg123/xine_decoder.c +++ b/src/libmpg123/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.2 2001/06/09 17:07:21 guenter Exp $ + * $Id: xine_decoder.c,v 1.3 2001/07/30 19:21:28 guenter Exp $ * * stuff needed to turn libmpg123 into a xine decoder plugin */ @@ -91,17 +91,24 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, config_values_t * mpgdec_decoder_t *this ; - if (iface_version != 1) + if (iface_version != 2) { + printf( "libmpg123: plugin doesn't support plugin API version %d.\n" + "libmpg123: this means there's a version mismatch between xine and this " + "libmpg123: decoder plugin.\nInstalling current plugins should help.\n", + iface_version); + return NULL; + } this = (mpgdec_decoder_t *) malloc (sizeof (mpgdec_decoder_t)); - this->audio_decoder.interface_version = 1; + this->audio_decoder.interface_version = 2; this->audio_decoder.can_handle = mpgdec_can_handle; this->audio_decoder.init = mpgdec_init; this->audio_decoder.decode_data = mpgdec_decode_data; this->audio_decoder.close = mpgdec_close; this->audio_decoder.get_identifier = mpgdec_get_id; + this->audio_decoder.priority = 1; return (audio_decoder_t *) this; } diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 3348da98d..c644ec72d 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: w32codec.c,v 1.13 2001/07/30 17:13:21 guenter Exp $ + * $Id: w32codec.c,v 1.14 2001/07/30 19:21:29 guenter Exp $ * * routines for using w32 codecs * @@ -633,7 +633,7 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, config_values_t * this->audio_decoder.decode_data = w32a_decode_data; this->audio_decoder.close = w32a_close; this->audio_decoder.get_identifier = w32a_get_id; - this->audio_decoder.priority = 0; + this->audio_decoder.priority = 1; return (audio_decoder_t *) this; } diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index 5a2a72298..6ffb1edd7 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.31 2001/07/14 12:50:34 guenter Exp $ + * $Id: video_decoder.c,v 1.32 2001/07/30 19:21:29 guenter Exp $ * */ @@ -45,7 +45,7 @@ void *video_decoder_loop (void *this_gen) { if (buf->input_pos) this->cur_input_pos = buf->input_pos; - /* printf ("video_decoder: got buffer %d\n", buf->type); */ + /* printf ("video_decoder: got buffer %d\n", buf->type); */ switch (buf->type & 0xffff0000) { case BUF_CONTROL_START: @@ -104,7 +104,7 @@ void *video_decoder_loop (void *this_gen) { /* printf ("video_decoder: got package %d, decoder_info[0]:%d\n", buf, buf->decoder_info[0]); - */ + */ streamtype = (buf->type>>16) & 0xFF; @@ -124,7 +124,6 @@ void *video_decoder_loop (void *this_gen) { decoder->decode_data (this->cur_video_decoder_plugin, buf); } - break; case BUF_CONTROL_END: -- cgit v1.2.3