diff options
72 files changed, 230 insertions, 421 deletions
diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index c56b4fa8f..e2d5b7391 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -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: demux.h,v 1.17 2002/07/05 17:31:59 mroi Exp $ + * $Id: demux.h,v 1.18 2002/09/05 22:18:50 mroi Exp $ */ #ifndef HAVE_DEMUX_H @@ -60,11 +60,6 @@ typedef struct demux_plugin_s demux_plugin_t; struct demux_plugin_s { /* - * plugin interface version, lower versions _may_ be supported - */ - int interface_version; - - /* * ask demuxer to open the given stream (input-plugin) * using the content-detection method specified in <stage> * diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 36be57f73..058eb036b 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -19,7 +19,7 @@ * * AIFF File Demuxer by Mike Melanson (melanson@pcisys.net) * - * $Id: demux_aiff.c,v 1.3 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_aiff.c,v 1.4 2002/09/05 22:18:51 mroi Exp $ * */ @@ -496,7 +496,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for aiff demuxer"), NULL, 10, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_aiff_open; this->demux_plugin.start = demux_aiff_start; this->demux_plugin.seek = demux_aiff_seek; diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 97724b9b9..a17e0adf4 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.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: demux_asf.c,v 1.55 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_asf.c,v 1.56 2002/09/05 22:18:51 mroi Exp $ * * demultiplexer for asf streams * @@ -1452,7 +1452,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) { _("valid mrls ending for asf demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_asf_open; this->demux_plugin.start = demux_asf_start; this->demux_plugin.seek = demux_asf_seek; diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 4e0ff1acc..587ec2279 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.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: demux_avi.c,v 1.108 2002/09/04 23:31:07 guenter Exp $ + * $Id: demux_avi.c,v 1.109 2002/09/05 22:18:51 mroi Exp $ * * demultiplexer for avi streams * @@ -1604,7 +1604,6 @@ static void *init_demuxer_plugin(xine_t *xine, void *data) { _("valid mrls ending for avi demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_avi_open; this->demux_plugin.start = demux_avi_start; this->demux_plugin.seek = demux_avi_seek; diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c index 2afd05895..f8c6bbbb5 100644 --- a/src/demuxers/demux_cda.c +++ b/src/demuxers/demux_cda.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: demux_cda.c,v 1.22 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_cda.c,v 1.23 2002/09/05 22:18:51 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -305,7 +305,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { this->config = xine->config; this->xine = xine; - this->demux_plugin.interface_version = DEMUX_CDA_IFACE_VERSION; this->demux_plugin.open = demux_cda_open; this->demux_plugin.start = demux_cda_start; this->demux_plugin.seek = demux_cda_seek; diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 4063a71d5..e879a38a8 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.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: demux_elem.c,v 1.50 2002/09/04 23:31:07 guenter Exp $ + * $Id: demux_elem.c,v 1.51 2002/09/05 22:18:51 mroi Exp $ * * demultiplexer for elementary mpeg streams * @@ -371,7 +371,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) { _("valid mrls ending for elementary demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUX_MPEG_ELEM_IFACE_VERSION; this->demux_plugin.open = demux_mpeg_elem_open; this->demux_plugin.start = demux_mpeg_elem_start; this->demux_plugin.seek = demux_mpeg_elem_seek; diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 73967a5f1..66724faf7 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -21,7 +21,7 @@ * For more information on the FILM file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_film.c,v 1.23 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_film.c,v 1.24 2002/09/05 22:18:51 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -804,7 +804,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for film demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_film_open; this->demux_plugin.start = demux_film_start; this->demux_plugin.seek = demux_film_seek; diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index 11d8460f2..e16da55fd 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -22,7 +22,7 @@ * avoid while programming a FLI decoder, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_fli.c,v 1.8 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_fli.c,v 1.9 2002/09/05 22:18:51 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -421,7 +421,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { "valid mrls ending for fli demuxer", NULL, 10, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_fli_open; this->demux_plugin.start = demux_fli_start; this->demux_plugin.seek = demux_fli_seek; diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index 79ef976b7..749f3e938 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -63,7 +63,7 @@ * - if any bytes exceed 63, do not shift the bytes at all before * transmitting them to the video decoder * - * $Id: demux_idcin.c,v 1.8 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_idcin.c,v 1.9 2002/09/05 22:18:51 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -607,7 +607,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for idcin demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_idcin_open; this->demux_plugin.start = demux_idcin_start; this->demux_plugin.seek = demux_idcin_seek; diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 8347d2de7..1e4649701 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.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: demux_mpeg.c,v 1.74 2002/09/04 23:31:07 guenter Exp $ + * $Id: demux_mpeg.c,v 1.75 2002/09/05 22:18:52 mroi Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -1157,7 +1157,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) { _("valid mrls ending for mpeg demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_mpeg_open; this->demux_plugin.start = demux_mpeg_start; this->demux_plugin.seek = demux_mpeg_seek; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index fb2992b79..e3421fbf1 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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: demux_mpeg_block.c,v 1.111 2002/09/04 23:31:07 guenter Exp $ + * $Id: demux_mpeg_block.c,v 1.112 2002/09/05 22:18:52 mroi Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -1201,7 +1201,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) { _("valid mrls ending for mpeg block demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_mpeg_block_open; this->demux_plugin.start = demux_mpeg_block_start; this->demux_plugin.seek = demux_mpeg_block_seek; diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index ec9b8c02d..67cdc7854 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.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: demux_mpgaudio.c,v 1.59 2002/09/04 23:31:08 guenter Exp $ + * $Id: demux_mpgaudio.c,v 1.60 2002/09/05 22:18:52 mroi Exp $ * * demultiplexer for mpeg audio (i.e. mp3) streams * @@ -666,7 +666,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) { _("valid mrls ending for mpeg audio demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUX_MPGAUDIO_IFACE_VERSION; this->demux_plugin.open = demux_mpgaudio_open; this->demux_plugin.start = demux_mpgaudio_start; this->demux_plugin.seek = demux_mpgaudio_seek; diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index d3deffede..18529bd5b 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.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: demux_ogg.c,v 1.40 2002/09/04 23:31:08 guenter Exp $ + * $Id: demux_ogg.c,v 1.41 2002/09/05 22:18:52 mroi Exp $ * * demultiplexer for ogg streams * @@ -1086,7 +1086,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) { _("valid mrls ending for ogg demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_ogg_open; this->demux_plugin.start = demux_ogg_start; this->demux_plugin.seek = demux_ogg_seek; diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c index ab492fce8..9259431e7 100644 --- a/src/demuxers/demux_pes.c +++ b/src/demuxers/demux_pes.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: demux_pes.c,v 1.36 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_pes.c,v 1.37 2002/09/05 22:18:52 mroi Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -618,7 +618,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for pes demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_pes_open; this->demux_plugin.start = demux_pes_start; this->demux_plugin.seek = demux_pes_seek; diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index fe8922ae5..d0849581c 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -30,7 +30,7 @@ * build_frame_table * free_qt_info * - * $Id: demux_qt.c,v 1.81 2002/09/04 23:31:08 guenter Exp $ + * $Id: demux_qt.c,v 1.82 2002/09/05 22:18:52 mroi Exp $ * */ @@ -1763,7 +1763,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) { _("valid mrls ending for qt demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_qt_open; this->demux_plugin.start = demux_qt_start; this->demux_plugin.seek = demux_qt_seek; diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index b9f4cea10..7f398b7a6 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -21,7 +21,7 @@ * For more information regarding the RoQ file format, visit: * http://www.csse.monash.edu.au/~timf/ * - * $Id: demux_roq.c,v 1.12 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_roq.c,v 1.13 2002/09/05 22:18:52 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -544,7 +544,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for roq demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_roq_open; this->demux_plugin.start = demux_roq_start; this->demux_plugin.seek = demux_roq_seek; diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index a0aef33f0..2ad210a00 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -21,7 +21,7 @@ * For more information on the SMJPEG file format, visit: * http://www.lokigames.com/development/smjpeg.php3 * - * $Id: demux_smjpeg.c,v 1.12 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_smjpeg.c,v 1.13 2002/09/05 22:18:53 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -573,7 +573,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for smjpeg demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_smjpeg_open; this->demux_plugin.start = demux_smjpeg_start; this->demux_plugin.seek = demux_smjpeg_seek; diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index 02139bcdc..b2a50b710 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -19,7 +19,7 @@ * * SND/AU File Demuxer by Mike Melanson (melanson@pcisys.net) * - * $Id: demux_snd.c,v 1.4 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_snd.c,v 1.5 2002/09/05 22:18:53 mroi Exp $ * */ @@ -481,7 +481,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for snd demuxer"), NULL, 10, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_snd_open; this->demux_plugin.start = demux_snd_start; this->demux_plugin.seek = demux_snd_seek; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 1293f36d1..5d9a01547 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.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: demux_ts.c,v 1.54 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_ts.c,v 1.55 2002/09/05 22:18:53 mroi Exp $ * * Demultiplexer for MPEG2 Transport Streams. * @@ -1683,7 +1683,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for ts demuxer"), NULL, 20, NULL, NULL); - this->plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->plugin.open = demux_ts_open; this->plugin.start = demux_ts_start; this->plugin.seek = demux_ts_seek; diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index 67071ed32..1f5bd88a3 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -23,7 +23,7 @@ * It will only play that block if it is PCM data. More variations will be * supported as they are encountered. * - * $Id: demux_voc.c,v 1.4 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_voc.c,v 1.5 2002/09/05 22:18:53 mroi Exp $ * */ @@ -473,7 +473,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for voc demuxer"), NULL, 10, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_voc_open; this->demux_plugin.start = demux_voc_start; this->demux_plugin.seek = demux_voc_seek; diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index de693d6fe..b8ea41078 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -21,7 +21,7 @@ * For more information regarding the VQA file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_vqa.c,v 1.4 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_vqa.c,v 1.5 2002/09/05 22:18:53 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -570,7 +570,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for vqa demuxer"), NULL, 10, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_vqa_open; this->demux_plugin.start = demux_vqa_start; this->demux_plugin.seek = demux_vqa_seek; diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index 910781153..020d4a8a0 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -20,7 +20,7 @@ * MS WAV File Demuxer by Mike Melanson (melanson@pcisys.net) * based on WAV specs that are available far and wide * - * $Id: demux_wav.c,v 1.10 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_wav.c,v 1.11 2002/09/05 22:18:53 mroi Exp $ * */ @@ -482,7 +482,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for wav demuxer"), NULL, 20, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_wav_open; this->demux_plugin.start = demux_wav_start; this->demux_plugin.seek = demux_wav_seek; diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index 4dacb26df..5d1f1cd14 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -22,7 +22,7 @@ * For more information on the MVE file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_wc3movie.c,v 1.5 2002/09/05 20:44:39 mroi Exp $ + * $Id: demux_wc3movie.c,v 1.6 2002/09/05 22:18:53 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -611,7 +611,6 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) { _("valid mrls ending for mve demuxer"), NULL, 10, NULL, NULL); - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_mve_open; this->demux_plugin.start = demux_mve_start; this->demux_plugin.seek = demux_mve_seek; diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index 6cfcf619c..01b445d0d 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.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: dxr3_decode_spu.c,v 1.17 2002/09/05 12:52:24 mroi Exp $ + * $Id: dxr3_decode_spu.c,v 1.18 2002/09/05 22:18:54 mroi Exp $ */ /* dxr3 spu decoder plugin. @@ -66,14 +66,13 @@ static decoder_info_t dxr3_spudec_info = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_SPU_DECODER, 10, "dxr3-spudec", XINE_VERSION_CODE, &dxr3_spudec_info, &dxr3_spudec_init_plugin }, + { PLUGIN_SPU_DECODER, 9, "dxr3-spudec", XINE_VERSION_CODE, &dxr3_spudec_info, &dxr3_spudec_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; /* functions required by xine api */ static char *dxr3_spudec_get_id(void); -static int dxr3_spudec_can_handle(spu_decoder_t *this_gen, int buf_type); static void dxr3_spudec_init(spu_decoder_t *this_gen, vo_instance_t *vo_out); static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf); static void dxr3_spudec_reset(spu_decoder_t *this_gen); @@ -145,13 +144,11 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void* data) } this->spu_decoder.get_identifier = dxr3_spudec_get_id; - this->spu_decoder.can_handle = dxr3_spudec_can_handle; this->spu_decoder.init = dxr3_spudec_init; this->spu_decoder.decode_data = dxr3_spudec_decode_data; this->spu_decoder.reset = dxr3_spudec_reset; this->spu_decoder.close = dxr3_spudec_close; this->spu_decoder.dispose = dxr3_spudec_dispose; - this->spu_decoder.priority = 10; this->xine = xine; /* We need to talk to dxr3 video out to coordinate spus and overlays */ @@ -175,13 +172,6 @@ static char *dxr3_spudec_get_id(void) return "dxr3-spudec"; } -static int dxr3_spudec_can_handle(spu_decoder_t *this_gen, int buf_type) -{ - int type = buf_type & 0xFFFF0000; - return (type == BUF_SPU_PACKAGE || type == BUF_SPU_CLUT || - type == BUF_SPU_NAV || type == BUF_SPU_SUBP_CONTROL); -} - static void dxr3_spudec_init(spu_decoder_t *this_gen, vo_instance_t *vo_out) { dxr3_spudec_t *this = (dxr3_spudec_t *)this_gen; diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 15bdf1387..89b82937c 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.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: dxr3_decode_video.c,v 1.14 2002/09/05 20:44:39 mroi Exp $ + * $Id: dxr3_decode_video.c,v 1.15 2002/09/05 22:18:54 mroi Exp $ */ /* dxr3 video decoder plugin. @@ -130,7 +130,6 @@ static void parse_mpeg_header(dxr3_decoder_t *this, uint8_t *buffer); static int get_duration(dxr3_decoder_t *this); /* config callbacks */ -static void dxr3_update_priority(void *this_gen, xine_cfg_entry_t *entry); static void dxr3_update_sync_mode(void *this_gen, xine_cfg_entry_t *entry); static void dxr3_update_enhanced_mode(void *this_gen, xine_cfg_entry_t *entry); static void dxr3_update_correct_durations(void *this_gen, xine_cfg_entry_t *entry); @@ -171,11 +170,7 @@ static void *dxr3_init_plugin(xine_t *xine, void *data) this->video_decoder.reset = dxr3_reset; this->video_decoder.close = dxr3_close; this->video_decoder.dispose = dxr3_dispose; - this->video_decoder.priority = cfg->register_num(cfg, - "dxr3.decoder_priority", 10, _("Dxr3: video decoder priority"), - _("Decoder priorities greater 5 enable hardware decoding, 0 disables it."), 20, - dxr3_update_priority, this); - + this->scr = NULL; this->xine = xine; @@ -672,13 +667,6 @@ static int get_duration(dxr3_decoder_t *this) return duration; } -static void dxr3_update_priority(void *this_gen, xine_cfg_entry_t *entry) -{ - ((dxr3_decoder_t *)this_gen)->video_decoder.priority = entry->num_value; - printf("dxr3_decode_video: setting decoder priority to %d\n", - entry->num_value); -} - static void dxr3_update_sync_mode(void *this_gen, xine_cfg_entry_t *entry) { ((dxr3_decoder_t *)this_gen)->sync_every_frame = entry->num_value; diff --git a/src/input/input_cda.c b/src/input/input_cda.c index 3f64984d3..cec013532 100644 --- a/src/input/input_cda.c +++ b/src/input/input_cda.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: input_cda.c,v 1.31 2002/09/05 20:44:39 mroi Exp $ + * $Id: input_cda.c,v 1.32 2002/09/05 22:18:54 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -1796,7 +1796,6 @@ static void *init_input_plugin (xine_t *xine, void *data) { this->filelist[i] = (char *) xine_xmalloc(sizeof(char *) * 256); } - this->input_plugin.interface_version = INPUT_PLUGIN_IFACE_VERSION; this->input_plugin.get_capabilities = cda_plugin_get_capabilities; this->input_plugin.open = cda_plugin_open; this->input_plugin.read = cda_plugin_read; diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index cadc69e0d..76aaab973 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,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: input_dvd.c,v 1.75 2002/09/05 20:44:39 mroi Exp $ + * $Id: input_dvd.c,v 1.76 2002/09/05 22:18:54 mroi Exp $ * */ @@ -1393,7 +1393,6 @@ static void *init_input_plugin (xine_t *xine, void *data) { this = (dvdnav_input_plugin_t *) malloc (sizeof (dvdnav_input_plugin_t)); - this->input_plugin.interface_version = INPUT_PLUGIN_IFACE_VERSION; this->input_plugin.get_capabilities = dvdnav_plugin_get_capabilities; this->input_plugin.open = dvdnav_plugin_open; this->input_plugin.read = dvdnav_plugin_read; @@ -1497,6 +1496,10 @@ static void *init_input_plugin (xine_t *xine, void *data) { /* * $Log: input_dvd.c,v $ + * Revision 1.76 2002/09/05 22:18:54 mroi + * remove plugin's private priority and interface members + * adapt some more decoders + * * Revision 1.75 2002/09/05 20:44:39 mroi * make all the plugin init functions static * (geez this was a job) diff --git a/src/input/input_file.c b/src/input/input_file.c index cfea3fc55..42bd3a80d 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.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: input_file.c,v 1.55 2002/09/05 20:44:39 mroi Exp $ + * $Id: input_file.c,v 1.56 2002/09/05 22:18:54 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -856,7 +856,6 @@ static void *init_input_plugin (xine_t *xine, void *data) { config = xine->config; this->xine = xine; - this->input_plugin.interface_version = INPUT_PLUGIN_IFACE_VERSION; this->input_plugin.get_capabilities = file_plugin_get_capabilities; this->input_plugin.open = file_plugin_open; this->input_plugin.read = file_plugin_read; diff --git a/src/input/input_http.c b/src/input/input_http.c index f74506732..954c8d2e0 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -694,7 +694,6 @@ static void *init_input_plugin (xine_t *xine, void *data) { config = xine->config; this->xine = xine; - this->input_plugin.interface_version = INPUT_PLUGIN_IFACE_VERSION; this->input_plugin.get_capabilities = http_plugin_get_capabilities; this->input_plugin.open = http_plugin_open; this->input_plugin.read = http_plugin_read; diff --git a/src/input/input_mms.c b/src/input/input_mms.c index 07e67bed7..d18a568cb 100644 --- a/src/input/input_mms.c +++ b/src/input/input_mms.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: input_mms.c,v 1.17 2002/09/05 20:44:39 mroi Exp $ + * $Id: input_mms.c,v 1.18 2002/09/05 22:18:55 mroi Exp $ * * mms input plugin based on work from major mms */ @@ -293,7 +293,6 @@ static void *init_input_plugin (xine_t *xine, void *data) { config = xine->config; this->xine = xine; - this->input_plugin.interface_version = INPUT_PLUGIN_IFACE_VERSION; this->input_plugin.get_capabilities = mms_plugin_get_capabilities; this->input_plugin.open = mms_plugin_open; this->input_plugin.read = mms_plugin_read; diff --git a/src/input/input_net.c b/src/input/input_net.c index 00abfa9e5..9df193864 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -340,7 +340,6 @@ static void *init_input_plugin (xine_t *xine, void *data) { config = xine->config; this->xine = xine; - this->input_plugin.interface_version = INPUT_PLUGIN_IFACE_VERSION; this->input_plugin.get_capabilities = net_plugin_get_capabilities; this->input_plugin.open = net_plugin_open; this->input_plugin.read = net_plugin_read; diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index 428ee4e71..0131e211c 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -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: input_plugin.h,v 1.28 2002/09/05 20:19:49 guenter Exp $ + * $Id: input_plugin.h,v 1.29 2002/09/05 22:18:55 mroi Exp $ */ #ifndef HAVE_INPUT_PLUGIN_H @@ -142,11 +142,6 @@ struct input_plugin_s { /* - * plugin interface version, lower versions _may_ be supported - */ - int interface_version; - - /* * return capabilities of input source */ diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index d4db61874..f61b649c8 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -526,7 +526,6 @@ static void *init_input_plugin (xine_t *xine, void *data) { this->free_buffers = buf; } - this->input_plugin.interface_version = INPUT_PLUGIN_IFACE_VERSION; this->input_plugin.get_capabilities = rtp_plugin_get_capabilities; this->input_plugin.open = rtp_plugin_open; this->input_plugin.read = rtp_plugin_read; diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index 46c80e283..dd9f26da3 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.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: input_stdin_fifo.c,v 1.30 2002/09/05 20:44:39 mroi Exp $ + * $Id: input_stdin_fifo.c,v 1.31 2002/09/05 22:18:55 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -356,7 +356,6 @@ static void *init_input_plugin (xine_t *xine, void *data) { config = xine->config; this->xine = xine; - this->input_plugin.interface_version = INPUT_PLUGIN_IFACE_VERSION; this->input_plugin.get_capabilities = stdin_plugin_get_capabilities; this->input_plugin.open = stdin_plugin_open; this->input_plugin.read = stdin_plugin_read; diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 7ea1cc9e8..b875ea277 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.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: input_vcd.c,v 1.49 2002/09/05 20:44:39 mroi Exp $ + * $Id: input_vcd.c,v 1.50 2002/09/05 22:18:55 mroi Exp $ * */ @@ -1149,7 +1149,6 @@ static void *init_input_plugin (xine_t *xine, void *data) { this->filelist[i] = (char *) xine_xmalloc(sizeof(char *) * 256); } - this->input_plugin.interface_version = INPUT_PLUGIN_IFACE_VERSION; this->input_plugin.get_capabilities = vcd_plugin_get_capabilities; this->input_plugin.open = vcd_plugin_open; this->input_plugin.read = vcd_plugin_read; diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c index a4cb1effc..26a7403dc 100644 --- a/src/liba52/xine_decoder.c +++ b/src/liba52/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.31 2002/09/05 20:44:39 mroi Exp $ + * $Id: xine_decoder.c,v 1.32 2002/09/05 22:18:55 mroi Exp $ * * stuff needed to turn liba52 into a xine decoder plugin */ @@ -549,7 +549,6 @@ static void *init_audio_decoder_plugin (xine_t *xine, void *data) { this->audio_decoder.close = a52dec_close; this->audio_decoder.get_identifier = a52dec_get_id; this->audio_decoder.dispose = a52dec_dispose; - this->audio_decoder.priority = 2; this->a52_level = (float) cfg->register_range (cfg, "codec.a52_level", 100, diff --git a/src/libdivx4/xine_decoder.c b/src/libdivx4/xine_decoder.c index 3d9c853a4..e03f245b9 100644 --- a/src/libdivx4/xine_decoder.c +++ b/src/libdivx4/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.42 2002/09/05 20:44:39 mroi Exp $ + * $Id: xine_decoder.c,v 1.43 2002/09/05 22:18:56 mroi Exp $ * * xine decoder plugin using divx4 * @@ -582,9 +582,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.flush = divx4_flush; this->video_decoder.reset = divx4_reset; this->video_decoder.dispose = divx4_dispose; - this->video_decoder.priority = cfg->register_num (cfg, "codec.divx4_priority", 4, - _("priority of the divx4 plugin (>5 => enable)"), - NULL, 0, NULL, NULL); this->decore = libdecore_func; this->postproc = cfg->register_range (cfg, "codec.divx4_postproc", 3, 0, 6, diff --git a/src/libdts/xine_decoder.c b/src/libdts/xine_decoder.c index 91516d5f0..2970a5e82 100644 --- a/src/libdts/xine_decoder.c +++ b/src/libdts/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.25 2002/09/05 20:44:40 mroi Exp $ + * $Id: xine_decoder.c,v 1.26 2002/09/05 22:18:56 mroi Exp $ * * 04-09-2001 DTS passtrough (C) Joachim Koenig * 09-12-2001 DTS passthrough inprovements (C) James Courtier-Dutton @@ -232,7 +232,6 @@ static void *init_audio_decoder_plugin (xine_t *xine, void *data) { this->audio_decoder.close = dts_close; this->audio_decoder.get_identifier = dts_get_id; this->audio_decoder.dispose = dts_dispose; - this->audio_decoder.priority = 1; return this; } diff --git a/src/libfaad/xine_decoder.c b/src/libfaad/xine_decoder.c index 8998a6008..cf78866de 100644 --- a/src/libfaad/xine_decoder.c +++ b/src/libfaad/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.7 2002/09/05 20:44:40 mroi Exp $ + * $Id: xine_decoder.c,v 1.8 2002/09/05 22:18:56 mroi Exp $ * */ @@ -362,7 +362,6 @@ static void *init_audio_decoder_plugin (xine_t *xine, void *data) { this->audio_decoder.close = faad_close; this->audio_decoder.get_identifier = faad_get_id; this->audio_decoder.dispose = faad_dispose; - this->audio_decoder.priority = 1; return this; } diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index 9b5871b5b..7d008c7b8 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/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.53 2002/09/05 20:44:40 mroi Exp $ + * $Id: xine_decoder.c,v 1.54 2002/09/05 22:18:56 mroi Exp $ * * xine decoder plugin using ffmpeg * @@ -621,7 +621,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.reset = ff_reset; this->video_decoder.close = ff_close; this->video_decoder.get_identifier = ff_get_id; - this->video_decoder.priority = 5; this->video_decoder.dispose = ff_dispose; this->size = 0; diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c index 21eb37d93..f525b6b69 100644 --- a/src/liblpcm/xine_decoder.c +++ b/src/liblpcm/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.33 2002/09/05 20:44:40 mroi Exp $ + * $Id: xine_decoder.c,v 1.34 2002/09/05 22:18:56 mroi Exp $ * * 31-8-2001 Added LPCM rate sensing. * (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk @@ -209,7 +209,6 @@ static void *init_audio_decoder_plugin (xine_t *xine, void *data) { this->audio_decoder.close = lpcm_close; this->audio_decoder.get_identifier = lpcm_get_id; this->audio_decoder.dispose = lpcm_dispose; - this->audio_decoder.priority = 1; return this; } diff --git a/src/libmad/xine_decoder.c b/src/libmad/xine_decoder.c index cef98cbfa..b3cee4ad9 100644 --- a/src/libmad/xine_decoder.c +++ b/src/libmad/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.25 2002/09/05 20:44:40 mroi Exp $ + * $Id: xine_decoder.c,v 1.26 2002/09/05 22:18:57 mroi Exp $ * * stuff needed to turn libmad into a xine decoder plugin */ @@ -282,7 +282,6 @@ static void *init_audio_decoder_plugin (xine_t *xine, void *data) { this->audio_decoder.close = mad_close; this->audio_decoder.get_identifier = mad_get_id; this->audio_decoder.dispose = mad_dispose; - this->audio_decoder.priority = 5; return this; } diff --git a/src/libmpeg2/xine_decoder.c b/src/libmpeg2/xine_decoder.c index b7e1e8092..f3a548c1e 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.39 2002/09/05 20:44:40 mroi Exp $ + * $Id: xine_decoder.c,v 1.40 2002/09/05 22:18:57 mroi Exp $ * * stuff needed to turn libmpeg2 into a xine decoder plugin */ @@ -171,7 +171,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.close = mpeg2dec_close; this->video_decoder.get_identifier = mpeg2dec_get_id; this->video_decoder.dispose = mpeg2dec_dispose; - this->video_decoder.priority = 6; /* higher than ffmpeg */ this->mpeg2.xine = xine; pthread_mutex_init (&this->lock, NULL); @@ -187,7 +186,7 @@ static uint32_t supported_types[] = { BUF_VIDEO_MPEG, 0 }; static decoder_info_t dec_info_mpeg2 = { supported_types, /* supported types */ - 5 /* priority */ + 6 /* priority */ }; plugin_info_t xine_plugin_info[] = { diff --git a/src/libmpg123/xine_decoder.c b/src/libmpg123/xine_decoder.c index 8bb6bd726..a8b1ba7c0 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.9 2002/09/05 20:44:40 mroi Exp $ + * $Id: xine_decoder.c,v 1.10 2002/09/05 22:18:57 mroi Exp $ * * stuff needed to turn libmpg123 into a xine decoder plugin */ @@ -50,10 +50,6 @@ typedef struct mpgdec_decoder_s { } mpgdec_decoder_t; -int mpgdec_can_handle (audio_decoder_t *this_gen, int buf_type) { - return ((buf_type & 0xFFFF0000) == BUF_AUDIO_MPEG) ; -} - void mpgdec_reset (audio_decoder_t *this_gen) { mpgdec_decoder_t *this = (mpgdec_decoder_t *) this_gen; @@ -101,30 +97,30 @@ static char *mpgdec_get_id(void) { return "mpgdec"; } -static void *init_audio_decoder_plugin (int iface_version, config_values_t *cfg) { +static void *init_audio_decoder_plugin (xine_t *xine, void *data) { mpgdec_decoder_t *this ; - 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 = 2; - this->audio_decoder.can_handle = mpgdec_can_handle; this->audio_decoder.init = mpgdec_init; this->audio_decoder.reset = mpgdec_reset; 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; } +static uint32_t audio_types[] = { BUF_AUDIO_MPEG, 0 }; + +static decoder_info_t dec_info_audio = { + audio_types, /* supported types */ + 1 /* priority */ +}; + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_AUDIO_DECODER, 9, "mpgdec", XINE_VERSION_CODE, &dec_info_audio, init_audio_decoder_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/libspucc/xine_decoder.c b/src/libspucc/xine_decoder.c index c52d386f7..b11946c74 100644 --- a/src/libspucc/xine_decoder.c +++ b/src/libspucc/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.17 2002/09/05 20:44:40 mroi Exp $ + * $Id: xine_decoder.c,v 1.18 2002/09/05 22:18:57 mroi Exp $ * * closed caption spu decoder. receive data by events. * @@ -279,12 +279,6 @@ void spucc_notify_frame_change(spucc_decoder_t *this, int width, int height) /*------------------- implementation of spudec interface -------------------*/ -static int spudec_can_handle (spu_decoder_t *this_gen, int buf_type) { - int type = buf_type & 0xFFFF0000; - return (type == BUF_SPU_CC); -} - - static void spudec_init (spu_decoder_t *this_gen, vo_instance_t *vo_out) { spucc_decoder_t *this = (spucc_decoder_t *) this_gen; @@ -380,28 +374,18 @@ static void spudec_dispose (spu_decoder_t *this_gen) { } -static void *init_spu_decoder_plugin (int iface_version, xine_t *xine) { +static void *init_spu_decoder_plugin (xine_t *xine, void *data) { spucc_decoder_t *this ; - if (iface_version != 9) { - printf(_("libspucc: doesn't support plugin api version %d.\n" - "libspucc: This means there is a version mismatch between xine and\n" - "libspucc: this plugin.\n"), iface_version); - return NULL; - } - this = (spucc_decoder_t *) xine_xmalloc (sizeof (spucc_decoder_t)); - this->spu_decoder.interface_version = iface_version; - this->spu_decoder.can_handle = spudec_can_handle; this->spu_decoder.init = spudec_init; this->spu_decoder.decode_data = spudec_decode_data; this->spu_decoder.reset = spudec_reset; this->spu_decoder.close = spudec_close; this->spu_decoder.get_identifier = spudec_get_id; this->spu_decoder.dispose = spudec_dispose; - this->spu_decoder.priority = 1; this->xine = xine; this->cc_open = 0; @@ -415,3 +399,16 @@ static void *init_spu_decoder_plugin (int iface_version, xine_t *xine) { return (spu_decoder_t *) this; } +/* plugin catalog information */ +static uint32_t supported_types[] = { BUF_SPU_CC, 0 }; + +static decoder_info_t spudec_info = { + supported_types, /* supported types */ + 1 /* priority */ +}; + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_SPU_DECODER, 9, "spucc", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/libspudec/spu_decoder_api.h b/src/libspudec/spu_decoder_api.h index 11a908b4d..a03e02621 100644 --- a/src/libspudec/spu_decoder_api.h +++ b/src/libspudec/spu_decoder_api.h @@ -38,10 +38,6 @@ typedef struct spu_decoder_s spu_decoder_t; struct spu_decoder_s { - int interface_version; - - int (*can_handle) (spu_decoder_t *this, int buf_type); - void (*init) (spu_decoder_t *this, vo_instance_t *video_out); void (*decode_data) (spu_decoder_t *this, buf_element_t *buf); @@ -54,8 +50,6 @@ struct spu_decoder_s { void (*dispose) (spu_decoder_t *this); - int priority; - }; typedef struct spu_button_s spu_button_t; diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index ebe951995..9ee27bf01 100644 --- a/src/libspudec/xine_decoder.c +++ b/src/libspudec/xine_decoder.c @@ -19,7 +19,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.74 2002/09/05 20:44:41 mroi Exp $ + * $Id: xine_decoder.c,v 1.75 2002/09/05 22:18:58 mroi Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -67,11 +67,6 @@ static clut_t __default_clut[] = { CLUT_Y_CR_CB_INIT(0x28, 0x6d, 0xef) }; -static int spudec_can_handle (spu_decoder_t *this_gen, int buf_type) { - int type = buf_type & 0xFFFF0000; - return (type == BUF_SPU_PACKAGE || type == BUF_SPU_CLUT || type == BUF_SPU_NAV || type == BUF_SPU_SUBP_CONTROL) ; -} - static void spudec_init (spu_decoder_t *this_gen, vo_instance_t *vo_out) { spudec_decoder_t *this = (spudec_decoder_t *) this_gen; @@ -297,28 +292,18 @@ static void spudec_dispose (spu_decoder_t *this_gen) { free (this); } -static void *init_spu_decoder_plugin (int iface_version, xine_t *xine) { +static void *init_spu_decoder_plugin (xine_t *xine, void *data) { spudec_decoder_t *this ; - if (iface_version != 9) { - printf(_("libspudec: Doesn't support plugin API version %d.\n" - "libspudec: This means there is a version mismatch between XINE and\n" - "libspudec: this plugin.\n"), iface_version); - return NULL; - } - this = (spudec_decoder_t *) xine_xmalloc (sizeof (spudec_decoder_t)); - this->spu_decoder.interface_version = iface_version; - this->spu_decoder.can_handle = spudec_can_handle; this->spu_decoder.init = spudec_init; this->spu_decoder.decode_data = spudec_decode_data; this->spu_decoder.reset = spudec_reset; this->spu_decoder.close = spudec_close; this->spu_decoder.get_identifier = spudec_get_id; this->spu_decoder.dispose = spudec_dispose; - this->spu_decoder.priority = 1; this->xine = xine; @@ -331,3 +316,16 @@ static void *init_spu_decoder_plugin (int iface_version, xine_t *xine) { return (spu_decoder_t *) this; } +/* plugin catalog information */ +static uint32_t supported_types[] = { BUF_SPU_PACKAGE, BUF_SPU_CLUT, BUF_SPU_NAV, BUF_SPU_SUBP_CONTROL, 0 }; + +static decoder_info_t spudec_info = { + supported_types, /* supported types */ + 5 /* priority */ +}; + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_SPU_DECODER, 9, "spudec", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c index 482c3245b..593c6c7f4 100644 --- a/src/libsputext/xine_decoder.c +++ b/src/libsputext/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.40 2002/09/05 20:44:41 mroi Exp $ + * $Id: xine_decoder.c,v 1.41 2002/09/05 22:18:58 mroi Exp $ * * code based on mplayer module: * @@ -759,11 +759,6 @@ static void list_sub_file (sputext_decoder_t *this, subtitle_t* subs) { } -static int spudec_can_handle (spu_decoder_t *this_gen, int buf_type) { - int type = buf_type & 0xFFFF0000; - return (type == BUF_SPU_TEXT); -} - static void spudec_init (spu_decoder_t *this_gen, vo_instance_t *vo_out) { @@ -1046,29 +1041,19 @@ static void spudec_dispose (spu_decoder_t *this_gen) { free (this_gen); } -static void *init_spu_decoder_plugin (int iface_version, xine_t *xine) { +static void *init_spu_decoder_plugin (xine_t *xine, void *data) { sputext_decoder_t *this ; static char *subtitle_size_strings[] = { "small", "normal", "large", NULL }; - if (iface_version != 9) { - printf(_("libsputext: doesn't support plugin api version %d.\n" - "libsputext: This means there is a version mismatch between xine and\n" - "libsputext: this plugin.\n"), iface_version); - return NULL; - } - this = (sputext_decoder_t *) xine_xmalloc (sizeof (sputext_decoder_t)); - this->spu_decoder.interface_version = iface_version; - this->spu_decoder.can_handle = spudec_can_handle; this->spu_decoder.init = spudec_init; this->spu_decoder.decode_data = spudec_decode_data; this->spu_decoder.reset = spudec_reset; this->spu_decoder.close = spudec_close; this->spu_decoder.get_identifier = spudec_get_id; this->spu_decoder.dispose = spudec_dispose; - this->spu_decoder.priority = 1; this->xine = xine; this->font = xine->config->register_string(xine->config, @@ -1101,3 +1086,16 @@ static void *init_spu_decoder_plugin (int iface_version, xine_t *xine) { return (spu_decoder_t *) this; } +/* plugin catalog information */ +static uint32_t supported_types[] = { BUF_SPU_TEXT, 0 }; + +static decoder_info_t spudec_info = { + supported_types, /* supported types */ + 1 /* priority */ +}; + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_SPU_DECODER, 9, "sputext", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/libvorbis/xine_decoder.c b/src/libvorbis/xine_decoder.c index bdd726de3..a540382c1 100644 --- a/src/libvorbis/xine_decoder.c +++ b/src/libvorbis/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.17 2002/09/05 20:44:41 mroi Exp $ + * $Id: xine_decoder.c,v 1.18 2002/09/05 22:19:00 mroi Exp $ * * (ogg/)vorbis audio decoder plugin (libvorbis wrapper) for xine */ @@ -249,7 +249,6 @@ static void *init_audio_decoder_plugin (xine_t *xine, void *data) { this->audio_decoder.close = vorbis_close; this->audio_decoder.get_identifier = vorbis_get_id; this->audio_decoder.dispose = vorbis_dispose; - this->audio_decoder.priority = 5; return (audio_decoder_t *) this; } diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 2e0686879..2a29a1583 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.92 2002/09/05 20:44:41 mroi Exp $ + * $Id: w32codec.c,v 1.93 2002/09/05 22:19:00 mroi Exp $ * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) @@ -1322,7 +1322,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.close = w32v_close; this->video_decoder.get_identifier = w32v_get_id; this->video_decoder.dispose = w32v_dispose; - this->video_decoder.priority = 1; pthread_once (&once_control, init_routine); @@ -1359,7 +1358,6 @@ static void *init_audio_decoder_plugin (xine_t *xine, void *data) { this->audio_decoder.close = w32a_close; this->audio_decoder.get_identifier = w32a_get_id; this->audio_decoder.dispose = w32a_dispose; - this->audio_decoder.priority = 1; pthread_once (&once_control, init_routine); 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; } diff --git a/src/libxinevdec/cinepak.c b/src/libxinevdec/cinepak.c index 441b464c0..14e931644 100644 --- a/src/libxinevdec/cinepak.c +++ b/src/libxinevdec/cinepak.c @@ -22,7 +22,7 @@ * based on overview of Cinepak algorithm and example decoder * by Tim Ferguson: http://www.csse.monash.edu.au/~timf/ * - * $Id: cinepak.c,v 1.13 2002/09/05 20:44:41 mroi Exp $ + * $Id: cinepak.c,v 1.14 2002/09/05 22:19:02 mroi Exp $ */ #include <stdlib.h> @@ -454,7 +454,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.close = cvid_close; this->video_decoder.get_identifier = cvid_get_id; this->video_decoder.dispose = cvid_dispose; - this->video_decoder.priority = 5; return (video_decoder_t *) this; } diff --git a/src/libxinevdec/cyuv.c b/src/libxinevdec/cyuv.c index 16aef6bc9..fd663e315 100644 --- a/src/libxinevdec/cyuv.c +++ b/src/libxinevdec/cyuv.c @@ -18,7 +18,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: cyuv.c,v 1.7 2002/09/05 20:44:41 mroi Exp $ + * $Id: cyuv.c,v 1.8 2002/09/05 22:19:02 mroi Exp $ */ /* And this is the header that came with the CYUV decoder: */ @@ -245,7 +245,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.close = cyuv_close; this->video_decoder.get_identifier = cyuv_get_id; this->video_decoder.dispose = cyuv_dispose; - this->video_decoder.priority = 1; return this; } diff --git a/src/libxinevdec/fli.c b/src/libxinevdec/fli.c index 662aa4b35..238bc09ef 100644 --- a/src/libxinevdec/fli.c +++ b/src/libxinevdec/fli.c @@ -23,7 +23,7 @@ * avoid when implementing a FLI decoder, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: fli.c,v 1.5 2002/09/05 20:44:41 mroi Exp $ + * $Id: fli.c,v 1.6 2002/09/05 22:19:02 mroi Exp $ */ #include <stdio.h> @@ -559,10 +559,7 @@ static void fli_dispose (video_decoder_t *this_gen) { /* * This function should be the plugin's only advertised function to the * outside world. It allows xine to query the plugin module for the addresses - * to the necessary functions in the video decoder object. The video - * decoder object also has a priority field which allows different decoder - * plugins for the same buffer types to coexist peacefully. The higher the - * priority number, the more precedence a decoder has. E.g., 9 beats 1. + * to the necessary functions in the video decoder object. */ static void *init_video_decoder_plugin (xine_t *xine, void *data) { @@ -578,7 +575,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.close = fli_close; this->video_decoder.get_identifier = fli_get_id; this->video_decoder.dispose = fli_dispose; - this->video_decoder.priority = 1; return this; } diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c index e2cb23c52..3ddfea646 100644 --- a/src/libxinevdec/foovideo.c +++ b/src/libxinevdec/foovideo.c @@ -20,7 +20,7 @@ * General description and author credits go here... * * Leave the following line intact for when the decoder is committed to CVS: - * $Id: foovideo.c,v 1.5 2002/09/05 20:44:41 mroi Exp $ + * $Id: foovideo.c,v 1.6 2002/09/05 22:19:02 mroi Exp $ */ #include <stdio.h> @@ -67,6 +67,7 @@ typedef struct foovideo_decoder_s { *************************************************************************/ /* + * FIXME: revise documentation, reflect api changes * This function is called by xine to determine which buffer types this * decoder knows how to handle. * Parameters: @@ -251,28 +252,15 @@ static void foovideo_dispose (video_decoder_t *this_gen) { /* * This function should be the plugin's only advertised function to the * outside world. It allows xine to query the plugin module for the addresses - * to the necessary functions in the video decoder object. The video - * decoder object also has a priority field which allows different decoder - * plugins for the same buffer types to coexist peacefully. The higher the - * priority number, the more precedence a decoder has. E.g., 9 beats 1. + * to the necessary functions in the video decoder object. */ -static void *init_video_decoder_plugin (int iface_version, xine_t *xine) { +static void *init_video_decoder_plugin (xine_t *xine, void *data) { foovideo_decoder_t *this ; - if (iface_version != 10) { - printf( "foovideo: plugin doesn't support plugin API version %d.\n" - "foovideo: this means there's a version mismatch between xine and this " - "foovideo: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); - return NULL; - } - this = (foovideo_decoder_t *) malloc (sizeof (foovideo_decoder_t)); memset(this, 0, sizeof (foovideo_decoder_t)); - this->video_decoder.interface_version = iface_version; - this->video_decoder.can_handle = foovideo_can_handle; this->video_decoder.init = foovideo_init; this->video_decoder.decode_data = foovideo_decode_data; this->video_decoder.flush = foovideo_flush; @@ -280,8 +268,25 @@ static void *init_video_decoder_plugin (int iface_version, xine_t *xine) { this->video_decoder.close = foovideo_close; this->video_decoder.get_identifier = foovideo_get_id; this->video_decoder.dispose = foovideo_dispose; - this->video_decoder.priority = 1; return (video_decoder_t *) this; } +/* + * exported plugin catalog entry + */ +static uint32_t video_types[] = { + /* BUF_VIDEO_FOOVIDEO, */ + 0 +}; + +static decoder_info_t dec_info_video = { + video_types, /* supported types */ + 5 /* priority */ +}; + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_VIDEO_DECODER, 10, "foovideo", XINE_VERSION_CODE, &dec_info_video, init_video_decoder_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/libxinevdec/idcinvideo.c b/src/libxinevdec/idcinvideo.c index 5273a1160..af763b015 100644 --- a/src/libxinevdec/idcinvideo.c +++ b/src/libxinevdec/idcinvideo.c @@ -21,7 +21,7 @@ * the Id CIN format, visit: * http://www.csse.monash.edu.au/~timf/ * - * $Id: idcinvideo.c,v 1.4 2002/09/05 20:44:41 mroi Exp $ + * $Id: idcinvideo.c,v 1.5 2002/09/05 22:19:02 mroi Exp $ */ #include <stdio.h> @@ -195,11 +195,6 @@ void huff_build_tree(int prev) { * xine video plugin functions *************************************************************************/ -static int idcinvideo_can_handle (video_decoder_t *this_gen, int buf_type) { - - return (buf_type == BUF_VIDEO_IDCIN); -} - /* * This function is responsible is called to initialize the video decoder * for use. Initialization usually involves setting up the fields in your @@ -382,23 +377,12 @@ static void idcinvideo_dispose (video_decoder_t *this_gen) { /* * This function should be the plugin's only advertised function to the * outside world. It allows xine to query the plugin module for the addresses - * to the necessary functions in the video decoder object. The video - * decoder object also has a priority field which allows different decoder - * plugins for the same buffer types to coexist peacefully. The higher the - * priority number, the more precedence a decoder has. E.g., 9 beats 1. + * to the necessary functions in the video decoder object. */ -static void *init_video_decoder_plugin (int iface_version, xine_t *xine) { +static void *init_video_decoder_plugin (xine_t *xine, void *data) { idcinvideo_decoder_t *this ; - if (iface_version != 10) { - printf( "idcinvideo: plugin doesn't support plugin API version %d.\n" - "idcinvideo: this means there's a version mismatch between xine and this " - "idcinvideo: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); - return NULL; - } - this = (idcinvideo_decoder_t *) malloc (sizeof (idcinvideo_decoder_t)); memset(this, 0, sizeof (idcinvideo_decoder_t)); @@ -409,7 +393,20 @@ static void *init_video_decoder_plugin (int iface_version, xine_t *xine) { this->video_decoder.close = idcinvideo_close; this->video_decoder.get_identifier = idcinvideo_get_id; this->video_decoder.dispose = idcinvideo_dispose; - this->video_decoder.priority = 1; return (video_decoder_t *) this; } + +/* plugin catalog information */ +static uint32_t supported_types[] = { BUF_VIDEO_IDCIN, 0 }; + +static decoder_info_t video_decoder_info = { + supported_types, /* supported types */ + 1 /* priority */ +}; + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_VIDEO_DECODER, 10, "Id CIN Video", XINE_VERSION_CODE, &video_decoder_info, &init_video_decoder_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/libxinevdec/msrle.c b/src/libxinevdec/msrle.c index 531cf0f1f..776157297 100644 --- a/src/libxinevdec/msrle.c +++ b/src/libxinevdec/msrle.c @@ -21,7 +21,7 @@ * For more information on the MS RLE format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: msrle.c,v 1.6 2002/09/05 20:44:41 mroi Exp $ + * $Id: msrle.c,v 1.7 2002/09/05 22:19:03 mroi Exp $ */ #include <stdio.h> @@ -335,10 +335,7 @@ static void msrle_dispose (video_decoder_t *this_gen) { /* * This function should be the plugin's only advertised function to the * outside world. It allows xine to query the plugin module for the addresses - * to the necessary functions in the video decoder object. The video - * decoder object also has a priority field which allows different decoder - * plugins for the same buffer types to coexist peacefully. The higher the - * priority number, the more precedence a decoder has. E.g., 9 beats 1. + * to the necessary functions in the video decoder object. */ static void *init_video_decoder_plugin (xine_t *xine, void *data) { @@ -354,7 +351,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.close = msrle_close; this->video_decoder.get_identifier = msrle_get_id; this->video_decoder.dispose = msrle_dispose; - this->video_decoder.priority = 1; return this; } diff --git a/src/libxinevdec/msvc.c b/src/libxinevdec/msvc.c index 5ba1d142b..352cb3ce6 100644 --- a/src/libxinevdec/msvc.c +++ b/src/libxinevdec/msvc.c @@ -22,7 +22,7 @@ * based on overview of Microsoft Video-1 algorithm * by Mike Melanson: http://www.pcisys.net/~melanson/codecs/video1.txt * - * $Id: msvc.c,v 1.10 2002/09/05 20:44:41 mroi Exp $ + * $Id: msvc.c,v 1.11 2002/09/05 22:19:03 mroi Exp $ */ #include <stdlib.h> @@ -359,7 +359,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.close = msvc_close; this->video_decoder.get_identifier = msvc_get_id; this->video_decoder.dispose = msvc_dispose; - this->video_decoder.priority = 5; return this; } diff --git a/src/libxinevdec/qtrpza.c b/src/libxinevdec/qtrpza.c index 05a0f04ee..4ccdd2c94 100644 --- a/src/libxinevdec/qtrpza.c +++ b/src/libxinevdec/qtrpza.c @@ -21,7 +21,7 @@ * For more information about the RPZA format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: qtrpza.c,v 1.3 2002/09/05 20:44:42 mroi Exp $ + * $Id: qtrpza.c,v 1.4 2002/09/05 22:19:03 mroi Exp $ */ #include <stdio.h> @@ -278,22 +278,6 @@ void decode_qtrpza(qtrpza_decoder_t *this) { *************************************************************************/ /* - * This function is called by xine to determine which buffer types this - * decoder knows how to handle. - * Parameters: - * this_gen: A video decoder object - * buf_type: The number of the buffer type that xine is querying for; - * these buffer constants are defined in src/xine-engine/buffer.h. - * Return: - * 1 if the decoder is capable of handling buf_type - * 0 if the decoder is not capable of handling buf_type - */ -static int qtrpza_can_handle (video_decoder_t *this_gen, int buf_type) { - - return (buf_type == BUF_VIDEO_RPZA); -} - -/* * This function is responsible is called to initialize the video decoder * for use. Initialization usually involves setting up the fields in your * private video decoder object. @@ -445,18 +429,10 @@ static void qtrpza_dispose (video_decoder_t *this_gen) { free (this_gen); } -static void *init_video_decoder_plugin (int iface_version, xine_t *xine) { +static void *init_video_decoder_plugin (xine_t *xine, void *data) { qtrpza_decoder_t *this ; - if (iface_version != 10) { - printf( "qtrpza: plugin doesn't support plugin API version %d.\n" - "qtrpza: this means there's a version mismatch between xine and this " - "qtrpza: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); - return NULL; - } - this = (qtrpza_decoder_t *) malloc (sizeof (qtrpza_decoder_t)); memset(this, 0, sizeof (qtrpza_decoder_t)); @@ -467,8 +443,20 @@ static void *init_video_decoder_plugin (int iface_version, xine_t *xine) { this->video_decoder.close = qtrpza_close; this->video_decoder.get_identifier = qtrpza_get_id; this->video_decoder.dispose = qtrpza_dispose; - this->video_decoder.priority = 1; return (video_decoder_t *) this; } +/* plugin catalog information */ +static uint32_t supported_types[] = { BUF_VIDEO_RPZA, 0 }; + +static decoder_info_t video_decoder_info = { + supported_types, /* supported types */ + 1 /* priority */ +}; + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_VIDEO_DECODER, 10, "QT RPZA", XINE_VERSION_CODE, &video_decoder_info, &init_video_decoder_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/libxinevdec/qtsmc.c b/src/libxinevdec/qtsmc.c index 3dff56ee1..f145642e7 100644 --- a/src/libxinevdec/qtsmc.c +++ b/src/libxinevdec/qtsmc.c @@ -23,7 +23,7 @@ * For more information on the SMC format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: qtsmc.c,v 1.3 2002/09/05 20:44:42 mroi Exp $ + * $Id: qtsmc.c,v 1.4 2002/09/05 22:19:03 mroi Exp $ */ #include <stdio.h> @@ -495,22 +495,6 @@ void decode_qtsmc(qtsmc_decoder_t *this) { *************************************************************************/ /* - * This function is called by xine to determine which buffer types this - * decoder knows how to handle. - * Parameters: - * this_gen: A video decoder object - * buf_type: The number of the buffer type that xine is querying for; - * these buffer constants are defined in src/xine-engine/buffer.h. - * Return: - * 1 if the decoder is capable of handling buf_type - * 0 if the decoder is not capable of handling buf_type - */ -static int qtsmc_can_handle (video_decoder_t *this_gen, int buf_type) { - - return (buf_type == BUF_VIDEO_SMC); -} - -/* * This function is responsible is called to initialize the video decoder * for use. Initialization usually involves setting up the fields in your * private video decoder object. @@ -677,18 +661,10 @@ static void qtsmc_dispose (video_decoder_t *this_gen) { free (this_gen); } -static void *init_video_decoder_plugin (int iface_version, xine_t *xine) { +static void *init_video_decoder_plugin (xine_t *xine, void *data) { qtsmc_decoder_t *this ; - if (iface_version != 10) { - printf( "qtsmc: plugin doesn't support plugin API version %d.\n" - "qtsmc: this means there's a version mismatch between xine and this " - "qtsmc: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); - return NULL; - } - this = (qtsmc_decoder_t *) malloc (sizeof (qtsmc_decoder_t)); memset(this, 0, sizeof (qtsmc_decoder_t)); @@ -699,8 +675,21 @@ static void *init_video_decoder_plugin (int iface_version, xine_t *xine) { this->video_decoder.close = qtsmc_close; this->video_decoder.get_identifier = qtsmc_get_id; this->video_decoder.dispose = qtsmc_dispose; - this->video_decoder.priority = 9; return (video_decoder_t *) this; } +/* plugin catalog information */ +static uint32_t supported_types[] = { BUF_VIDEO_SMC, 0 }; + +static decoder_info_t video_decoder_info = { + supported_types, /* supported types */ + 9 /* priority */ +}; + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_VIDEO_DECODER, 10, "QT SMC", XINE_VERSION_CODE, &video_decoder_info, &init_video_decoder_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; + diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index 29b7d120a..0bb905f19 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -21,7 +21,7 @@ * Actually, this decoder just converts a raw RGB image to a YUY2 map * suitable for display under xine. * - * $Id: rgb.c,v 1.6 2002/09/05 20:44:42 mroi Exp $ + * $Id: rgb.c,v 1.7 2002/09/05 22:19:03 mroi Exp $ */ #include <stdio.h> @@ -289,7 +289,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.close = rgb_close; this->video_decoder.get_identifier = rgb_get_id; this->video_decoder.dispose = rgb_dispose; - this->video_decoder.priority = 1; return this; } diff --git a/src/libxinevdec/roqvideo.c b/src/libxinevdec/roqvideo.c index ad0d21096..322b5d741 100644 --- a/src/libxinevdec/roqvideo.c +++ b/src/libxinevdec/roqvideo.c @@ -18,7 +18,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: roqvideo.c,v 1.8 2002/09/05 20:44:42 mroi Exp $ + * $Id: roqvideo.c,v 1.9 2002/09/05 22:19:03 mroi Exp $ */ /* And this is the header that came with the RoQ video decoder: */ @@ -367,10 +367,6 @@ static void roq_decode_frame(roq_decoder_t *ri, vo_frame_t *img) { memcpy(img->base[2], ri->v[0], (ri->width * ri->height)/4); } -static int roq_can_handle (video_decoder_t *this_gen, int buf_type) { - return (buf_type == BUF_VIDEO_ROQ); -} - static void roq_init (video_decoder_t *this_gen, vo_instance_t *video_out) { roq_decoder_t *this = (roq_decoder_t *) this_gen; @@ -502,7 +498,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.close = roq_close; this->video_decoder.get_identifier = roq_get_id; this->video_decoder.dispose = roq_dispose; - this->video_decoder.priority = 1; return this; } diff --git a/src/libxinevdec/svq1.c b/src/libxinevdec/svq1.c index 6f1d130e0..90f9c9bbb 100644 --- a/src/libxinevdec/svq1.c +++ b/src/libxinevdec/svq1.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: svq1.c,v 1.8 2002/09/05 20:44:42 mroi Exp $ + * $Id: svq1.c,v 1.9 2002/09/05 22:19:03 mroi Exp $ */ #include <stdio.h> @@ -1509,7 +1509,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.close = svq1dec_close; this->video_decoder.get_identifier = svq1dec_get_id; this->video_decoder.dispose = svq1dec_dispose; - this->video_decoder.priority = 4; return this; } diff --git a/src/libxinevdec/wc3video.c b/src/libxinevdec/wc3video.c index a95262da5..f5628a9cc 100644 --- a/src/libxinevdec/wc3video.c +++ b/src/libxinevdec/wc3video.c @@ -22,7 +22,7 @@ * For more information on the WC3 Movie format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: wc3video.c,v 1.3 2002/09/05 20:44:42 mroi Exp $ + * $Id: wc3video.c,v 1.4 2002/09/05 22:19:03 mroi Exp $ */ #include <stdio.h> @@ -331,22 +331,6 @@ static void wc3_decode_frame (wc3video_decoder_t *this) { *************************************************************************/ /* - * This function is called by xine to determine which buffer types this - * decoder knows how to handle. - * Parameters: - * this_gen: A video decoder object - * buf_type: The number of the buffer type that xine is querying for; - * these buffer constants are defined in src/xine-engine/buffer.h. - * Return: - * 1 if the decoder is capable of handling buf_type - * 0 if the decoder is not capable of handling buf_type - */ -static int wc3video_can_handle (video_decoder_t *this_gen, int buf_type) { - - return (buf_type == BUF_VIDEO_WC3); -} - -/* * This function is called to initialize the video decoder for use. * Initialization usually involves setting up the fields in your * private video decoder object. @@ -525,23 +509,12 @@ static void wc3video_dispose (video_decoder_t *this_gen) { /* * This function should be the plugin's only advertised function to the * outside world. It allows xine to query the plugin module for the addresses - * to the necessary functions in the video decoder object. The video - * decoder object also has a priority field which allows different decoder - * plugins for the same buffer types to coexist peacefully. The higher the - * priority number, the more precedence a decoder has. E.g., 9 beats 1. + * to the necessary functions in the video decoder object. */ -static void *init_video_decoder_plugin (int iface_version, xine_t *xine) { +static void *init_video_decoder_plugin (xine_t *xine, void *data) { wc3video_decoder_t *this ; - if (iface_version != 10) { - printf( "wc3video: plugin doesn't support plugin API version %d.\n" - "wc3video: this means there's a version mismatch between xine and this " - "wc3video: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); - return NULL; - } - this = (wc3video_decoder_t *) malloc (sizeof (wc3video_decoder_t)); memset(this, 0, sizeof (wc3video_decoder_t)); @@ -552,8 +525,20 @@ static void *init_video_decoder_plugin (int iface_version, xine_t *xine) { this->video_decoder.close = wc3video_close; this->video_decoder.get_identifier = wc3video_get_id; this->video_decoder.dispose = wc3video_dispose; - this->video_decoder.priority = 9; return (video_decoder_t *) this; } +/* plugin catalog information */ +static uint32_t supported_types[] = { BUF_VIDEO_WC3, 0 }; + +static decoder_info_t video_decoder_info = { + supported_types, /* supported types */ + 9 /* priority */ +}; + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_VIDEO_DECODER, 10, "WC3 Video", XINE_VERSION_CODE, &video_decoder_info, &init_video_decoder_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index b6976c367..7775f1884 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -21,7 +21,7 @@ * Actually, this decoder just reorganizes chunks of raw YUV data in such * a way that xine can display them. * - * $Id: yuv.c,v 1.5 2002/09/05 20:44:42 mroi Exp $ + * $Id: yuv.c,v 1.6 2002/09/05 22:19:03 mroi Exp $ */ #include <stdio.h> @@ -278,10 +278,7 @@ static void yuv_dispose (video_decoder_t *this_gen) { /* * This function should be the plugin's only advertised function to the * outside world. It allows xine to query the plugin module for the addresses - * to the necessary functions in the video decoder object. The video - * decoder object also has a priority field which allows different decoder - * plugins for the same buffer types to coexist peacefully. The higher the - * priority number, the more precedence a decoder has. E.g., 9 beats 1. + * to the necessary functions in the video decoder object. */ static void *init_video_decoder_plugin (xine_t *xine, void *data) { @@ -297,7 +294,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { this->video_decoder.close = yuv_close; this->video_decoder.get_identifier = yuv_get_id; this->video_decoder.dispose = yuv_dispose; - this->video_decoder.priority = 1; return this; } diff --git a/src/libxvid/xine_decoder.c b/src/libxvid/xine_decoder.c index 379e07b02..c53a064aa 100644 --- a/src/libxvid/xine_decoder.c +++ b/src/libxvid/xine_decoder.c @@ -241,13 +241,6 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) { return (video_decoder_t *) this; } -static int xvid_can_handle (video_decoder_t *this_gen, int buf_type) { - buf_type &= (BUF_MAJOR_MASK|BUF_DECODER_MASK); - - /* FIXME: what is it exactly that xvid can handle? :> */ - return 0; -} - /* * exported plugin catalog entry */ diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c index af5b28a70..446387459 100644 --- a/src/xine-engine/metronom.c +++ b/src/xine-engine/metronom.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: metronom.c,v 1.91 2002/09/04 23:31:13 guenter Exp $ + * $Id: metronom.c,v 1.92 2002/09/05 22:19:04 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -329,7 +329,6 @@ static void metronom_handle_video_discontinuity (metronom_t *this, int type, #endif this->vpts_offset = this->video_vpts; this->in_discontinuity = 0; - this->force_audio_jump = 0; break; case DISC_ABSOLUTE: #ifdef LOG @@ -337,7 +336,6 @@ static void metronom_handle_video_discontinuity (metronom_t *this, int type, #endif this->next_vpts_offset = this->video_vpts - disc_off; this->in_discontinuity = 30; - this->force_audio_jump = 0; break; case DISC_RELATIVE: #ifdef LOG @@ -345,16 +343,13 @@ static void metronom_handle_video_discontinuity (metronom_t *this, int type, #endif this->next_vpts_offset = this->vpts_offset - disc_off; this->in_discontinuity = 30; - this->force_audio_jump = 0; break; case DISC_STREAMSEEK: #ifdef LOG printf ("metronom: DISC_STREAMSEEK\n"); #endif this->vpts_offset = this->video_vpts - disc_off; - this->next_vpts_offset = this->video_vpts - disc_off; - this->in_discontinuity = 30; - this->force_audio_jump = 1; + this->in_discontinuity = 0; this->allow_full_ao_fill_gap = 1; break; } @@ -502,17 +497,16 @@ static int64_t metronom_got_audio_samples (metronom_t *this, int64_t pts, pthread_mutex_lock (&this->lock); - if (this->in_discontinuity && !this->force_audio_jump) + if (this->in_discontinuity) pts = 0; /* ignore pts during discontinuities */ if (pts) { vpts = pts + this->vpts_offset; diff = this->audio_vpts - vpts; /* compare predicted and given vpts */ - if( (abs(diff) > AUDIO_DRIFT_TOLERANCE) || this->force_audio_jump ) { + if((abs(diff) > AUDIO_DRIFT_TOLERANCE) || this->allow_full_ao_fill_gap) { this->audio_vpts = vpts; this->audio_drift_step = 0; - this->force_audio_jump = 0; printf("metronom: audio jump\n"); } else { diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h index 6b8f26f0a..64708bd84 100644 --- a/src/xine-engine/metronom.h +++ b/src/xine-engine/metronom.h @@ -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: metronom.h,v 1.34 2002/06/29 14:32:36 tmattern Exp $ + * $Id: metronom.h,v 1.35 2002/09/05 22:19:04 mroi Exp $ * * metronom: general pts => virtual calculation/assoc * @@ -244,7 +244,6 @@ struct metronom_s { pthread_cond_t cancel; int allow_full_ao_fill_gap; - int force_audio_jump; }; metronom_t *metronom_init (int have_audio, void *xine); diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index 056ff72dc..e8747d469 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -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_out.h,v 1.59 2002/09/04 23:31:13 guenter Exp $ + * $Id: video_out.h,v 1.60 2002/09/05 22:19:04 mroi Exp $ * * * xine version of video_out.h @@ -372,26 +372,6 @@ video_overlay_instance_t *video_overlay_new_instance (); vo_instance_t *vo_new_instance (xine_vo_driver_t *driver, xine_t *xine) ; -/* - * to build a dynamic video output plugin - * you have to implement these functions: - * - * - * xine_vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual); - * - * init and set up driver so it is fully operational - * - * parameters: config - config object pointer - * visual - driver specific info (e.g. Display*) - * - * return value: video_driver_t* in case of success, - * NULL on failure (e.g. wrong interface version, - * wrong visual type...) - * - * - * - */ - #ifdef __cplusplus } #endif diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 8b78dfffc..45aa9f787 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -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_internal.h,v 1.94 2002/09/05 16:50:56 guenter Exp $ + * $Id: xine_internal.h,v 1.95 2002/09/05 22:19:04 mroi Exp $ * */ @@ -99,8 +99,6 @@ struct video_decoder_s { void (*dispose) (video_decoder_t *this); - int priority; - }; /* @@ -127,8 +125,6 @@ struct audio_decoder_s { void (*dispose) (audio_decoder_t *this); - int priority; - }; /* |