summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_asf.c9
-rw-r--r--src/demuxers/demux_avi.c7
-rw-r--r--src/demuxers/demux_elem.c7
-rw-r--r--src/demuxers/demux_fli.c7
-rw-r--r--src/demuxers/demux_flv.c7
-rw-r--r--src/demuxers/demux_iff.c7
-rw-r--r--src/demuxers/demux_image.c7
-rw-r--r--src/demuxers/demux_matroska.c7
-rw-r--r--src/demuxers/demux_mng.c8
-rw-r--r--src/demuxers/demux_mpeg.c7
-rw-r--r--src/demuxers/demux_mpeg_block.c7
-rw-r--r--src/demuxers/demux_mpeg_pes.c7
-rw-r--r--src/demuxers/demux_nsv.c7
-rw-r--r--src/demuxers/demux_ogg.c7
-rw-r--r--src/demuxers/demux_pva.c7
-rw-r--r--src/demuxers/demux_qt.c7
-rw-r--r--src/demuxers/demux_rawdv.c7
-rw-r--r--src/demuxers/demux_real.c7
-rw-r--r--src/demuxers/demux_slave.c7
-rw-r--r--src/demuxers/demux_ts.c7
-rw-r--r--src/demuxers/demux_yuv4mpeg2.c7
-rw-r--r--src/demuxers/demux_yuv_frames.c7
-rw-r--r--src/demuxers/group_audio.c82
-rw-r--r--src/demuxers/group_games.c68
24 files changed, 236 insertions, 71 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index ec856e8f8..f5c7d8da2 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.158 2004/05/02 12:32:12 tmattern Exp $
+ * $Id: demux_asf.c,v 1.159 2004/05/16 18:01:26 tmattern Exp $
*
* demultiplexer for asf streams
*
@@ -2245,9 +2245,12 @@ static void *init_class (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
-
+demuxer_info_t demux_info_asf = {
+ 10 /* priority */
+};
+
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "asf", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_DEMUX, 24, "asf", XINE_VERSION_CODE, &demux_info_asf, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index df86a222c..6610d8fca 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_avi.c,v 1.200 2004/05/04 21:45:15 jstembridge Exp $
+ * $Id: demux_avi.c,v 1.201 2004/05/16 18:01:27 tmattern Exp $
*
* demultiplexer for avi streams
*
@@ -2304,9 +2304,12 @@ static void *init_class (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_avi = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "avi", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_DEMUX, 24, "avi", XINE_VERSION_CODE, &demux_info_avi, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index 41626d4a0..d626fe619 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_elem.c,v 1.83 2004/05/14 13:31:49 mroi Exp $
+ * $Id: demux_elem.c,v 1.84 2004/05/16 18:01:28 tmattern Exp $
*
* demultiplexer for elementary mpeg streams
*/
@@ -297,9 +297,12 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_elem = {
+ 0 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "elem", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "elem", XINE_VERSION_CODE, &demux_info_elem, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index ca68adaec..ced7ea9f1 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -24,7 +24,7 @@
* avoid while programming a FLI decoder, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: demux_fli.c,v 1.53 2004/02/09 22:24:36 jstembridge Exp $
+ * $Id: demux_fli.c,v 1.54 2004/05/16 18:01:43 tmattern Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -394,9 +394,12 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_fli = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "fli", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "fli", XINE_VERSION_CODE, &demux_info_fli, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c
index 8e503648b..8c22fd2d3 100644
--- a/src/demuxers/demux_flv.c
+++ b/src/demuxers/demux_flv.c
@@ -24,7 +24,7 @@
* For more information on the FLV file format, visit:
* http://download.macromedia.com/pub/flash/flash_file_format_specification.pdf
*
- * $Id: demux_flv.c,v 1.1 2004/03/09 04:14:11 tmmm Exp $
+ * $Id: demux_flv.c,v 1.2 2004/05/16 18:01:43 tmattern Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -337,9 +337,12 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_flv = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "flashvideo", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "flashvideo", XINE_VERSION_CODE, &demux_info_flv, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c
index 8f43be949..70778e7cd 100644
--- a/src/demuxers/demux_iff.c
+++ b/src/demuxers/demux_iff.c
@@ -36,7 +36,7 @@
* * ANIM (Animations)
* - Animation works fine, without seeking.
*
- * $Id: demux_iff.c,v 1.9 2004/03/13 11:02:09 manfredtremmel Exp $
+ * $Id: demux_iff.c,v 1.10 2004/05/16 18:01:43 tmattern Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1326,10 +1326,13 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_iff = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "iff", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "iff", XINE_VERSION_CODE, &demux_info_iff, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c
index fbaa22572..b684417c7 100644
--- a/src/demuxers/demux_image.c
+++ b/src/demuxers/demux_image.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_image.c,v 1.13 2004/01/12 17:35:14 miguelfreitas Exp $
+ * $Id: demux_image.c,v 1.14 2004/05/16 18:01:43 tmattern Exp $
*
* image dummy demultiplexer
*/
@@ -229,9 +229,12 @@ static void *init_class (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_image = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "image", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_DEMUX, 24, "image", XINE_VERSION_CODE, &demux_info_image, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index 7fe9a3698..7713bcfe8 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.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_matroska.c,v 1.26 2004/05/02 12:28:35 tmattern Exp $
+ * $Id: demux_matroska.c,v 1.27 2004/05/16 18:01:43 tmattern Exp $
*
* demultiplexer for matroska streams
*
@@ -2317,9 +2317,12 @@ static void *init_class (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_matroska = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "matroska", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_DEMUX, 24, "matroska", XINE_VERSION_CODE, &demux_info_matroska, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c
index 22617cf00..7b99ffc21 100644
--- a/src/demuxers/demux_mng.c
+++ b/src/demuxers/demux_mng.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_mng.c,v 1.21 2004/02/19 02:50:25 rockyb Exp $
+ * $Id: demux_mng.c,v 1.22 2004/05/16 18:01:43 tmattern Exp $
*
* demux_mng.c, Demuxer plugin for Multiple-image Network Graphics format
*
@@ -370,7 +370,11 @@ static void *init_plugin(xine_t *xine, void *data){
return this;
}
+demuxer_info_t demux_info_mng = {
+ 10 /* priority */
+};
+
plugin_info_t xine_plugin_info[] = {
- { PLUGIN_DEMUX, 24, "mng", XINE_VERSION_CODE, NULL, (void*)init_plugin},
+ { PLUGIN_DEMUX, 24, "mng", XINE_VERSION_CODE, &demux_info_mng, (void*)init_plugin},
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 5847ae368..055f718cc 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_mpeg.c,v 1.140 2004/05/10 11:33:54 hadess Exp $
+ * $Id: demux_mpeg.c,v 1.141 2004/05/16 18:01:43 tmattern Exp $
*
* demultiplexer for mpeg 1/2 program streams
* reads streams of variable blocksizes
@@ -1219,9 +1219,12 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_mpeg = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "mpeg", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "mpeg", XINE_VERSION_CODE, &demux_info_mpeg, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index cd9de325a..5b11595fc 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.206 2004/04/22 21:30:10 miguelfreitas Exp $
+ * $Id: demux_mpeg_block.c,v 1.207 2004/05/16 18:01:43 tmattern Exp $
*
* demultiplexer for mpeg 1/2 program streams
* used with fixed blocksize devices (like dvd/vcd)
@@ -1553,9 +1553,12 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_mpeg_block = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "mpeg_block", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "mpeg_block", XINE_VERSION_CODE, &demux_info_mpeg_block, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index bad1b53fd..6a2518b18 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_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_mpeg_pes.c,v 1.22 2004/05/14 02:12:48 jcdutton Exp $
+ * $Id: demux_mpeg_pes.c,v 1.23 2004/05/16 18:01:43 tmattern Exp $
*
* demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
* reads streams of variable blocksizes
@@ -1522,9 +1522,12 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_mpeg_pes = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "mpeg_pes", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "mpeg_pes", XINE_VERSION_CODE, &demux_info_mpeg_pes, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
index c67802921..15f328441 100644
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -23,7 +23,7 @@
* For more information regarding the NSV file format, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: demux_nsv.c,v 1.15 2004/02/09 22:24:36 jstembridge Exp $
+ * $Id: demux_nsv.c,v 1.16 2004/05/16 18:01:43 tmattern Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -524,9 +524,12 @@ static void *demux_nsv_init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_nsv = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "nsv", XINE_VERSION_CODE, NULL, demux_nsv_init_plugin },
+ { PLUGIN_DEMUX, 24, "nsv", XINE_VERSION_CODE, &demux_info_nsv, demux_nsv_init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 225cf9b7e..cd6d0090f 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_ogg.c,v 1.144 2004/03/30 20:44:15 heinchen Exp $
+ * $Id: demux_ogg.c,v 1.145 2004/05/16 18:01:43 tmattern Exp $
*
* demultiplexer for ogg streams
*
@@ -1754,9 +1754,12 @@ static void *init_class (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_ogg = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "ogg", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_DEMUX, 24, "ogg", XINE_VERSION_CODE, &demux_info_ogg, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c
index 1479fd75a..2ef44959d 100644
--- a/src/demuxers/demux_pva.c
+++ b/src/demuxers/demux_pva.c
@@ -23,7 +23,7 @@
* For more information regarding the PVA file format, refer to this PDF:
* http://www.technotrend.de/download/av_format_v1.pdf
*
- * $Id: demux_pva.c,v 1.17 2004/01/12 17:35:15 miguelfreitas Exp $
+ * $Id: demux_pva.c,v 1.18 2004/05/16 18:01:44 tmattern Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -511,9 +511,12 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_pva = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "pva", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "pva", XINE_VERSION_CODE, &demux_info_pva, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index b1eacba2a..30abba3d8 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.181 2004/04/30 10:13:33 hadess Exp $
+ * $Id: demux_qt.c,v 1.182 2004/05/16 18:01:44 tmattern Exp $
*
*/
@@ -2939,9 +2939,12 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_qt = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "quicktime", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "quicktime", XINE_VERSION_CODE, &demux_info_qt, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c
index 2505fa94b..8cc4b3763 100644
--- a/src/demuxers/demux_rawdv.c
+++ b/src/demuxers/demux_rawdv.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_rawdv.c,v 1.19 2004/02/09 22:24:37 jstembridge Exp $
+ * $Id: demux_rawdv.c,v 1.20 2004/05/16 18:01:44 tmattern Exp $
*
* demultiplexer for raw dv streams
*/
@@ -423,9 +423,12 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_raw_dv = {
+ 0 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "rawdv", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "rawdv", XINE_VERSION_CODE, &demux_info_raw_dv, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 10a9fef8f..395ba8ef7 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -31,7 +31,7 @@
*
* Based on FFmpeg's libav/rm.c.
*
- * $Id: demux_real.c,v 1.96 2004/05/13 21:17:09 jstembridge Exp $
+ * $Id: demux_real.c,v 1.97 2004/05/16 18:01:44 tmattern Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1561,9 +1561,12 @@ static void *init_class (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_real = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "real", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_DEMUX, 24, "real", XINE_VERSION_CODE, &demux_info_real, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c
index a7a39e5b9..17b986c66 100644
--- a/src/demuxers/demux_slave.c
+++ b/src/demuxers/demux_slave.c
@@ -21,7 +21,7 @@
*/
/*
- * $Id: demux_slave.c,v 1.11 2004/01/12 17:35:15 miguelfreitas Exp $
+ * $Id: demux_slave.c,v 1.12 2004/05/16 18:01:44 tmattern Exp $
*
* demuxer for slave "protocol"
* master xine must be started with XINE_PARAM_BROADCASTER_PORT set, that is,
@@ -436,9 +436,12 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_slave = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "slave", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "slave", XINE_VERSION_CODE, &demux_info_slave, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 48ad0f2f8..e72961e21 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.101 2004/05/09 22:34:19 miguelfreitas Exp $
+ * $Id: demux_ts.c,v 1.102 2004/05/16 18:01:44 tmattern Exp $
*
* Demultiplexer for MPEG2 Transport Streams.
*
@@ -2090,9 +2090,12 @@ static void *init_class (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_ts = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "mpeg-ts", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_DEMUX, 24, "mpeg-ts", XINE_VERSION_CODE, &demux_info_ts, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c
index dbb23639c..d7a790dbd 100644
--- a/src/demuxers/demux_yuv4mpeg2.c
+++ b/src/demuxers/demux_yuv4mpeg2.c
@@ -24,7 +24,7 @@
* tools, visit:
* http://mjpeg.sourceforge.net/
*
- * $Id: demux_yuv4mpeg2.c,v 1.37 2004/02/14 20:20:43 jstembridge Exp $
+ * $Id: demux_yuv4mpeg2.c,v 1.38 2004/05/16 18:01:44 tmattern Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -492,9 +492,12 @@ static void *init_plugin (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_yuv4mpeg2 = {
+ 10 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "yuv4mpeg2", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 24, "yuv4mpeg2", XINE_VERSION_CODE, &demux_info_yuv4mpeg2, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c
index 42e3ec160..e2e82e7dc 100644
--- a/src/demuxers/demux_yuv_frames.c
+++ b/src/demuxers/demux_yuv_frames.c
@@ -20,7 +20,7 @@
*/
/*
- * $Id: demux_yuv_frames.c,v 1.15 2004/03/10 22:46:18 jstembridge Exp $
+ * $Id: demux_yuv_frames.c,v 1.16 2004/05/16 18:01:44 tmattern Exp $
*
* dummy demultiplexer for raw yuv frames (delivered by v4l)
*/
@@ -270,10 +270,13 @@ static void *init_class (xine_t *xine, void *data) {
/*
* exported plugin catalog entry
*/
+demuxer_info_t demux_info_yuv_frames = {
+ 0 /* priority */
+};
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "yuv_frames", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_DEMUX, 24, "yuv_frames", XINE_VERSION_CODE, &demux_info_yuv_frames, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c
index bcf0ddb63..9e4fc60e4 100644
--- a/src/demuxers/group_audio.c
+++ b/src/demuxers/group_audio.c
@@ -19,7 +19,7 @@
*
* This file contains plugin entries for several demuxers used in games
*
- * $Id: group_audio.c,v 1.12 2004/02/11 20:40:00 tmattern Exp $
+ * $Id: group_audio.c,v 1.13 2004/05/16 18:01:44 tmattern Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -35,22 +35,76 @@
* exported plugin catalog entries
*/
+demuxer_info_t demux_info_aac = {
+ 0 /* priority */
+};
+
+demuxer_info_t demux_info_ac3 = {
+ 0 /* priority */
+};
+
+demuxer_info_t demux_info_aud = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_aiff = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_cdda = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_mpgaudio = {
+ 0 /* priority */
+};
+
+demuxer_info_t demux_info_nsf = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_realaudio = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_snd = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_voc = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_vox = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_wav = {
+ 10 /* priority */
+};
+
+#ifdef HAVE_MODPLUG
+demuxer_info_t demux_info_mod = {
+ 10 /* priority */
+};
+#endif
+
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "aac", XINE_VERSION_CODE, NULL, demux_aac_init_plugin },
- { PLUGIN_DEMUX, 24, "ac3", XINE_VERSION_CODE, NULL, demux_ac3_init_plugin },
- { PLUGIN_DEMUX, 24, "aud", XINE_VERSION_CODE, NULL, demux_aud_init_plugin },
- { PLUGIN_DEMUX, 24, "aiff", XINE_VERSION_CODE, NULL, demux_aiff_init_plugin },
- { PLUGIN_DEMUX, 24, "cdda", XINE_VERSION_CODE, NULL, demux_cdda_init_plugin },
- { PLUGIN_DEMUX, 24, "mp3", XINE_VERSION_CODE, NULL, demux_mpgaudio_init_class },
- { PLUGIN_DEMUX, 24, "nsf", XINE_VERSION_CODE, NULL, demux_nsf_init_plugin },
- { PLUGIN_DEMUX, 24, "realaudio", XINE_VERSION_CODE, NULL, demux_realaudio_init_plugin },
- { PLUGIN_DEMUX, 24, "snd", XINE_VERSION_CODE, NULL, demux_snd_init_plugin },
- { PLUGIN_DEMUX, 24, "voc", XINE_VERSION_CODE, NULL, demux_voc_init_plugin },
- { PLUGIN_DEMUX, 24, "vox", XINE_VERSION_CODE, NULL, demux_vox_init_plugin },
- { PLUGIN_DEMUX, 24, "wav", XINE_VERSION_CODE, NULL, demux_wav_init_plugin },
+ { PLUGIN_DEMUX, 24, "aac", XINE_VERSION_CODE, &demux_info_aac, demux_aac_init_plugin },
+ { PLUGIN_DEMUX, 24, "ac3", XINE_VERSION_CODE, &demux_info_ac3, demux_ac3_init_plugin },
+ { PLUGIN_DEMUX, 24, "aud", XINE_VERSION_CODE, &demux_info_aud, demux_aud_init_plugin },
+ { PLUGIN_DEMUX, 24, "aiff", XINE_VERSION_CODE, &demux_info_aiff, demux_aiff_init_plugin },
+ { PLUGIN_DEMUX, 24, "cdda", XINE_VERSION_CODE, &demux_info_cdda, demux_cdda_init_plugin },
+ { PLUGIN_DEMUX, 24, "mp3", XINE_VERSION_CODE, &demux_info_mpgaudio, demux_mpgaudio_init_class },
+ { PLUGIN_DEMUX, 24, "nsf", XINE_VERSION_CODE, &demux_info_nsf, demux_nsf_init_plugin },
+ { PLUGIN_DEMUX, 24, "realaudio", XINE_VERSION_CODE, &demux_info_realaudio, demux_realaudio_init_plugin },
+ { PLUGIN_DEMUX, 24, "snd", XINE_VERSION_CODE, &demux_info_snd, demux_snd_init_plugin },
+ { PLUGIN_DEMUX, 24, "voc", XINE_VERSION_CODE, &demux_info_voc, demux_voc_init_plugin },
+ { PLUGIN_DEMUX, 24, "vox", XINE_VERSION_CODE, &demux_info_vox, demux_vox_init_plugin },
+ { PLUGIN_DEMUX, 24, "wav", XINE_VERSION_CODE, &demux_info_wav, demux_wav_init_plugin },
#ifdef HAVE_MODPLUG
- { PLUGIN_DEMUX, 24, "mod", XINE_VERSION_CODE, NULL, demux_mod_init_plugin },
+ { PLUGIN_DEMUX, 24, "mod", XINE_VERSION_CODE, &demux_info_mod, demux_mod_init_plugin },
#endif
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c
index 33bd757dd..af255a707 100644
--- a/src/demuxers/group_games.c
+++ b/src/demuxers/group_games.c
@@ -19,7 +19,7 @@
*
* This file contains plugin entries for several demuxers used in games
*
- * $Id: group_games.c,v 1.9 2004/02/13 13:48:03 tmmm Exp $
+ * $Id: group_games.c,v 1.10 2004/05/16 18:01:44 tmattern Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -35,18 +35,62 @@
* exported plugin catalog entries
*/
+demuxer_info_t demux_info_eawve = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_idcin = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_ipmovie = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_vqa = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_wc3movie = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_roq = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_str = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_film = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_smjpeg = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_fourxm = {
+ 10 /* priority */
+};
+
+demuxer_info_t demux_info_vmd = {
+ 10 /* priority */
+};
+
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "wve", XINE_VERSION_CODE, NULL, demux_eawve_init_plugin},
- { PLUGIN_DEMUX, 24, "idcin", XINE_VERSION_CODE, NULL, demux_idcin_init_plugin },
- { PLUGIN_DEMUX, 24, "ipmovie", XINE_VERSION_CODE, NULL, demux_ipmovie_init_plugin },
- { PLUGIN_DEMUX, 24, "vqa", XINE_VERSION_CODE, NULL, demux_vqa_init_plugin },
- { PLUGIN_DEMUX, 24, "wc3movie", XINE_VERSION_CODE, NULL, demux_wc3movie_init_plugin },
- { PLUGIN_DEMUX, 24, "roq", XINE_VERSION_CODE, NULL, demux_roq_init_plugin },
- { PLUGIN_DEMUX, 24, "str", XINE_VERSION_CODE, NULL, demux_str_init_plugin },
- { PLUGIN_DEMUX, 24, "film", XINE_VERSION_CODE, NULL, demux_film_init_plugin },
- { PLUGIN_DEMUX, 24, "smjpeg", XINE_VERSION_CODE, NULL, demux_smjpeg_init_plugin },
- { PLUGIN_DEMUX, 24, "fourxm", XINE_VERSION_CODE, NULL, demux_fourxm_init_plugin },
- { PLUGIN_DEMUX, 24, "vmd", XINE_VERSION_CODE, NULL, demux_vmd_init_plugin },
+ { PLUGIN_DEMUX, 24, "wve", XINE_VERSION_CODE, &demux_info_eawve, demux_eawve_init_plugin},
+ { PLUGIN_DEMUX, 24, "idcin", XINE_VERSION_CODE, &demux_info_idcin, demux_idcin_init_plugin },
+ { PLUGIN_DEMUX, 24, "ipmovie", XINE_VERSION_CODE, &demux_info_ipmovie, demux_ipmovie_init_plugin },
+ { PLUGIN_DEMUX, 24, "vqa", XINE_VERSION_CODE, &demux_info_vqa, demux_vqa_init_plugin },
+ { PLUGIN_DEMUX, 24, "wc3movie", XINE_VERSION_CODE, &demux_info_wc3movie, demux_wc3movie_init_plugin },
+ { PLUGIN_DEMUX, 24, "roq", XINE_VERSION_CODE, &demux_info_roq, demux_roq_init_plugin },
+ { PLUGIN_DEMUX, 24, "str", XINE_VERSION_CODE, &demux_info_str, demux_str_init_plugin },
+ { PLUGIN_DEMUX, 24, "film", XINE_VERSION_CODE, &demux_info_film, demux_film_init_plugin },
+ { PLUGIN_DEMUX, 24, "smjpeg", XINE_VERSION_CODE, &demux_info_smjpeg, demux_smjpeg_init_plugin },
+ { PLUGIN_DEMUX, 24, "fourxm", XINE_VERSION_CODE, &demux_info_fourxm, demux_fourxm_init_plugin },
+ { PLUGIN_DEMUX, 24, "vmd", XINE_VERSION_CODE, &demux_info_vmd, demux_vmd_init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};