summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/demux.h6
-rw-r--r--src/demuxers/demux_asf.c12
-rw-r--r--src/demuxers/demux_avi.c12
-rw-r--r--src/demuxers/demux_elem.c8
-rw-r--r--src/demuxers/demux_mpeg.c12
-rw-r--r--src/demuxers/demux_mpeg_block.c10
-rw-r--r--src/demuxers/demux_mpgaudio.c10
-rw-r--r--src/demuxers/demux_ogg.c12
-rw-r--r--src/demuxers/demux_pes.c12
-rw-r--r--src/demuxers/demux_qt.c18
-rw-r--r--src/demuxers/demux_ts.c12
11 files changed, 72 insertions, 52 deletions
diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h
index 3bdcae1b1..7a52364d8 100644
--- a/src/demuxers/demux.h
+++ b/src/demuxers/demux.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: demux.h,v 1.9 2001/09/01 14:32:59 guenter Exp $
+ * $Id: demux.h,v 1.10 2001/10/17 20:33:09 guenter Exp $
*/
#ifndef HAVE_DEMUX_H
@@ -35,7 +35,7 @@ extern "C" {
#include "input_plugin.h"
#endif
-#define DEMUXER_PLUGIN_IFACE_VERSION 3
+#define DEMUXER_PLUGIN_IFACE_VERSION 4
#define DEMUX_OK 0
#define DEMUX_FINISHED 1
@@ -135,7 +135,7 @@ struct demux_plugin_s
/*
* demuxer plugins should provide this (and only this!) function call:
*
- * demux_plugin_t *init_demux_plugin (int iface_version, config_values_t *cfg);
+ * demux_plugin_t *init_demux_plugin (int iface_version, xine_t *xine);
*/
#ifdef __cplusplus
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 548258850..1f9f53c8c 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.1 2001/10/14 00:18:27 guenter Exp $
+ * $Id: demux_asf.c,v 1.2 2001/10/17 20:33:09 guenter Exp $
*
* demultiplexer for asf streams
*
@@ -1076,11 +1076,12 @@ static int demux_asf_get_stream_length (demux_plugin_t *this_gen) {
return this->length;
}
-demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
- demux_asf_t *this;
+ demux_asf_t *this;
+ config_values_t *config;
- if (iface != 3) {
+ if (iface != 4) {
printf( "demux_asf: plugin doesn't support plugin API version %d.\n"
"demux_asf: this means there's a version mismatch between xine and this "
"demux_asf: demuxer plugin.\nInstalling current demux plugins should help.\n",
@@ -1088,7 +1089,8 @@ demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
return NULL;
}
- this = xmalloc (sizeof (demux_asf_t));
+ this = xmalloc (sizeof (demux_asf_t));
+ config = xine->config;
xine_debug = config->lookup_int (config, "xine_debug", 0);
this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 440ec0bcb..52b3f06cf 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.44 2001/10/07 22:11:22 guenter Exp $
+ * $Id: demux_avi.c,v 1.45 2001/10/17 20:33:09 guenter Exp $
*
* demultiplexer for avi streams
*
@@ -1195,11 +1195,12 @@ static int demux_avi_get_stream_length (demux_plugin_t *this_gen) {
return 0;
}
-demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
- demux_avi_t *this;
+ demux_avi_t *this;
+ config_values_t *config;
- if (iface != 3) {
+ if (iface != 4) {
printf( "demux_avi: this plugin doesn't support plugin API version %d.\n"
"demux_avi: this means there's a version mismatch between xine and this "
"demux_avi: demuxer plugin.\nInstalling current demuxer plugins should help.\n",
@@ -1207,7 +1208,8 @@ demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
return NULL;
}
- this = xmalloc (sizeof (demux_avi_t));
+ this = xmalloc (sizeof (demux_avi_t));
+ config = xine->config;
xine_debug = config->lookup_int (config, "xine_debug", 0);
this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index c15ca3d39..d0ff7374a 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.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_elem.c,v 1.21 2001/10/03 17:15:43 jkeil Exp $
+ * $Id: demux_elem.c,v 1.22 2001/10/17 20:33:09 guenter Exp $
*
* demultiplexer for elementary mpeg streams
*
@@ -324,9 +324,10 @@ static int demux_mpeg_elem_get_stream_length(demux_plugin_t *this_gen) {
/*
*
*/
-demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
demux_mpeg_elem_t *this;
+ config_values_t *config;
if (iface != 3) {
printf( "demux_elem: plugin doesn't support plugin API version %d.\n"
@@ -336,7 +337,8 @@ demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
return NULL;
}
- this = malloc (sizeof (demux_mpeg_elem_t));
+ this = malloc (sizeof (demux_mpeg_elem_t));
+ config = xine->config;
xine_debug = config->lookup_int (config, "xine_debug", 0);
this->demux_plugin.interface_version = DEMUX_MPEG_ELEM_IFACE_VERSION;
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 155fa1ac5..a3d0f5939 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.36 2001/10/09 18:49:33 miguelfreitas Exp $
+ * $Id: demux_mpeg.c,v 1.37 2001/10/17 20:33:09 guenter Exp $
*
* demultiplexer for mpeg 1/2 program streams
* reads streams of variable blocksizes
@@ -847,11 +847,12 @@ static int demux_mpeg_get_stream_length (demux_plugin_t *this_gen) {
}
-demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
- demux_mpeg_t *this;
+ demux_mpeg_t *this;
+ config_values_t *config;
- if (iface != 3) {
+ if (iface != 4) {
printf( "demux_mpeg: plugin doesn't support plugin API version %d.\n"
"demux_mpeg: this means there's a version mismatch between xine and this "
"demux_mpeg: demuxer plugin.\nInstalling current demux plugins should help.\n",
@@ -859,7 +860,8 @@ demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
return NULL;
}
- this = xmalloc (sizeof (demux_mpeg_t));
+ this = xmalloc (sizeof (demux_mpeg_t));
+ config = xine->config;
xine_debug = config->lookup_int (config, "xine_debug", 0);
this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 004fbc23f..0f5cd1eda 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.53 2001/10/08 01:40:51 miguelfreitas Exp $
+ * $Id: demux_mpeg_block.c,v 1.54 2001/10/17 20:33:09 guenter Exp $
*
* demultiplexer for mpeg 1/2 program streams
*
@@ -910,11 +910,12 @@ static int demux_mpeg_block_get_stream_length (demux_plugin_t *this_gen) {
}
-demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
demux_mpeg_block_t *this;
+ config_values_t *config;
- if (iface != 3) {
+ if (iface != 4) {
printf( "demux_mpeg: plugin doesn't support plugin API version %d.\n"
"demux_mpeg: this means there's a version mismatch between xine and this "
"demux_mpeg: demuxer plugin.\nInstalling current demux plugins should help.\n",
@@ -922,7 +923,8 @@ demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
return NULL;
}
- this = xmalloc (sizeof (demux_mpeg_block_t));
+ this = xmalloc (sizeof (demux_mpeg_block_t));
+ config = xine->config;
xine_debug = config->lookup_int (config, "xine_debug", 0);
this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 606cc8f82..94c0cb30e 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.22 2001/10/03 17:15:43 jkeil Exp $
+ * $Id: demux_mpgaudio.c,v 1.23 2001/10/17 20:33:09 guenter Exp $
*
* demultiplexer for mpeg audio (i.e. mp3) streams
*
@@ -420,11 +420,12 @@ static int demux_mpgaudio_get_stream_length (demux_plugin_t *this_gen) {
}
-demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
demux_mpgaudio_t *this;
+ config_values_t *config;
- if (iface != 3) {
+ if (iface != 4) {
printf( "demux_mpeg: plugin doesn't support plugin API version %d.\n"
"demux_mpeg: this means there's a version mismatch between xine and this "
"demux_mpeg: demuxer plugin.\nInstalling current demux plugins should help.\n",
@@ -432,7 +433,8 @@ demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
return NULL;
}
- this = malloc (sizeof (demux_mpgaudio_t));
+ this = malloc (sizeof (demux_mpgaudio_t));
+ config = xine->config;
xine_debug = config->lookup_int (config, "xine_debug", 0);
this->demux_plugin.interface_version = DEMUX_MPGAUDIO_IFACE_VERSION;
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 4f6312e04..ea9a73578 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.3 2001/10/15 00:49:09 guenter Exp $
+ * $Id: demux_ogg.c,v 1.4 2001/10/17 20:33:09 guenter Exp $
*
* demultiplexer for ogg streams
*
@@ -391,11 +391,12 @@ static int demux_ogg_get_stream_length (demux_plugin_t *this_gen) {
return 0;
}
-demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
- demux_ogg_t *this;
+ demux_ogg_t *this;
+ config_values_t *config;
- if (iface != 3) {
+ if (iface != 4) {
printf( "demux_ogg: plugin doesn't support plugin API version %d.\n"
"demux_ogg: this means there's a version mismatch between xine and this "
"demux_ogg: demuxer plugin.\nInstalling current demux plugins should help.\n",
@@ -403,7 +404,8 @@ demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
return NULL;
}
- this = xmalloc (sizeof (demux_ogg_t));
+ this = xmalloc (sizeof (demux_ogg_t));
+ config = xine->config;
xine_debug = config->lookup_int (config, "xine_debug", 0);
this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c
index f493fc21c..25075b389 100644
--- a/src/demuxers/demux_pes.c
+++ b/src/demuxers/demux_pes.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_pes.c,v 1.8 2001/10/03 17:15:43 jkeil Exp $
+ * $Id: demux_pes.c,v 1.9 2001/10/17 20:33:09 guenter Exp $
*
* demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
* reads streams of variable blocksizes
@@ -559,11 +559,12 @@ static int demux_pes_get_stream_length (demux_plugin_t *this_gen) {
return 0; /* FIXME: implement */
}
-demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
- demux_pes_t *this;
+ demux_pes_t *this;
+ config_values_t *config;
- if (iface != 3) {
+ if (iface != 4) {
printf( "demux_pes: plugin doesn't support plugin API version %d.\n"
"demux_pes: this means there's a version mismatch between xine and this "
"demux_pes: demuxer plugin.\nInstalling current demux plugins should help.\n",
@@ -571,7 +572,8 @@ demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
return NULL;
}
- this = xmalloc (sizeof (demux_pes_t));
+ this = xmalloc (sizeof (demux_pes_t));
+ config = xine->config;
xine_debug = config->lookup_int (config, "xine_debug", 0);
this->demux_plugin.interface_version = 3;
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index e9bfb573d..1c4cd67d1 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.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_qt.c,v 1.6 2001/10/03 17:15:43 jkeil Exp $
+ * $Id: demux_qt.c,v 1.7 2001/10/17 20:33:09 guenter Exp $
*
* demultiplexer for quicktime streams, based on:
*
@@ -4377,19 +4377,21 @@ static int demux_qt_get_stream_length (demux_plugin_t *this_gen) {
return this->video_step * quicktime_video_length (this->qt, 0);
}
-demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
- demux_qt_t *this;
+ demux_qt_t *this;
+ config_values_t *config;
- if (iface != 3) {
- printf( "demux_mpeg: plugin doesn't support plugin API version %d.\n"
- "demux_mpeg: this means there's a version mismatch between xine and this "
- "demux_mpeg: demuxer plugin.\nInstalling current demux plugins should help.\n",
+ if (iface != 4) {
+ printf( "demux_qt: plugin doesn't support plugin API version %d.\n"
+ "demux_qt: this means there's a version mismatch between xine and this "
+ "demux_qt: demuxer plugin.\nInstalling current demux plugins should help.\n",
iface);
return NULL;
}
- this = xmalloc (sizeof (demux_qt_t));
+ this = xmalloc (sizeof (demux_qt_t));
+ config = xine->config;
xine_debug = config->lookup_int (config, "xine_debug", 0);
this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index ed782ec10..982e466a4 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.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_ts.c,v 1.17 2001/10/03 17:15:43 jkeil Exp $
+ * $Id: demux_ts.c,v 1.18 2001/10/17 20:33:09 guenter Exp $
*
* Demultiplexer for MPEG2 Transport Streams.
*
@@ -967,12 +967,13 @@ static int demux_ts_get_stream_length (demux_plugin_t *this_gen) {
}
-demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
- demux_ts *this;
- int i;
+ demux_ts *this;
+ config_values_t *config;
+ int i;
- if (iface != 3) {
+ if (iface != 4) {
printf("demux_ts: plugin doesn't support plugin API version %d.\n"
"demux_ts: this means there's a version mismatch between xine and this "
"demux_ts: demuxer plugin.\nInstalling current demux plugins should help.\n",
@@ -984,6 +985,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
* Initialise the generic plugin.
*/
this = xmalloc(sizeof(*this));
+ config = xine->config;
xine_debug = config->lookup_int(config, "xine_debug", 0);
this->plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
this->plugin.open = demux_ts_open;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 16:59:33 +0000