From 9bcf4eef46e6400f97986a28667848e8ba99e5b7 Mon Sep 17 00:00:00 2001 From: Thibaut Mattern Date: Sun, 6 Feb 2005 15:00:34 +0000 Subject: Added a plugin_node_t pointer to the input plugin struct. Incremented all input plugins API version. CVS patchset: 7384 CVS date: 2005/02/06 15:00:34 --- src/input/input_cdda.c | 4 ++-- src/input/input_dvb.c | 2 +- src/input/input_dvd.c | 4 ++-- src/input/input_file.c | 4 ++-- src/input/input_gnome_vfs.c | 4 ++-- src/input/input_http.c | 4 ++-- src/input/input_mms.c | 4 ++-- src/input/input_net.c | 4 ++-- src/input/input_plugin.h | 6 ++++-- src/input/input_pnm.c | 2 +- src/input/input_pvr.c | 4 ++-- src/input/input_rtp.c | 2 +- src/input/input_rtsp.c | 2 +- src/input/input_smb.c | 4 ++-- src/input/input_stdin_fifo.c | 4 ++-- src/input/input_v4l.c | 4 ++-- src/input/input_vcd.c | 4 ++-- src/input/vcd/xineplug_inp_vcd.c | 4 ++-- 18 files changed, 34 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index e652ee038..00c6447b4 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -20,7 +20,7 @@ * Compact Disc Digital Audio (CDDA) Input Plugin * by Mike Melanson (melanson@pcisys.net) * - * $Id: input_cdda.c,v 1.69 2004/12/12 22:01:05 mroi Exp $ + * $Id: input_cdda.c,v 1.70 2005/02/06 15:00:34 tmattern Exp $ */ #ifdef HAVE_CONFIG_H @@ -2638,7 +2638,7 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "CD", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_INPUT, 16, "CD", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index d7c653012..798ff6346 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -3114,6 +3114,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "DVB", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 16, "DVB", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 87cccd833..bfbe532de 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.196 2005/01/18 21:58:19 mroi Exp $ + * $Id: input_dvd.c,v 1.197 2005/02/06 15:00:35 tmattern Exp $ * */ @@ -1814,6 +1814,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "DVD", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 16, "DVD", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_file.c b/src/input/input_file.c index 55f0af673..229925c8f 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.98 2004/12/20 21:22:20 mroi Exp $ + * $Id: input_file.c,v 1.99 2005/02/06 15:00:35 tmattern Exp $ */ #ifdef HAVE_CONFIG_H @@ -891,6 +891,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "FILE", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_INPUT, 16, "FILE", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c index 958927515..56e7a0aea 100644 --- a/src/input/input_gnome_vfs.c +++ b/src/input/input_gnome_vfs.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_gnome_vfs.c,v 1.23 2004/10/30 16:14:33 hadess Exp $ + * $Id: input_gnome_vfs.c,v 1.24 2005/02/06 15:00:35 tmattern Exp $ */ @@ -356,7 +356,7 @@ static void } plugin_info_t xine_plugin_info[] = { - { PLUGIN_INPUT, 15, "gnomevfs", XINE_VERSION_CODE, NULL, + { PLUGIN_INPUT, 16, "gnomevfs", XINE_VERSION_CODE, NULL, init_input_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_http.c b/src/input/input_http.c index e82c01d49..23b87fbe2 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -19,7 +19,7 @@ * * input plugin for http network streams * - * $Id: input_http.c,v 1.107 2005/02/03 07:19:06 valtri Exp $ + * $Id: input_http.c,v 1.108 2005/02/06 15:00:35 tmattern Exp $ */ #ifdef HAVE_CONFIG_H @@ -1055,6 +1055,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "http", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 16, "http", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_mms.c b/src/input/input_mms.c index 7ed6cf152..268890da6 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.54 2004/12/12 22:01:06 mroi Exp $ + * $Id: input_mms.c,v 1.55 2005/02/06 15:00:35 tmattern Exp $ * * mms input plugin based on work from major mms */ @@ -477,6 +477,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "mms", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 16, "mms", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_net.c b/src/input/input_net.c index d1d500e11..68af7f610 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -20,7 +20,7 @@ * Read from a tcp network stream over a lan (put a tweaked mp1e encoder the * other end and you can watch tv anywhere in the house ..) * - * $Id: input_net.c,v 1.62 2005/02/03 07:19:06 valtri Exp $ + * $Id: input_net.c,v 1.63 2005/02/06 15:00:36 tmattern Exp $ * * how to set up mp1e for use with this plugin: * @@ -545,7 +545,7 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "tcp", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 16, "tcp", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index fccc267fd..6b72640dc 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.58 2004/09/26 22:54:52 valtri Exp $ + * $Id: input_plugin.h,v 1.59 2005/02/06 15:00:34 tmattern Exp $ */ #ifndef HAVE_INPUT_PLUGIN_H @@ -37,7 +37,7 @@ # include #endif -#define INPUT_PLUGIN_IFACE_VERSION 15 +#define INPUT_PLUGIN_IFACE_VERSION 16 typedef struct input_class_s input_class_t ; typedef struct input_plugin_s input_plugin_t; @@ -201,6 +201,8 @@ struct input_plugin_s { input_class_t *input_class; + void *node; /* used by plugin loader */ + }; /* diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c index 8e411240d..a8ae73af2 100644 --- a/src/input/input_pnm.c +++ b/src/input/input_pnm.c @@ -301,7 +301,7 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "pnm", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 16, "pnm", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index f6c8157e9..934f751fa 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -38,7 +38,7 @@ * usage: * xine pvr:/\!\! * - * $Id: input_pvr.c,v 1.52 2004/12/12 22:01:06 mroi Exp $ + * $Id: input_pvr.c,v 1.53 2005/02/06 15:00:36 tmattern Exp $ */ /************************************************************************** @@ -1570,7 +1570,7 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "pvr", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_INPUT, 16, "pvr", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index 6730d1e30..c1d81ddf8 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -778,7 +778,7 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "rtp", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 16, "rtp", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c index 3ca4ea3b2..9882697fc 100644 --- a/src/input/input_rtsp.c +++ b/src/input/input_rtsp.c @@ -313,7 +313,7 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "rtsp", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 16, "rtsp", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_smb.c b/src/input/input_smb.c index f4c01c5e1..25c4e9466 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.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_smb.c,v 1.3 2004/10/18 18:44:56 miguelfreitas Exp $ + * $Id: input_smb.c,v 1.4 2005/02/06 15:00:36 tmattern Exp $ */ @@ -258,7 +258,7 @@ static input_info_t input_info_smb = { }; plugin_info_t xine_plugin_info[] = { - { PLUGIN_INPUT, 15, "smb", XINE_VERSION_CODE, &input_info_smb, + { PLUGIN_INPUT, 16, "smb", XINE_VERSION_CODE, &input_info_smb, init_input_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index f98ea89bd..cbfa0f510 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.61 2005/02/03 07:19:06 valtri Exp $ + * $Id: input_stdin_fifo.c,v 1.62 2005/02/06 15:00:36 tmattern Exp $ */ #ifdef HAVE_CONFIG_H @@ -377,6 +377,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "stdin", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 16, "stdin", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index fcf144602..e21f00e91 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -1946,8 +1946,8 @@ static void *init_radio_class (xine_t *xine, void *data) plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 15, "v4l_radio", XINE_VERSION_CODE, NULL, init_radio_class }, - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 15, "v4l_tv", XINE_VERSION_CODE, NULL, init_video_class }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 16, "v4l_radio", XINE_VERSION_CODE, NULL, init_radio_class }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 16, "v4l_tv", XINE_VERSION_CODE, NULL, init_video_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 3ea2ed4d0..654d46cc8 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.77 2004/12/12 22:01:07 mroi Exp $ + * $Id: input_vcd.c,v 1.78 2005/02/06 15:00:37 tmattern Exp $ * */ @@ -1112,6 +1112,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, "VCDO", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 16, "VCDO", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index 32d7c5b94..39f318fc3 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1,5 +1,5 @@ /* - $Id: xineplug_inp_vcd.c,v 1.33 2005/01/08 15:12:43 rockyb Exp $ + $Id: xineplug_inp_vcd.c,v 1.34 2005/02/06 15:00:38 tmattern Exp $ Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein @@ -1845,7 +1845,7 @@ _("Format used in the GUI Title. Similar to the Unix date " const plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 15, (char *) SHORT_PLUGIN_NAME, XINE_VERSION_CODE, + { PLUGIN_INPUT, 16, (char *) SHORT_PLUGIN_NAME, XINE_VERSION_CODE, NULL, vcd_init }, { PLUGIN_NONE, 0, (char *) "", 0, NULL, NULL } }; -- cgit v1.2.3