summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_asf.c4
-rw-r--r--src/demuxers/demux_avi.c4
-rw-r--r--src/demuxers/demux_mpeg.c4
-rw-r--r--src/demuxers/demux_mpeg_block.c4
-rw-r--r--src/demuxers/demux_mpgaudio.c4
-rw-r--r--src/demuxers/demux_ogg.c4
-rw-r--r--src/input/Makefile.am9
-rw-r--r--src/xine-engine/load_plugins.c32
-rw-r--r--src/xine-engine/video_out.h4
9 files changed, 42 insertions, 27 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 4a3053dfb..6ab42669d 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.57 2002/09/18 00:51:33 guenter Exp $
+ * $Id: demux_asf.c,v 1.58 2002/09/18 22:12:16 guenter Exp $
*
* demultiplexer for asf streams
*
@@ -1477,6 +1477,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) {
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_DEMUX, 11, "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 3689fa05b..4f73edf0d 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.110 2002/09/18 00:51:33 guenter Exp $
+ * $Id: demux_avi.c,v 1.111 2002/09/18 22:12:16 guenter Exp $
*
* demultiplexer for avi streams
*
@@ -1631,6 +1631,6 @@ static void *init_demuxer_plugin(xine_t *xine, void *data) {
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_DEMUX, 11, "avi", XINE_VERSION_CODE, NULL, init_demuxer_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 5242af47b..f2273febd 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.76 2002/09/18 00:51:33 guenter Exp $
+ * $Id: demux_mpeg.c,v 1.77 2002/09/18 22:12:16 guenter Exp $
*
* demultiplexer for mpeg 1/2 program streams
* reads streams of variable blocksizes
@@ -1185,6 +1185,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) {
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_DEMUX, 11, "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 802438270..3795b4540 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.114 2002/09/18 00:51:33 guenter Exp $
+ * $Id: demux_mpeg_block.c,v 1.115 2002/09/18 22:12:17 guenter Exp $
*
* demultiplexer for mpeg 1/2 program streams
*
@@ -1227,6 +1227,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) {
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_DEMUX, 11, "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 011e3f652..77109642a 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.61 2002/09/18 00:51:33 guenter Exp $
+ * $Id: demux_mpgaudio.c,v 1.62 2002/09/18 22:12:17 guenter Exp $
*
* demultiplexer for mpeg audio (i.e. mp3) streams
*
@@ -692,6 +692,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) {
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_DEMUX, 11, "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 434afadd0..c689ac901 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.42 2002/09/18 00:51:33 guenter Exp $
+ * $Id: demux_ogg.c,v 1.43 2002/09/18 22:12:17 guenter Exp $
*
* demultiplexer for ogg streams
*
@@ -1150,6 +1150,6 @@ static void *init_demuxer_plugin (xine_t *xine, void *data) {
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_DEMUX, 11, "ogg", XINE_VERSION_CODE, NULL, init_demuxer_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 43c623df0..e9911576e 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -19,7 +19,8 @@ libdir = $(XINE_PLUGINDIR)
#
if HAVE_CDROM_IOCTLS
-in_dvd = xineplug_inp_dvd.la
+#in_dvd = xineplug_inp_dvd.la
+in_dvd =
in_vcd = xineplug_inp_vcd.la
in_cda = xineplug_inp_cda.la
endif
@@ -48,9 +49,9 @@ xineplug_inp_file_la_SOURCES = input_file.c
xineplug_inp_file_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
xineplug_inp_file_la_LDFLAGS = -avoid-version -module
-xineplug_inp_dvd_la_SOURCES = input_dvd.c
-xineplug_inp_dvd_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la $(link_dvdnav)
-xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module
+#xineplug_inp_dvd_la_SOURCES = input_dvd.c
+#xineplug_inp_dvd_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la $(link_dvdnav)
+#xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module
xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c
xineplug_inp_net_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 83f96158c..115eeddbb 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.94 2002/09/18 00:51:34 guenter Exp $
+ * $Id: load_plugins.c,v 1.95 2002/09/18 22:12:17 guenter Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -101,7 +101,8 @@ static char *_strclone(const char *str){
}
static void _insert_plugin (xine_list_t *list,
- char *filename, plugin_info_t *info){
+ char *filename, plugin_info_t *info,
+ int api_version){
plugin_node_t *entry;
vo_info_t *vo_new, *vo_old;
@@ -111,6 +112,12 @@ static void _insert_plugin (xine_list_t *list,
int priority = 0;
int i;
+ if (info->API != api_version) {
+ printf ("load_plugins: ignoring plugin %s, wrong iface version %d (should be %d)\n",
+ info->id, info->API, api_version);
+ return;
+ }
+
entry = xine_xmalloc(sizeof(plugin_node_t));
entry->filename = _strclone(filename);
entry->info = xine_xmalloc(sizeof(plugin_info_t));
@@ -240,25 +247,32 @@ static void collect_plugins(xine_t *this, char *path){
switch (info->type){
case PLUGIN_INPUT:
- _insert_plugin(this->plugin_catalog->input, str, info);
+ _insert_plugin(this->plugin_catalog->input, str, info,
+ INPUT_PLUGIN_IFACE_VERSION);
break;
case PLUGIN_DEMUX:
- _insert_plugin(this->plugin_catalog->demux, str, info);
+ _insert_plugin(this->plugin_catalog->demux, str, info,
+ DEMUXER_PLUGIN_IFACE_VERSION);
break;
case PLUGIN_AUDIO_DECODER:
- _insert_plugin(this->plugin_catalog->audio, str, info);
+ _insert_plugin(this->plugin_catalog->audio, str, info,
+ AUDIO_DECODER_IFACE_VERSION);
break;
case PLUGIN_VIDEO_DECODER:
- _insert_plugin(this->plugin_catalog->video, str, info);
+ _insert_plugin(this->plugin_catalog->video, str, info,
+ VIDEO_DECODER_IFACE_VERSION);
break;
case PLUGIN_SPU_DECODER:
- _insert_plugin(this->plugin_catalog->spu, str, info);
+ _insert_plugin(this->plugin_catalog->spu, str, info,
+ SPU_DECODER_IFACE_VERSION);
break;
case PLUGIN_AUDIO_OUT:
- _insert_plugin(this->plugin_catalog->aout, str, info);
+ _insert_plugin(this->plugin_catalog->aout, str, info,
+ AUDIO_OUT_IFACE_VERSION);
break;
case PLUGIN_VIDEO_OUT:
- _insert_plugin(this->plugin_catalog->vout, str, info);
+ _insert_plugin(this->plugin_catalog->vout, str, info,
+ VIDEO_OUT_DRIVER_IFACE_VERSION);
break;
default:
xine_log (this, XINE_LOG_PLUGIN,
diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index 327e5e4f8..515403807 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.61 2002/09/09 03:06:14 miguelfreitas Exp $
+ * $Id: video_out.h,v 1.62 2002/09/18 22:12:17 guenter Exp $
*
*
* xine version of video_out.h
@@ -235,7 +235,7 @@ struct vo_instance_s {
* from generic vo functions.
*/
-#define VIDEO_OUT_DRIVER_IFACE_VERSION 6
+#define VIDEO_OUT_DRIVER_IFACE_VERSION 9
struct xine_vo_driver_s {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 08:13:10 +0000