summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_cdda.c4
-rw-r--r--src/input/input_dvb.c2
-rw-r--r--src/input/input_dvd.c7
-rw-r--r--src/input/input_file.c4
-rw-r--r--src/input/input_gnome_vfs.c4
-rw-r--r--src/input/input_http.c4
-rw-r--r--src/input/input_mms.c4
-rw-r--r--src/input/input_net.c4
-rw-r--r--src/input/input_plugin.h4
-rw-r--r--src/input/input_pnm.c2
-rw-r--r--src/input/input_pvr.c4
-rw-r--r--src/input/input_rtp.c2
-rw-r--r--src/input/input_rtsp.c2
-rw-r--r--src/input/input_stdin_fifo.c4
-rw-r--r--src/input/input_v4l.c4
-rw-r--r--src/input/input_vcd.c4
-rw-r--r--src/input/vcd/xineplug_inp_vcd.c17
17 files changed, 33 insertions, 43 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 4436edb22..e1bbe11d5 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.40 2003/12/05 15:54:58 f1rmb Exp $
+ * $Id: input_cdda.c,v 1.41 2003/12/14 22:13:22 siggi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -2673,7 +2673,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, 13, "CD", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_INPUT, 14, "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 e4e2a5a80..8cbec9bee 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -1056,6 +1056,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, 13, "DVB", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 14, "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 34ed91460..4e60ce84e 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.177 2003/12/13 01:53:48 f1rmb Exp $
+ * $Id: input_dvd.c,v 1.178 2003/12/14 22:13:23 siggi Exp $
*
*/
@@ -1734,6 +1734,9 @@ static void *init_class (xine_t *xine, void *data) {
/*
* $Log: input_dvd.c,v $
+ * Revision 1.178 2003/12/14 22:13:23 siggi
+ * API version bounce
+ *
* Revision 1.177 2003/12/13 01:53:48 f1rmb
* set dvdcss verbosity according to xine's one
*
@@ -2246,6 +2249,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, 13, "DVD", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 14, "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 964c79488..bf26e2b25 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.88 2003/12/05 15:54:58 f1rmb Exp $
+ * $Id: input_file.c,v 1.89 2003/12/14 22:13:23 siggi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -864,6 +864,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, 13, "FILE", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_INPUT, 14, "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 ed55223fe..b2ddc9e34 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.16 2003/10/20 20:30:55 f1rmb Exp $
+ * $Id: input_gnome_vfs.c,v 1.17 2003/12/14 22:13:23 siggi Exp $
*/
@@ -348,7 +348,7 @@ static void
}
plugin_info_t xine_plugin_info[] = {
- { PLUGIN_INPUT, 13, "gnomevfs", XINE_VERSION_CODE, NULL,
+ { PLUGIN_INPUT, 14, "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 0d5de1ef9..c4eaa8eaa 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.80 2003/12/14 12:19:25 f1rmb Exp $
+ * $Id: input_http.c,v 1.81 2003/12/14 22:13:23 siggi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -928,6 +928,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, 13, "http", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 14, "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 b6cdf2daf..2d2958bac 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.44 2003/12/05 15:54:58 f1rmb Exp $
+ * $Id: input_mms.c,v 1.45 2003/12/14 22:13:23 siggi Exp $
*
* mms input plugin based on work from major mms
*/
@@ -446,6 +446,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, 13, "mms", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 14, "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 16640ce35..2b1c9528f 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.56 2003/12/05 15:54:58 f1rmb Exp $
+ * $Id: input_net.c,v 1.57 2003/12/14 22:13:23 siggi Exp $
*
* how to set up mp1e for use with this plugin:
*
@@ -546,7 +546,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, 13, "tcp", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 14, "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 9181f46c5..ac2537a71 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.54 2003/12/07 15:34:30 f1rmb Exp $
+ * $Id: input_plugin.h,v 1.55 2003/12/14 22:13:23 siggi Exp $
*/
#ifndef HAVE_INPUT_PLUGIN_H
@@ -36,7 +36,7 @@
# include <xine/configfile.h>
#endif
-#define INPUT_PLUGIN_IFACE_VERSION 13
+#define INPUT_PLUGIN_IFACE_VERSION 14
typedef struct input_class_s input_class_t ;
typedef struct input_plugin_s input_plugin_t;
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index 879295ab2..c111deb67 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -300,7 +300,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, 13, "pnm", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 14, "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 6cc951c38..b8cac982e 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -38,7 +38,7 @@
* usage:
* xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age>
*
- * $Id: input_pvr.c,v 1.39 2003/12/13 21:55:52 miguelfreitas Exp $
+ * $Id: input_pvr.c,v 1.40 2003/12/14 22:13:23 siggi Exp $
*/
/**************************************************************************
@@ -1568,7 +1568,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, 13, "pvr", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_INPUT, 14, "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 6240a722c..6e24bcb90 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -706,7 +706,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, 13, "rtp", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 14, "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 a1926dc41..6c31693af 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, 13, "rtsp", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 14, "rtsp", XINE_VERSION_CODE, NULL, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 02b410471..2ba5a182b 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.55 2003/12/05 15:54:58 f1rmb Exp $
+ * $Id: input_stdin_fifo.c,v 1.56 2003/12/14 22:13:23 siggi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -375,6 +375,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, 13, "stdin", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 14, "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 9eacc3652..7e55c1788 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -2006,8 +2006,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, 13, "v4l_radio", XINE_VERSION_CODE, NULL, init_radio_class },
- { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 13, "v4l_tv", XINE_VERSION_CODE, NULL, init_video_class },
+ { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 14, "v4l_radio", XINE_VERSION_CODE, NULL, init_radio_class },
+ { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 14, "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 523af25f7..7f19d4239 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.70 2003/12/05 15:54:58 f1rmb Exp $
+ * $Id: input_vcd.c,v 1.71 2003/12/14 22:13:23 siggi Exp $
*
*/
@@ -1110,6 +1110,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, 13, "VCDO", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 14, "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 4bc714ae3..b06d4c521 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.9 2003/11/16 23:33:44 f1rmb Exp $
+ $Id: xineplug_inp_vcd.c,v 1.10 2003/12/14 22:13:23 siggi Exp $
Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -1560,18 +1560,7 @@ vcd_init (xine_t *xine, void *data)
vcd_class = class;
class->mrls = NULL;
- if (INPUT_PLUGIN_IFACE_VERSION >= 14) {
- LOG_MSG("%s%d\n",
- _("This plugin should be looked over to see if it is compatible with this input plugin API: "), INPUT_PLUGIN_IFACE_VERSION);
- }
-
-
-#if INPUT_PLUGIN_IFACE_VERSION == 11
- class->input_class.open_plugin = vcd_class_get_instance;
-#else
class->input_class.get_instance = vcd_class_get_instance;
-#endif
-
class->input_class.get_identifier = vcd_class_get_identifier;
class->input_class.get_description = vcd_class_get_description;
class->input_class.get_dir = vcd_class_get_dir;
@@ -1730,9 +1719,7 @@ _("Format used in the GUI Title. Similar to the Unix date "
gl_default_vcd_log_handler = vcd_log_set_handler (uninit_log_handler);
gl_default_cdio_log_handler = cdio_log_set_handler (uninit_log_handler);
-#if INPUT_PLUGIN_IFACE_VERSION != 11
my_vcd.input_plugin.open = vcd_plugin_open;
-#endif
my_vcd.input_plugin.get_capabilities = vcd_plugin_get_capabilities;
my_vcd.input_plugin.read = vcd_plugin_read;
my_vcd.input_plugin.read_block = vcd_plugin_read_block;
@@ -1761,7 +1748,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, 13, (char *) SHORT_PLUGIN_NAME, XINE_VERSION_CODE,
+ { PLUGIN_INPUT, 14, (char *) SHORT_PLUGIN_NAME, XINE_VERSION_CODE,
NULL, vcd_init },
{ PLUGIN_NONE, 0, (char *) "", 0, NULL, NULL }
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 11:04:56 +0000