summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dxr3/dxr3_decoder.c20
-rw-r--r--src/input/input_cda.c4
-rw-r--r--src/input/input_dvd.c4
-rw-r--r--src/input/input_file.c4
-rw-r--r--src/input/input_http.c2
-rw-r--r--src/input/input_mms.c2
-rw-r--r--src/input/input_net.c2
-rw-r--r--src/input/input_plugin.h4
-rw-r--r--src/input/input_rtp.c2
-rw-r--r--src/input/input_stdin_fifo.c4
-rw-r--r--src/input/input_vcd.c4
-rw-r--r--src/liba52/xine_decoder.c4
-rw-r--r--src/libdivx4/xine_decoder.c4
-rw-r--r--src/libdts/xine_decoder.c4
-rw-r--r--src/libffmpeg/xine_decoder.c4
-rw-r--r--src/liblpcm/xine_decoder.c4
-rw-r--r--src/libmad/xine_decoder.c4
-rw-r--r--src/libmpeg2/xine_decoder.c4
-rw-r--r--src/libspucc/xine_decoder.c4
-rw-r--r--src/libspudec/xine_decoder.c4
-rw-r--r--src/libsputext/xine_decoder.c4
-rw-r--r--src/libvorbis/xine_decoder.c4
-rw-r--r--src/libw32dll/w32codec.c6
-rw-r--r--src/libxvid/xine_decoder.c7
-rw-r--r--src/xine-engine/load_plugins.c4
-rw-r--r--src/xine-engine/xine_internal.h4
26 files changed, 68 insertions, 49 deletions
diff --git a/src/dxr3/dxr3_decoder.c b/src/dxr3/dxr3_decoder.c
index 8830f2c7a..c3eae1c5c 100644
--- a/src/dxr3/dxr3_decoder.c
+++ b/src/dxr3/dxr3_decoder.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: dxr3_decoder.c,v 1.72 2002/04/10 10:37:41 miguelfreitas Exp $
+ * $Id: dxr3_decoder.c,v 1.73 2002/04/23 15:45:19 esnel Exp $
*
* dxr3 video and spu decoder plugin. Accepts the video and spu data
* from XINE and sends it directly to the corresponding dxr3 devices.
@@ -759,6 +759,10 @@ static void dxr3_flush_decoder(void *this_gen, cfg_entry_t *entry)
entry->num_value = 0;
}
+static void dxr3_dispose (video_decoder_t *this_gen) {
+ free (this_gen);
+}
+
video_decoder_t *init_video_decoder_plugin (int iface_version,
xine_t *xine)
{
@@ -767,7 +771,7 @@ video_decoder_t *init_video_decoder_plugin (int iface_version,
char *tmpstr;
int dashpos;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf( "dxr3: plugin doesn't support plugin API version %d.\n"
"dxr3: this means there's a version mismatch between xine and this\n"
"dxr3: decoder plugin. Installing current plugins should help.\n",
@@ -803,6 +807,7 @@ video_decoder_t *init_video_decoder_plugin (int iface_version,
this->video_decoder.get_identifier = dxr3_get_id;
this->video_decoder.flush = dxr3_flush;
this->video_decoder.reset = dxr3_reset;
+ this->video_decoder.dispose = dxr3_dispose;
this->video_decoder.priority = cfg->register_num(cfg,
"dxr3.decoder_priority", 10, "Dxr3: video decoder priority", NULL, NULL, NULL);
@@ -1161,6 +1166,14 @@ static char *spudec_get_id(void)
return "dxr3-spudec";
}
+static void spudec_dispose (spu_decoder_t *this_gen) {
+ spudec_decoder_t *this = (spudec_decoder_t *) this_gen;
+
+ xine_remove_event_listener (this->xine, spudec_event_listener);
+
+ free (this);
+}
+
spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine)
{
spudec_decoder_t *this;
@@ -1168,7 +1181,7 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine)
char *tmpstr;
int dashpos;
- if (iface_version != 5) {
+ if (iface_version != 6) {
printf( "dxr3: plugin doesn't support plugin API version %d.\n"
"dxr3: this means there's a version mismatch between xine and this "
"dxr3: decoder plugin.\nInstalling current plugins should help.\n",
@@ -1205,6 +1218,7 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine)
this->spu_decoder.reset = spudec_reset;
this->spu_decoder.close = spudec_close;
this->spu_decoder.get_identifier = spudec_get_id;
+ this->spu_decoder.dispose = spudec_dispose;
this->spu_decoder.priority = 10;
this->xine = xine;
this->menu = 0;
diff --git a/src/input/input_cda.c b/src/input/input_cda.c
index fb7defe66..f5f7e672d 100644
--- a/src/input/input_cda.c
+++ b/src/input/input_cda.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_cda.c,v 1.20 2002/04/23 13:30:42 esnel Exp $
+ * $Id: input_cda.c,v 1.21 2002/04/23 15:45:20 esnel Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1791,7 +1791,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
_ENTER_FUNC();
- if (iface != 5) {
+ if (iface != 6) {
LOG_MSG(xine,
_("cda input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index e0a69fd6c..db3a1ccb6 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.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_dvd.c,v 1.45 2002/04/23 13:30:42 esnel Exp $
+ * $Id: input_dvd.c,v 1.46 2002/04/23 15:45:20 esnel Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -808,7 +808,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
config_values_t *config;
int i;
- if (iface != 5) {
+ if (iface != 6) {
LOG_MSG(xine,
_("dvd input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
diff --git a/src/input/input_file.c b/src/input/input_file.c
index b0c25f7b9..3ccffcc4f 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.45 2002/04/23 14:02:41 esnel Exp $
+ * $Id: input_file.c,v 1.46 2002/04/23 15:45:21 esnel Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -854,7 +854,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
file_input_plugin_t *this;
config_values_t *config;
- if (iface != 5) {
+ if (iface != 6) {
LOG_MSG(xine,
_("file input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 8cf804ad6..96a41290d 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -668,7 +668,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
http_input_plugin_t *this;
config_values_t *config;
- if (iface != 5) {
+ if (iface != 6) {
xine_log (xine, XINE_LOG_PLUGIN,
_("http input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index a4888d4cb..c06465b6a 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -318,7 +318,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
mms_input_plugin_t *this;
config_values_t *config;
- if (iface != 5) {
+ if (iface != 6) {
printf ("mms input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
"This means there's a version mismatch between xine and this input"
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 2e986b82d..aef84a1da 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -337,7 +337,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
net_input_plugin_t *this;
config_values_t *config;
- if (iface != 5) {
+ if (iface != 6) {
LOG_MSG(xine,
_("net input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index a3b753e93..dd514f576 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.23 2002/04/23 13:30:43 esnel Exp $
+ * $Id: input_plugin.h,v 1.24 2002/04/23 15:45:21 esnel Exp $
*/
#ifndef HAVE_INPUT_PLUGIN_H
@@ -33,7 +33,7 @@ extern "C" {
#include "buffer.h"
#include "configfile.h"
-#define INPUT_PLUGIN_IFACE_VERSION 5
+#define INPUT_PLUGIN_IFACE_VERSION 6
#define MAX_MRL_ENTRIES 255
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index ad73e5e1d..0501ba3bb 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -510,7 +510,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
config_values_t *config;
int bufn;
- if (iface != 5) {
+ if (iface != 6) {
LOG_MSG(xine,
_("rtp input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 37df10a64..3aad8ab62 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.23 2002/04/23 13:30:43 esnel Exp $
+ * $Id: input_stdin_fifo.c,v 1.24 2002/04/23 15:45:21 esnel Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -351,7 +351,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
stdin_input_plugin_t *this;
config_values_t *config;
- if (iface != 5) {
+ if (iface != 6) {
xine_log (xine, XINE_LOG_PLUGIN,
_("stdin/fifo input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 9cd31f7ce..197616041 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.39 2002/04/23 13:30:43 esnel Exp $
+ * $Id: input_vcd.c,v 1.40 2002/04/23 15:45:21 esnel Exp $
*
*/
@@ -1141,7 +1141,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
config_values_t *config;
int i;
- if (iface != 5) {
+ if (iface != 6) {
LOG_MSG(xine,
_("vcd input plugin doesn't support plugin API version %d.\n"
"PLUGIN DISABLED.\n"
diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c
index 70d8934ca..5db711685 100644
--- a/src/liba52/xine_decoder.c
+++ b/src/liba52/xine_decoder.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: xine_decoder.c,v 1.24 2002/04/23 13:30:43 esnel Exp $
+ * $Id: xine_decoder.c,v 1.25 2002/04/23 15:45:21 esnel Exp $
*
* stuff needed to turn liba52 into a xine decoder plugin
*/
@@ -546,7 +546,7 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) {
a52dec_decoder_t *this ;
config_values_t *cfg;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf( "liba52: plugin doesn't support plugin API version %d.\n"
"liba52: this means there's a version mismatch between xine and this "
"liba52: decoder plugin.\nInstalling current plugins should help.\n",
diff --git a/src/libdivx4/xine_decoder.c b/src/libdivx4/xine_decoder.c
index 77adf0f74..1bd18a109 100644
--- a/src/libdivx4/xine_decoder.c
+++ b/src/libdivx4/xine_decoder.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: xine_decoder.c,v 1.28 2002/04/21 03:11:04 miguelfreitas Exp $
+ * $Id: xine_decoder.c,v 1.29 2002/04/23 15:45:22 esnel Exp $
*
* xine decoder plugin using divx4
*
@@ -538,7 +538,7 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) {
decoreFunc libdecore_func = 0;
config_values_t *cfg;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf( "divx4: plugin doesn't support plugin API version %d.\n"
"divx4: this means there's a version mismatch between xine and this "
"divx4: decoder plugin.\nInstalling current plugins should help.\n",
diff --git a/src/libdts/xine_decoder.c b/src/libdts/xine_decoder.c
index a95d33cc5..175342da4 100644
--- a/src/libdts/xine_decoder.c
+++ b/src/libdts/xine_decoder.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: xine_decoder.c,v 1.19 2002/04/23 13:30:43 esnel Exp $
+ * $Id: xine_decoder.c,v 1.20 2002/04/23 15:45:22 esnel Exp $
*
* 04-09-2001 DTS passtrough (C) Joachim Koenig
* 09-12-2001 DTS passthrough inprovements (C) James Courtier-Dutton
@@ -229,7 +229,7 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) {
dts_decoder_t *this ;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf( "libdts: plugin doesn't support plugin API version %d.\n"
"libdts: this means there's a version mismatch between xine and this "
"libdts: decoder plugin.\nInstalling current plugins should help.\n",
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index 55218f8f6..c7f52006b 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/xine_decoder.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: xine_decoder.c,v 1.33 2002/04/23 13:30:43 esnel Exp $
+ * $Id: xine_decoder.c,v 1.34 2002/04/23 15:45:23 esnel Exp $
*
* xine decoder plugin using ffmpeg
*
@@ -403,7 +403,7 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) {
ff_decoder_t *this ;
static pthread_once_t once_control = PTHREAD_ONCE_INIT;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf( "ffmpeg: plugin doesn't support plugin API version %d.\n"
"ffmpeg: this means there's a version mismatch between xine and this "
"ffmpeg: decoder plugin.\nInstalling current plugins should help.\n",
diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c
index 0c4e25159..ca4953ef1 100644
--- a/src/liblpcm/xine_decoder.c
+++ b/src/liblpcm/xine_decoder.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: xine_decoder.c,v 1.22 2002/04/23 13:30:43 esnel Exp $
+ * $Id: xine_decoder.c,v 1.23 2002/04/23 15:45:24 esnel Exp $
*
* 31-8-2001 Added LPCM rate sensing.
* (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -157,7 +157,7 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) {
lpcm_decoder_t *this ;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf( "liblpcm: plugin doesn't support plugin API version %d.\n"
"liblpcm: this means there's a version mismatch between xine and this "
"liblpcm: decoder plugin.\nInstalling current plugins should help.\n",
diff --git a/src/libmad/xine_decoder.c b/src/libmad/xine_decoder.c
index f7578e800..d561e5125 100644
--- a/src/libmad/xine_decoder.c
+++ b/src/libmad/xine_decoder.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: xine_decoder.c,v 1.18 2002/04/23 13:30:43 esnel Exp $
+ * $Id: xine_decoder.c,v 1.19 2002/04/23 15:45:24 esnel Exp $
*
* stuff needed to turn libmad into a xine decoder plugin
*/
@@ -279,7 +279,7 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) {
mad_decoder_t *this ;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf( "libmad: plugin doesn't support plugin API version %d.\n"
"libmad: this means there's a version mismatch between xine and this "
"libmad: decoder plugin.\nInstalling current plugins should help.\n",
diff --git a/src/libmpeg2/xine_decoder.c b/src/libmpeg2/xine_decoder.c
index 2525b888e..a918b9b1c 100644
--- a/src/libmpeg2/xine_decoder.c
+++ b/src/libmpeg2/xine_decoder.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: xine_decoder.c,v 1.28 2002/04/23 13:30:43 esnel Exp $
+ * $Id: xine_decoder.c,v 1.29 2002/04/23 15:45:24 esnel Exp $
*
* stuff needed to turn libmpeg2 into a xine decoder plugin
*/
@@ -149,7 +149,7 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) {
mpeg2dec_decoder_t *this ;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf( "libmpeg2: plugin doesn't support plugin API version %d.\n"
"libmpeg2: this means there's a version mismatch between xine and this "
"libmpeg2: decoder plugin.\nInstalling current plugins should help.\n",
diff --git a/src/libspucc/xine_decoder.c b/src/libspucc/xine_decoder.c
index 4e9e4c17e..a0623dcb4 100644
--- a/src/libspucc/xine_decoder.c
+++ b/src/libspucc/xine_decoder.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: xine_decoder.c,v 1.8 2002/04/23 13:30:43 esnel Exp $
+ * $Id: xine_decoder.c,v 1.9 2002/04/23 15:45:24 esnel Exp $
*
* closed caption spu decoder. receive data by events.
*
@@ -376,7 +376,7 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) {
spucc_decoder_t *this ;
- if (iface_version != 5) {
+ if (iface_version != 6) {
printf("libspucc: doesn't support plugin api version %d.\n"
"libspucc: This means there is a version mismatch between xine and\n"
"libspucc: this plugin.\n", iface_version);
diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c
index 7f937d4d9..fbeb468f6 100644
--- a/src/libspudec/xine_decoder.c
+++ b/src/libspudec/xine_decoder.c
@@ -19,7 +19,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: xine_decoder.c,v 1.61 2002/04/23 13:30:44 esnel Exp $
+ * $Id: xine_decoder.c,v 1.62 2002/04/23 15:45:24 esnel Exp $
*
* stuff needed to turn libspu into a xine decoder plugin
*/
@@ -280,7 +280,7 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) {
spudec_decoder_t *this ;
- if (iface_version != 5) {
+ if (iface_version != 6) {
printf("libspudec: Doesn't support plugin API version %d.\n"
"libspudec: This means there is a version mismatch between XINE and\n"
"libspudec: this plugin.\n", iface_version);
diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c
index db3d427cd..e461468f4 100644
--- a/src/libsputext/xine_decoder.c
+++ b/src/libsputext/xine_decoder.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: xine_decoder.c,v 1.20 2002/04/23 13:30:44 esnel Exp $
+ * $Id: xine_decoder.c,v 1.21 2002/04/23 15:45:25 esnel Exp $
*
* code based on mplayer module:
*
@@ -1005,7 +1005,7 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) {
sputext_decoder_t *this ;
- if (iface_version != 5) {
+ if (iface_version != 6) {
printf("libsputext: doesn't support plugin api version %d.\n"
"libsputext: This means there is a version mismatch between xine and\n"
"libsputext: this plugin.\n", iface_version);
diff --git a/src/libvorbis/xine_decoder.c b/src/libvorbis/xine_decoder.c
index 643e0695a..ba4f862b8 100644
--- a/src/libvorbis/xine_decoder.c
+++ b/src/libvorbis/xine_decoder.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: xine_decoder.c,v 1.10 2002/04/23 13:30:44 esnel Exp $
+ * $Id: xine_decoder.c,v 1.11 2002/04/23 15:45:25 esnel Exp $
*
* (ogg/)vorbis audio decoder plugin (libvorbis wrapper) for xine
*/
@@ -243,7 +243,7 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) {
vorbis_decoder_t *this ;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf( "libvorbis: plugin doesn't support plugin API version %d.\n"
"libvorbis: this means there's a version mismatch between xine and this "
"libvorbis: decoder plugin.\nInstalling current plugins should help.\n",
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index d10b9c574..9e320c723 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.74 2002/04/23 13:30:44 esnel Exp $
+ * $Id: w32codec.c,v 1.75 2002/04/23 15:45:25 esnel Exp $
*
* routines for using w32 codecs
* DirectShow support by Miguel Freitas (Nov/2001)
@@ -1324,7 +1324,7 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) {
w32v_decoder_t *this ;
config_values_t *cfg;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf( "w32codec: plugin doesn't support plugin API version %d.\n"
"w32codec: this means there's a version mismatch between xine and this "
"w32codec: decoder plugin.\nInstalling current input plugins should help.\n",
@@ -1370,7 +1370,7 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) {
w32a_decoder_t *this ;
config_values_t *cfg;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf( "w32codec: plugin doesn't support plugin API version %d.\n"
"w32codec: this means there's a version mismatch between xine and this "
"w32codec: decoder plugin.\nInstalling current input plugins should help.\n",
diff --git a/src/libxvid/xine_decoder.c b/src/libxvid/xine_decoder.c
index cb5672ba4..2fe2cde70 100644
--- a/src/libxvid/xine_decoder.c
+++ b/src/libxvid/xine_decoder.c
@@ -228,11 +228,15 @@ static char *xvid_get_id(void) {
return "XviD video decoder";
}
+static void xvid_dispose (video_decoder_t *this_gen) {
+ free (this_gen);
+}
+
video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) {
xvid_decoder_t *this;
XVID_INIT_PARAM xinit;
- if (iface_version != 6) {
+ if (iface_version != 7) {
printf ("xvid: plugin doesn't support plugin API version %d.\n"
"xvid: this means there's a version mismatch between xine and this\n"
"xvid: decoder plugin. Installing current plugins should help.\n",
@@ -260,6 +264,7 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) {
this->video_decoder.flush = xvid_flush;
this->video_decoder.close = xvid_close_plugin;
this->video_decoder.get_identifier = xvid_get_id;
+ this->video_decoder.dispose = xvid_dispose;
this->video_decoder.priority = 6;
this->frame_size = 0;
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 47d3b63b3..4b95ca6cc 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.74 2002/04/23 13:52:22 esnel Exp $
+ * $Id: load_plugins.c,v 1.75 2002/04/23 15:45:26 esnel Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -539,7 +539,7 @@ void load_decoder_plugins (xine_t *this,
spu_decoder_t *sdp;
int streamtype;
- sdp = (spu_decoder_t *) initplug(5, this);
+ sdp = (spu_decoder_t *) initplug(6, this);
if (sdp) {
int *used = (int *)xine_xmalloc (sizeof (int));
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index 423528fa6..8d65a820c 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.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: xine_internal.h,v 1.78 2002/04/23 13:30:44 esnel Exp $
+ * $Id: xine_internal.h,v 1.79 2002/04/23 15:45:26 esnel Exp $
*
*/
@@ -55,7 +55,7 @@ extern "C" {
#define INPUT_PLUGIN_MAX 50
#define DEMUXER_PLUGIN_MAX 50
#define DECODER_PLUGIN_MAX 256
-#define DECODER_PLUGIN_IFACE_VERSION 6
+#define DECODER_PLUGIN_IFACE_VERSION 7
#define AUDIO_OUT_PLUGIN_MAX 50
#define VIDEO_OUT_PLUGIN_MAX 50
#define XINE_MAX_EVENT_LISTENERS 50
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 11:38:44 +0000