diff options
Diffstat (limited to 'src/demuxers')
-rw-r--r-- | src/demuxers/demux_aiff.c | 6 | ||||
-rw-r--r-- | src/demuxers/demux_asf.c | 29 | ||||
-rw-r--r-- | src/demuxers/demux_avi.c | 29 | ||||
-rw-r--r-- | src/demuxers/demux_elem.c | 32 | ||||
-rw-r--r-- | src/demuxers/demux_film.c | 6 | ||||
-rw-r--r-- | src/demuxers/demux_fli.c | 6 | ||||
-rw-r--r-- | src/demuxers/demux_idcin.c | 7 | ||||
-rw-r--r-- | src/demuxers/demux_mpeg.c | 32 | ||||
-rw-r--r-- | src/demuxers/demux_mpeg_block.c | 32 | ||||
-rw-r--r-- | src/demuxers/demux_mpgaudio.c | 28 | ||||
-rw-r--r-- | src/demuxers/demux_ogg.c | 28 | ||||
-rw-r--r-- | src/demuxers/demux_pes.c | 10 | ||||
-rw-r--r-- | src/demuxers/demux_qt.c | 28 | ||||
-rw-r--r-- | src/demuxers/demux_roq.c | 6 | ||||
-rw-r--r-- | src/demuxers/demux_smjpeg.c | 6 | ||||
-rw-r--r-- | src/demuxers/demux_snd.c | 10 | ||||
-rw-r--r-- | src/demuxers/demux_ts.c | 10 | ||||
-rw-r--r-- | src/demuxers/demux_voc.c | 7 | ||||
-rw-r--r-- | src/demuxers/demux_vqa.c | 10 | ||||
-rw-r--r-- | src/demuxers/demux_wav.c | 6 | ||||
-rw-r--r-- | src/demuxers/demux_wc3movie.c | 9 |
21 files changed, 179 insertions, 158 deletions
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 6f0e4d1fa..ed656c67d 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.1 2002/08/12 03:56:12 tmmm Exp $ + * $Id: demux_aiff.c,v 1.2 2002/09/04 23:31:07 guenter Exp $ * */ @@ -231,7 +231,7 @@ static int demux_aiff_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_aiff", VALID_ENDS, _("valid mrls ending for aiff demuxer"), - NULL, NULL, NULL))); + NULL, 10, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -494,7 +494,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_aiff", VALID_ENDS, _("valid mrls ending for aiff demuxer"), - NULL, NULL, NULL); + NULL, 10, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_aiff_open; diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 363f01727..e849ef8a7 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.53 2002/08/27 23:12:16 tmattern Exp $ + * $Id: demux_asf.c,v 1.54 2002/09/04 23:31:07 guenter Exp $ * * demultiplexer for asf streams * @@ -1406,7 +1406,7 @@ static int demux_asf_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_asf", VALID_ENDS, _("valid mrls ending for asf demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -1439,18 +1439,10 @@ static int demux_asf_get_stream_length (demux_plugin_t *this_gen) { return this->length; } -demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { +void *init_demuxer_plugin (xine_t *xine, void *data) { demux_asf_t *this; - if (iface != 10) { - printf (_("demux_asf: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n"), - iface); - return NULL; - } - this = xine_xmalloc (sizeof (demux_asf_t)); this->config = xine->config; this->xine = xine; @@ -1458,7 +1450,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_asf", VALID_ENDS, _("valid mrls ending for asf demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_asf_open; @@ -1474,5 +1466,16 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->status = DEMUX_FINISHED; pthread_mutex_init( &this->mutex, NULL ); - return (demux_plugin_t *) this; + return this; } + + +/* + * exported plugin catalog entry + */ + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 10, "asf", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 8175b9c1e..4e0ff1acc 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.107 2002/08/19 18:26:34 mroi Exp $ + * $Id: demux_avi.c,v 1.108 2002/09/04 23:31:07 guenter Exp $ * * demultiplexer for avi streams * @@ -1534,7 +1534,7 @@ static int demux_avi_open(demux_plugin_t *this_gen, this->config->register_string(this->config, "mrl.ends_avi", VALID_ENDS, _("valid mrls ending for avi demuxer"), - NULL, NULL, NULL)); + NULL, 20, NULL, NULL)); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -1591,19 +1591,10 @@ static int demux_avi_get_stream_length (demux_plugin_t *this_gen) { return 0; } -demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { +static void *init_demuxer_plugin(xine_t *xine, void *data) { demux_avi_t *this; - if (iface != 10) { - xine_log (xine, XINE_LOG_PLUGIN, - _("demux_avi: this plugin doesn't support plugin API version %d.\n" - "demux_avi: this means there's a version mismatch between xine and this " - "demux_avi: demuxer plugin.\nInstalling current demuxer plugins should help.\n"), - iface); - return NULL; - } - this = xine_xmalloc (sizeof (demux_avi_t)); this->config = xine->config; this->xine = xine; @@ -1611,7 +1602,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_avi", VALID_ENDS, _("valid mrls ending for avi demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_avi_open; @@ -1627,5 +1618,15 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->status = DEMUX_FINISHED; pthread_mutex_init( &this->mutex, NULL ); - return (demux_plugin_t *) this; + return this; } + +/* + * exported plugin catalog entry + */ + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 10, "avi", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index bd1a04e59..4063a71d5 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.49 2002/07/14 22:27:25 miguelfreitas Exp $ + * $Id: demux_elem.c,v 1.50 2002/09/04 23:31:07 guenter Exp $ * * demultiplexer for elementary mpeg streams * @@ -315,7 +315,7 @@ static int demux_mpeg_elem_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_elem", VALID_ENDS, _("valid mrls ending for elementary demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -357,21 +357,11 @@ static void demux_mpeg_elem_close (demux_plugin_t *this) { static int demux_mpeg_elem_get_stream_length(demux_plugin_t *this_gen) { return 0 ; /*FIXME: implement */ } -/* - * - */ -demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { + +static void *init_demuxer_plugin (xine_t *xine, void *data) { demux_mpeg_elem_t *this; - if (iface != 10) { - printf (_("demux_elem: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n"), - iface); - return NULL; - } - this = xine_xmalloc (sizeof (demux_mpeg_elem_t)); this->config = xine->config; this->xine = xine; @@ -379,7 +369,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_elem", VALID_ENDS, _("valid mrls ending for elementary demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUX_MPEG_ELEM_IFACE_VERSION; this->demux_plugin.open = demux_mpeg_elem_open; @@ -395,5 +385,15 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->status = DEMUX_FINISHED; pthread_mutex_init( &this->mutex, NULL ); - return &this->demux_plugin; + return this; } + +/* + * exported plugin catalog entry + */ + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 10, "elem", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 4230c04d0..412d89614 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.21 2002/08/02 13:00:13 tmmm Exp $ + * $Id: demux_film.c,v 1.22 2002/09/04 23:31:07 guenter Exp $ */ #ifdef HAVE_CONFIG_H @@ -527,7 +527,7 @@ static int demux_film_open(demux_plugin_t *this_gen, input_plugin_t *input, (this->config->register_string(this->config, "mrl.ends_film", VALID_ENDS, _("valid mrls ending for film demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -802,7 +802,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void *) this->config->register_string(this->config, "mrl.ends_film", VALID_ENDS, _("valid mrls ending for film demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_film_open; diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index af3776da7..fab3a1593 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.6 2002/08/31 18:20:50 mroi Exp $ + * $Id: demux_fli.c,v 1.7 2002/09/04 23:31:07 guenter Exp $ */ #ifdef HAVE_CONFIG_H @@ -225,7 +225,7 @@ static int demux_fli_open(demux_plugin_t *this_gen, input_plugin_t *input, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_fli", VALID_ENDS, "valid mrls ending for fli demuxer", - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -419,7 +419,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void *) this->config->register_string(this->config, "mrl.ends_fli", VALID_ENDS, "valid mrls ending for fli demuxer", - NULL, NULL, NULL); + NULL, 10, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_fli_open; diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index 00face10f..2c42b1895 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.6 2002/09/01 14:06:23 tmmm Exp $ + * $Id: demux_idcin.c,v 1.7 2002/09/04 23:31:07 guenter Exp $ */ #ifdef HAVE_CONFIG_H @@ -385,7 +385,7 @@ static int demux_idcin_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_idcin", VALID_ENDS, _("valid mrls ending for idcin demuxer"), - NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -604,7 +604,8 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void *) this->config->register_string(this->config, "mrl.ends_idcin", VALID_ENDS, - _("valid mrls ending for idcin demuxer"), NULL, NULL, NULL); + _("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; diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index aec9789ae..8347d2de7 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.73 2002/09/04 10:44:44 mroi Exp $ + * $Id: demux_mpeg.c,v 1.74 2002/09/04 23:31:07 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -1062,7 +1062,7 @@ static int demux_mpeg_open(demux_plugin_t *this_gen, this->config->register_string(this->config, "mrl.mrls_mpeg", VALID_MRLS, _("valid mrls for mpeg demuxer"), - NULL, NULL, NULL)); + NULL, 20, NULL, NULL)); media = strstr(MRL, "://"); if (media) { @@ -1095,7 +1095,7 @@ static int demux_mpeg_open(demux_plugin_t *this_gen, this->config->register_string(this->config, "mrl.ends_mpeg", VALID_ENDS, _("valid mrls ending for mpeg demuxer"), - NULL, NULL, NULL)); + NULL, 20, NULL, NULL)); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -1140,18 +1140,10 @@ static int demux_mpeg_get_stream_length (demux_plugin_t *this_gen) { } -demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { +static void *init_demuxer_plugin (xine_t *xine, void *data) { demux_mpeg_t *this; - if (iface != 10) { - printf (_("demux_mpeg: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n"), - iface); - return NULL; - } - this = xine_xmalloc (sizeof (demux_mpeg_t)); this->config = xine->config; this->xine = xine; @@ -1159,11 +1151,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { /* Calling register_string() configure valid mrls in configfile */ (void*) this->config->register_string(this->config, "mrl.mrls_mpeg", VALID_MRLS, _("valid mrls for mpeg demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); (void*) this->config->register_string(this->config, "mrl.ends_mpeg", VALID_ENDS, _("valid mrls ending for mpeg demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_mpeg_open; @@ -1179,5 +1171,15 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->status = DEMUX_FINISHED; pthread_mutex_init( &this->mutex, NULL ); - return (demux_plugin_t *) this; + return this; } + +/* + * exported plugin catalog entry + */ + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 10, "mpeg", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 3cc9efa3b..fb2992b79 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.110 2002/08/07 20:50:45 miguelfreitas Exp $ + * $Id: demux_mpeg_block.c,v 1.111 2002/09/04 23:31:07 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -1099,7 +1099,7 @@ static int demux_mpeg_block_open(demux_plugin_t *this_gen, xine_strdupa(valid_mrls, (this->config->register_string(this->config, "mrl.mrls_mpeg_block", VALID_MRLS, _("valid mrls for mpeg block demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); MRL = input->get_mrl (input); @@ -1140,7 +1140,7 @@ static int demux_mpeg_block_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_mpeg_block", VALID_ENDS, _("valid mrls ending for mpeg block demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -1184,18 +1184,10 @@ static int demux_mpeg_block_get_stream_length (demux_plugin_t *this_gen) { } -demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { +static void *init_demuxer_plugin (xine_t *xine, void *data) { demux_mpeg_block_t *this; - if (iface != 10) { - printf (_("demux_mpeg_block: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n"), - iface); - return NULL; - } - this = xine_xmalloc (sizeof (demux_mpeg_block_t)); this->config = xine->config; this->xine = xine; @@ -1203,11 +1195,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { /* Calling register_string() configure valid mrls in configfile */ (void*) this->config->register_string(this->config, "mrl.mrls_mpeg_block", VALID_MRLS, _("valid mrls for mpeg block demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); (void*) this->config->register_string(this->config, "mrl.ends_mpeg_block", VALID_ENDS, _("valid mrls ending for mpeg block demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_mpeg_block_open; @@ -1224,5 +1216,15 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->status = DEMUX_FINISHED; pthread_mutex_init( &this->mutex, NULL ); - return (demux_plugin_t *) this; + return this; } + +/* + * exported plugin catalog entry + */ + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 10, "mpeg_block", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 407c90602..ec9b8c02d 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.58 2002/08/30 14:19:48 f1rmb Exp $ + * $Id: demux_mpgaudio.c,v 1.59 2002/09/04 23:31:08 guenter Exp $ * * demultiplexer for mpeg audio (i.e. mp3) streams * @@ -605,7 +605,7 @@ static int demux_mpgaudio_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_mgaudio", VALID_ENDS, _("valid mrls ending for mpeg audio demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -653,18 +653,10 @@ static int demux_mpgaudio_get_stream_length (demux_plugin_t *this_gen) { } -demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { +static void *init_demuxer_plugin (xine_t *xine, void *data) { demux_mpgaudio_t *this; - if (iface != 10) { - printf (_("demux_mpeg: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n"), - iface); - return NULL; - } - this = xine_xmalloc (sizeof (demux_mpgaudio_t)); this->config = xine->config; this->xine = xine; @@ -672,7 +664,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_mgaudio", VALID_ENDS, _("valid mrls ending for mpeg audio demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUX_MPGAUDIO_IFACE_VERSION; this->demux_plugin.open = demux_mpgaudio_open; @@ -688,5 +680,15 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->status = DEMUX_FINISHED; pthread_mutex_init( &this->mutex, NULL ); - return &this->demux_plugin; + return this; } + +/* + * exported plugin catalog entry + */ + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 10, "mp3", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index 0f47eb773..d3deffede 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.39 2002/09/01 20:50:57 guenter Exp $ + * $Id: demux_ogg.c,v 1.40 2002/09/04 23:31:08 guenter Exp $ * * demultiplexer for ogg streams * @@ -1038,7 +1038,7 @@ static int demux_ogg_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_ogg", VALID_ENDS, _("valid mrls ending for ogg demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -1073,18 +1073,10 @@ static int demux_ogg_get_stream_length (demux_plugin_t *this_gen) { return 0; } -demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { +static void *init_demuxer_plugin (xine_t *xine, void *data) { demux_ogg_t *this; - if (iface != 10) { - printf( _("demux_ogg: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n"), - iface); - return NULL; - } - this = xine_xmalloc (sizeof (demux_ogg_t)); this->config = xine->config; this->xine = xine; @@ -1092,7 +1084,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_ogg", VALID_ENDS, _("valid mrls ending for ogg demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_ogg_open; @@ -1108,5 +1100,15 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->status = DEMUX_FINISHED; pthread_mutex_init( &this->mutex, NULL ); - return (demux_plugin_t *) this; + return this; } + +/* + * exported plugin catalog entry + */ + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 10, "ogg", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c index 5b54db737..931f3bad4 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.34 2002/07/14 22:27:25 miguelfreitas Exp $ + * $Id: demux_pes.c,v 1.35 2002/09/04 23:31:08 guenter Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -524,7 +524,7 @@ static int demux_pes_open(demux_plugin_t *this_gen, xine_strdupa(valid_mrls, (this->config->register_string(this->config, "mrl.mrls_pes", VALID_MRLS, _("valid mrls for pes demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); media = strstr(MRL, "://"); if(media) { @@ -554,7 +554,7 @@ static int demux_pes_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_pes", VALID_ENDS, _("valid mrls ending for pes demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -612,11 +612,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.mrls_pes", VALID_MRLS, _("valid mrls for pes demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); (void*) this->config->register_string(this->config, "mrl.ends_pes", VALID_ENDS, _("valid mrls ending for pes demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_pes_open; diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 874becd3d..fe8922ae5 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.80 2002/08/02 13:00:12 tmmm Exp $ + * $Id: demux_qt.c,v 1.81 2002/09/04 23:31:08 guenter Exp $ * */ @@ -1445,7 +1445,7 @@ static int demux_qt_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_qt", VALID_ENDS, _("valid mrls ending for qt demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -1750,18 +1750,10 @@ static int demux_qt_get_stream_length (demux_plugin_t *this_gen) { return this->qt->duration / this->qt->time_scale; } -demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { +static void *init_demuxer_plugin (xine_t *xine, void *data) { demux_qt_t *this; - if (iface != 10) { - printf (_("demux_qt: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n"), - iface); - return NULL; - } - this = xine_xmalloc (sizeof (demux_qt_t)); this->config = xine->config; this->xine = xine; @@ -1769,7 +1761,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_qt", VALID_ENDS, _("valid mrls ending for qt demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_qt_open; @@ -1785,5 +1777,15 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->status = DEMUX_FINISHED; pthread_mutex_init( &this->mutex, NULL ); - return (demux_plugin_t *) this; + return this; } + +/* + * exported plugin catalog entry + */ + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 10, "mov", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 2a9796a83..35188d113 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.10 2002/08/01 03:56:31 tmmm Exp $ + * $Id: demux_roq.c,v 1.11 2002/09/04 23:31:08 guenter Exp $ */ #ifdef HAVE_CONFIG_H @@ -291,7 +291,7 @@ static int demux_roq_open(demux_plugin_t *this_gen, input_plugin_t *input, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_roq", VALID_ENDS, _("valid mrls ending for roq demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -542,7 +542,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void *) this->config->register_string(this->config, "mrl.ends_roq", VALID_ENDS, _("valid mrls ending for roq demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_roq_open; diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index a9a8d5706..80566a6c4 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.10 2002/09/03 02:44:01 tmmm Exp $ + * $Id: demux_smjpeg.c,v 1.11 2002/09/04 23:31:08 guenter Exp $ */ #ifdef HAVE_CONFIG_H @@ -296,7 +296,7 @@ static int demux_smjpeg_open(demux_plugin_t *this_gen, input_plugin_t *input, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_smjpeg", VALID_ENDS, _("valid mrls ending for smjpeg demuxer"), - NULL, NULL, NULL))); + NULL, 2, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -571,7 +571,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void *) this->config->register_string(this->config, "mrl.ends_smjpeg", VALID_ENDS, _("valid mrls ending for smjpeg demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_smjpeg_open; diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index c94fee5b6..9fce979f0 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.2 2002/09/01 04:30:04 tmmm Exp $ + * $Id: demux_snd.c,v 1.3 2002/09/04 23:31:08 guenter Exp $ * */ @@ -219,7 +219,8 @@ static int demux_snd_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_snd", VALID_ENDS, _("valid mrls ending for snd demuxer"), - NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { + NULL, 10, NULL, NULL))); + while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -477,8 +478,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_snd", VALID_ENDS, - _("valid mrls ending for snd demuxer"), NULL, NULL, NULL); - + _("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; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index c3bd029c8..c8b020999 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.52 2002/07/05 17:32:01 mroi Exp $ + * $Id: demux_ts.c,v 1.53 2002/09/04 23:31:08 guenter Exp $ * * Demultiplexer for MPEG2 Transport Streams. * @@ -1463,7 +1463,7 @@ static int demux_ts_open(demux_plugin_t *this_gen, input_plugin_t *input, (this->config->register_string(this->config, "mrl.mrls_ts", VALID_MRLS, _("valid mrls for ts demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); mrl = input->get_mrl(input); media = strstr(mrl, "://"); @@ -1498,7 +1498,7 @@ static int demux_ts_open(demux_plugin_t *this_gen, input_plugin_t *input, (this->config->register_string(this->config, "mrl.ends_ts", VALID_ENDS, _("valid mrls ending for ts demuxer"), - NULL, NULL, NULL))); + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -1677,11 +1677,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.mrls_ts", VALID_MRLS, _("valid mrls for ts demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); (void*) this->config->register_string(this->config, "mrl.ends_ts", VALID_ENDS, _("valid mrls ending for ts demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->plugin.open = demux_ts_open; diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index f761f3123..6c9c74ac7 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.2 2002/08/12 03:53:49 tmmm Exp $ + * $Id: demux_voc.c,v 1.3 2002/09/04 23:31:08 guenter Exp $ * */ @@ -218,7 +218,8 @@ static int demux_voc_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_voc", VALID_ENDS, _("valid mrls ending for voc demuxer"), - NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { + NULL, 10, NULL, NULL))); + while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -470,7 +471,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_voc", VALID_ENDS, _("valid mrls ending for voc demuxer"), - NULL, NULL, NULL); + NULL, 10, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_voc_open; diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index 6d720df99..256cf25b1 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.2 2002/09/02 17:27:16 tmmm Exp $ + * $Id: demux_vqa.c,v 1.3 2002/09/04 23:31:08 guenter Exp $ */ #ifdef HAVE_CONFIG_H @@ -297,7 +297,8 @@ static int demux_vqa_open(demux_plugin_t *this_gen, input_plugin_t *input, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_vqa", VALID_ENDS, _("valid mrls ending for vqa demuxer"), - NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { + NULL, 10, NULL, NULL))); + while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -566,8 +567,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void *) this->config->register_string(this->config, "mrl.ends_vqa", VALID_ENDS, - _("valid mrls ending for vqa demuxer"), NULL, NULL, NULL); - + _("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; diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index db64f285b..de4964390 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.8 2002/08/02 13:11:25 tmmm Exp $ + * $Id: demux_wav.c,v 1.9 2002/09/04 23:31:08 guenter Exp $ * */ @@ -224,7 +224,7 @@ static int demux_wav_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_wav", VALID_ENDS, _("valid mrls ending for wav demuxer"), - NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { + NULL, 20, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -480,7 +480,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_wav", VALID_ENDS, _("valid mrls ending for wav demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_wav_open; diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index b23af392c..0cd3fee35 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.3 2002/09/04 02:43:48 tmmm Exp $ + * $Id: demux_wc3movie.c,v 1.4 2002/09/04 23:31:08 guenter Exp $ */ #ifdef HAVE_CONFIG_H @@ -363,7 +363,7 @@ static int demux_mve_open(demux_plugin_t *this_gen, input_plugin_t *input, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_mve", VALID_ENDS, _("valid mrls ending for mve demuxer"), - NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { + NULL, 10, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -608,8 +608,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void *) this->config->register_string(this->config, "mrl.ends_mve", VALID_ENDS, - _("valid mrls ending for mve demuxer"), NULL, NULL, NULL); - + _("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; |