summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_dvd.c15
-rw-r--r--src/input/input_file.c4
-rw-r--r--src/input/input_http.c2
-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_rtsp.c2
-rw-r--r--src/input/input_stdin_fifo.c4
-rw-r--r--src/input/input_vcd.c4
10 files changed, 28 insertions, 17 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index b506cb679..42337036b 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.122 2002/12/06 18:44:40 miguelfreitas Exp $
+ * $Id: input_dvd.c,v 1.123 2002/12/21 12:56:47 miguelfreitas Exp $
*
*/
@@ -1678,6 +1678,17 @@ static void *init_class (xine_t *xine, void *data) {
/*
* $Log: input_dvd.c,v $
+ * Revision 1.123 2002/12/21 12:56:47 miguelfreitas
+ * - add buf->decoder_info_ptr: portability for systems where pointer has
+ * different sizeof than integer.
+ * - add extra_info structure to pass informations from input/demuxers down
+ * to the output frame. this can be used, for example, to pass the frame
+ * number of a frame (when known by decoder). also, immediate benefict is
+ * that we now have a slider which really shows the current position of
+ * the playing stream. new fields can be added to extra_info keeping
+ * binary compatibility
+ * - bumpy everybody's api versions
+ *
* Revision 1.122 2002/12/06 18:44:40 miguelfreitas
* - add still frame hint (untested - i don't have dvd here)
* - check mrl before allocating plugin context, so it doesn't get initialized for
@@ -1940,6 +1951,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, 10, "DVD", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 11, "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 8da57ae65..edfa9615d 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.69 2002/11/20 11:57:43 mroi Exp $
+ * $Id: input_file.c,v 1.70 2002/12/21 12:56:47 miguelfreitas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -876,7 +876,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, 10, "file", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_INPUT, 11, "file", XINE_VERSION_CODE, NULL, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 78cae53ed..9304f90ad 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -973,7 +973,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, 10, "http", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 11, "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 22f483942..43b98d31f 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.28 2002/12/13 08:56:53 f1rmb Exp $
+ * $Id: input_mms.c,v 1.29 2002/12/21 12:56:47 miguelfreitas Exp $
*
* mms input plugin based on work from major mms
*/
@@ -381,6 +381,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, 10, "mms", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 11, "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 5ba2d00b4..0903e2a98 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.38 2002/12/14 23:02:59 holstsn Exp $
+ * $Id: input_net.c,v 1.39 2002/12/21 12:56:47 miguelfreitas Exp $
*
* how to set up mp1e for use with this plugin:
*
@@ -421,7 +421,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, 10, "tcp", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 11, "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 df1cdd4be..138fef60d 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.41 2002/12/15 22:58:47 guenter Exp $
+ * $Id: input_plugin.h,v 1.42 2002/12/21 12:56:47 miguelfreitas Exp $
*/
#ifndef HAVE_INPUT_PLUGIN_H
@@ -29,7 +29,7 @@
#include "buffer.h"
#include "configfile.h"
-#define INPUT_PLUGIN_IFACE_VERSION 10
+#define INPUT_PLUGIN_IFACE_VERSION 11
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 b32dd7bf5..cfc73fd2d 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, 10, "pnm", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 11, "pnm", 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 172358f85..7fd5cf4e7 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, 10, "rtsp", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 11, "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 a992b8f1c..a0809f3e1 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.38 2002/12/12 12:00:24 guenter Exp $
+ * $Id: input_stdin_fifo.c,v 1.39 2002/12/21 12:56:47 miguelfreitas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -388,6 +388,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, 10, "stdin", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 11, "stdin", XINE_VERSION_CODE, NULL, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index c35a8ad66..bc09a33c2 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.59 2002/11/20 11:57:43 mroi Exp $
+ * $Id: input_vcd.c,v 1.60 2002/12/21 12:56:47 miguelfreitas Exp $
*
*/
@@ -1148,6 +1148,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, 10, "VCD", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 11, "VCD", XINE_VERSION_CODE, NULL, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};