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.c13
-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.c4
17 files changed, 37 insertions, 32 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 1009e34cc..7ea7e2074 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.59 2004/05/26 16:37:41 mroi Exp $
+ * $Id: input_cdda.c,v 1.60 2004/06/13 21:28:55 miguelfreitas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -2571,7 +2571,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, 14, "CD", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_INPUT, 15, "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 a476a934f..30b9891e8 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -1339,6 +1339,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, 14, "DVB", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 15, "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 899487819..40987d00c 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.180 2004/04/10 15:45:10 mroi Exp $
+ * $Id: input_dvd.c,v 1.181 2004/06/13 21:28:56 miguelfreitas Exp $
*
*/
@@ -775,8 +775,6 @@ static buf_element_t *dvd_plugin_read_block (input_plugin_t *this_gen,
if (this->pg_length && this->pgc_length) {
int pos, length;
dvdnav_get_position(this->dvdnav, &pos, &length);
- buf->extra_info->input_pos = pos * (off_t)DVD_BLOCK_SIZE;
- buf->extra_info->input_length = length * (off_t)DVD_BLOCK_SIZE;
switch (((dvd_input_class_t *)this->input_plugin.input_class)->seek_mode) {
case 0: /* PGC based seeking */
buf->extra_info->total_time = this->pgc_length / 90;
@@ -1773,6 +1771,13 @@ static void *init_class (xine_t *xine, void *data) {
/*
* $Log: input_dvd.c,v $
+ * Revision 1.181 2004/06/13 21:28:56 miguelfreitas
+ * implement steps 1, 2, 3 and 4 of the seeking proposal:
+ * http://article.gmane.org/gmane.comp.video.xine.devel/9532
+ *
+ * it is now up to demuxers to decide what the 0..65535 position means.
+ * demuxers tested: ogg, voc, flac, rm, asf, vqa, vob, avi, y4m, au, mov, ts, mp3, mpg, wav, ra, mve
+ *
* Revision 1.180 2004/04/10 15:45:10 mroi
* improving config help strings
*
@@ -2295,6 +2300,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, 14, "DVD", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 15, "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 c04a79d76..e09fc6716 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.91 2004/04/15 00:14:57 hadess Exp $
+ * $Id: input_file.c,v 1.92 2004/06/13 21:28:56 miguelfreitas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -877,6 +877,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, 14, "FILE", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_INPUT, 15, "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 3d8accfcd..4c7a61842 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.20 2004/05/02 16:33:23 hadess Exp $
+ * $Id: input_gnome_vfs.c,v 1.21 2004/06/13 21:28:56 miguelfreitas Exp $
*/
@@ -355,7 +355,7 @@ static void
}
plugin_info_t xine_plugin_info[] = {
- { PLUGIN_INPUT, 14, "gnomevfs", XINE_VERSION_CODE, NULL,
+ { PLUGIN_INPUT, 15, "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 17e4748f0..dd3c74d86 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.90 2004/05/27 03:44:45 miguelfreitas Exp $
+ * $Id: input_http.c,v 1.91 2004/06/13 21:28:56 miguelfreitas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1075,6 +1075,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, 14, "http", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 15, "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 aa9f6fbfa..befb42f25 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.51 2004/04/26 15:05:04 mroi Exp $
+ * $Id: input_mms.c,v 1.52 2004/06/13 21:28:56 miguelfreitas 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, 14, "mms", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 15, "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 2b1c9528f..0d560b9d4 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.57 2003/12/14 22:13:23 siggi Exp $
+ * $Id: input_net.c,v 1.58 2004/06/13 21:28:56 miguelfreitas 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, 14, "tcp", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 15, "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 ac2537a71..65d50ce73 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.55 2003/12/14 22:13:23 siggi Exp $
+ * $Id: input_plugin.h,v 1.56 2004/06/13 21:28:56 miguelfreitas Exp $
*/
#ifndef HAVE_INPUT_PLUGIN_H
@@ -36,7 +36,7 @@
# include <xine/configfile.h>
#endif
-#define INPUT_PLUGIN_IFACE_VERSION 14
+#define INPUT_PLUGIN_IFACE_VERSION 15
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 c111deb67..0849ea6a7 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, 14, "pnm", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 15, "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 0ad0d9eab..0cbffd47d 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.45 2004/05/16 19:32:36 miguelfreitas Exp $
+ * $Id: input_pvr.c,v 1.46 2004/06/13 21:28:56 miguelfreitas Exp $
*/
/**************************************************************************
@@ -1559,7 +1559,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, 14, "pvr", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_INPUT, 15, "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 8e851cb16..c13ba963e 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, 14, "rtp", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 15, "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 6c31693af..3057be8cf 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, 14, "rtsp", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 15, "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 c0c3d1dc4..fa1dd682f 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.57 2004/04/19 20:20:51 hadess Exp $
+ * $Id: input_stdin_fifo.c,v 1.58 2004/06/13 21:28:56 miguelfreitas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -376,6 +376,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, 14, "stdin", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 15, "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 60a6dbb23..3c527f773 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1957,8 +1957,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, 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_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_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index d19378a2d..cc255b370 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.73 2004/04/10 15:45:11 mroi Exp $
+ * $Id: input_vcd.c,v 1.74 2004/06/13 21:28:56 miguelfreitas 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, 14, "VCDO", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 15, "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 f211821d0..65f04563c 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.17 2004/04/28 10:57:12 rockyb Exp $
+ $Id: xineplug_inp_vcd.c,v 1.18 2004/06/13 21:28:56 miguelfreitas Exp $
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -1784,7 +1784,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, 14, (char *) SHORT_PLUGIN_NAME, XINE_VERSION_CODE,
+ { PLUGIN_INPUT, 15, (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-04-28 02:39:48 +0000