From 90b866329e8962a3f1f03dc8172cf75ccc9d2b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 10:49:51 +0100 Subject: Replace get_identifier/get_description functions with strings. This is the start of a new experimental branch, with the first objective being the replacement of the get_description and get_identifier functions with direct-access strings. The reason for this change is to reduce code size and time of execution. By replacing the functions with direct-access strings there is one less call to be done in those cases where the description has to be fetched. The solution is not yet definitive though, there are a couple of problems to take care of: - the use of N_() still makes it easy to internationalise the strings, but it requires for the string to be found on libxine2 catalog, which is not exactly a nice solution for external plugins; - it would be simpler to re-use the id field in plugin_info_t, and then move description there; it should reduce memory usage for the class structures; - I'm not really aware of any reason why get_description and get_identifier were used beside the idea of making i18n simpler. This probably would break a couple of frontends, especially if they have some internal plugins (like post-plugins), so it needs to be reviewed carefully before merging in 1.2 branch. My current goal is to get this in before 1.2 though, rather than waiting for 1.3. --- src/demuxers/demux.h | 15 ++++++++------- src/input/input_plugin.h | 18 +++++++++--------- src/xine-engine/audio_decoder.h | 15 ++++++++------- src/xine-engine/audio_out.h | 15 ++++++++------- src/xine-engine/post.h | 15 ++++++++------- src/xine-engine/spu_decoder.h | 17 +++++++++-------- src/xine-engine/video_decoder.h | 17 +++++++++-------- src/xine-engine/video_out.h | 15 ++++++++------- 8 files changed, 67 insertions(+), 60 deletions(-) diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index 81907cfcf..301fe0f2b 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -53,16 +53,17 @@ struct demux_class_s { */ demux_plugin_t* (*open_plugin) (demux_class_t *this, xine_stream_t *stream, input_plugin_t *input); - /* - * return human readable (verbose = 1 line) description for this plugin + /** + * @brief short human readable identifier for this plugin class */ - const char* (*get_description) (demux_class_t *this); + const char *identifier; - /* - * return human readable identifier for this plugin + /** + * @brief human readable (verbose = 1 line) description for this plugin class + * + * The description is passed to gettext() to internationalise. */ - - const char* (*get_identifier) (demux_class_t *this); + const char *description; /* * return MIME types supported for this plugin diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index 3f59bab6c..31a4f9846 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -35,7 +35,7 @@ # include #endif -#define INPUT_PLUGIN_IFACE_VERSION 17 +#define INPUT_PLUGIN_IFACE_VERSION 18 typedef struct input_class_s input_class_t ; typedef struct input_plugin_s input_plugin_t; @@ -48,17 +48,17 @@ struct input_class_s { */ input_plugin_t* (*get_instance) (input_class_t *this, xine_stream_t *stream, const char *mrl); - /* - * return short, human readable identifier for this plugin class - * The returned string should not be malloc'd as it is not freed. + /** + * @brief short human readable identifier for this plugin class */ - const char* (*get_identifier) (input_class_t *this); + const char *identifier; - /* - * return human readable (verbose = 1 line) description for - * this plugin class + /** + * @brief human readable (verbose = 1 line) description for this plugin class + * + * The description is passed to gettext() to internationalise. */ - const char* (*get_description) (input_class_t *this); + const char *description; /* * ls function, optional: may be NULL diff --git a/src/xine-engine/audio_decoder.h b/src/xine-engine/audio_decoder.h index 8f75ba242..7ad46e2f8 100644 --- a/src/xine-engine/audio_decoder.h +++ b/src/xine-engine/audio_decoder.h @@ -47,16 +47,17 @@ struct audio_decoder_class_s { */ audio_decoder_t* (*open_plugin) (audio_decoder_class_t *this, xine_stream_t *stream); - /* - * return short, human readable identifier for this plugin class + /** + * @brief short human readable identifier for this plugin class */ - char* (*get_identifier) (audio_decoder_class_t *this); + const char *identifier; - /* - * return human readable (verbose = 1 line) description for - * this plugin class + /** + * @brief human readable (verbose = 1 line) description for this plugin class + * + * The description is passed to gettext() to internationalise. */ - char* (*get_description) (audio_decoder_class_t *this); + const char *description; /* * free all class-related resources diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h index 6ead6505e..415c47cc7 100644 --- a/src/xine-engine/audio_out.h +++ b/src/xine-engine/audio_out.h @@ -237,16 +237,17 @@ struct audio_driver_class_s { */ ao_driver_t* (*open_plugin) (audio_driver_class_t *, const void *data); - /* - * return short, human readable identifier for this plugin class + /** + * @brief short human readable identifier for this plugin class */ - char* (*get_identifier) (audio_driver_class_t *); + const char *identifier; - /* - * return human readable (verbose = 1 line) description for - * this plugin class + /** + * @brief human readable (verbose = 1 line) description for this plugin class + * + * The description is passed to gettext() to internationalise. */ - char* (*get_description) (audio_driver_class_t *); + const char *description; /* * free all class-related resources diff --git a/src/xine-engine/post.h b/src/xine-engine/post.h index 6186f31e0..006daa20c 100644 --- a/src/xine-engine/post.h +++ b/src/xine-engine/post.h @@ -54,16 +54,17 @@ struct post_class_s { xine_audio_port_t **audio_target, xine_video_port_t **video_target); - /* - * return short, human readable identifier for this plugin class + /** + * @brief short human readable identifier for this plugin class */ - char* (*get_identifier) (post_class_t *this); + const char *identifier; - /* - * return human readable (verbose = 1 line) description for - * this plugin class + /** + * @brief human readable (verbose = 1 line) description for this plugin class + * + * The description is passed to gettext() to internationalise. */ - char* (*get_description) (post_class_t *this); + const char *description; /* * free all class-related resources diff --git a/src/xine-engine/spu_decoder.h b/src/xine-engine/spu_decoder.h index 66ab5e54a..7acd8618d 100644 --- a/src/xine-engine/spu_decoder.h +++ b/src/xine-engine/spu_decoder.h @@ -48,17 +48,18 @@ struct spu_decoder_class_s { */ spu_decoder_t* (*open_plugin) (spu_decoder_class_t *this, xine_stream_t *stream); - /* - * return short, human readable identifier for this plugin class + /** + * @brief short human readable identifier for this plugin class */ - char* (*get_identifier) (spu_decoder_class_t *this); + const char *identifier; - /* - * return human readable (verbose = 1 line) description for - * this plugin class + /** + * @brief human readable (verbose = 1 line) description for this plugin class + * + * The description is passed to gettext() to internationalise. */ - char* (*get_description) (spu_decoder_class_t *this); - + const char *description; + /* * free all class-related resources */ diff --git a/src/xine-engine/video_decoder.h b/src/xine-engine/video_decoder.h index 7b13159a3..7dfd10a14 100644 --- a/src/xine-engine/video_decoder.h +++ b/src/xine-engine/video_decoder.h @@ -47,17 +47,18 @@ struct video_decoder_class_s { * open a new instance of this plugin class */ video_decoder_t* (*open_plugin) (video_decoder_class_t *this, xine_stream_t *stream); - - /* - * return short, human readable identifier for this plugin class + + /** + * @brief short human readable identifier for this plugin class */ - char* (*get_identifier) (video_decoder_class_t *this); + const char *identifier; - /* - * return human readable (verbose = 1 line) description for - * this plugin class + /** + * @brief human readable (verbose = 1 line) description for this plugin class + * + * The description is passed to gettext() to internationalise. */ - char* (*get_description) (video_decoder_class_t *this); + const char *description; /* * free all class-related resources diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index db99334eb..161fbd899 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -369,16 +369,17 @@ struct video_driver_class_s { */ vo_driver_t* (*open_plugin) (video_driver_class_t *self, const void *visual); - /* - * return short, human readable identifier for this plugin class + /** + * @brief short human readable identifier for this plugin class */ - char* (*get_identifier) (video_driver_class_t *self); + const char *identifier; - /* - * return human readable (verbose = 1 line) description for - * this plugin class + /** + * @brief human readable (verbose = 1 line) description for this plugin class + * + * The description is passed to gettext() to internationalise. */ - char* (*get_description) (video_driver_class_t *self); + const char *description; /* * free all class-related resources -- cgit v1.2.3 From 60e025ce15431f04955502084bc54c18d69c7d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 10:50:12 +0100 Subject: Update the code not to use the get_* functions that were removed. --- src/xine-engine/load_plugins.c | 2 +- src/xine-engine/xine.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 19a8b4e05..1c59099a5 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -2299,7 +2299,7 @@ const char *const *xine_list_post_plugins_typed(xine_t *xine, uint32_t type) { else \ return NULL; \ } \ - return ic->get_description(ic); \ + return gettext(ic->description); \ } \ } \ return NULL; \ diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 77430a053..abd9a932c 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -862,11 +862,11 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { int res; xine_log (stream->xine, XINE_LOG_MSG, _("xine: found input plugin : %s\n"), - stream->input_plugin->input_class->get_description(stream->input_plugin->input_class)); + gettext(stream->input_plugin->input_class->description)); if (stream->input_plugin->input_class->eject_media) stream->eject_class = stream->input_plugin->input_class; _x_meta_info_set_utf8(stream, XINE_META_INFO_INPUT_PLUGIN, - (stream->input_plugin->input_class->get_identifier (stream->input_plugin->input_class))); + stream->input_plugin->input_class->identifier); res = (stream->input_plugin->open) (stream->input_plugin); switch(res) { @@ -929,7 +929,7 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { } _x_meta_info_set_utf8(stream, XINE_META_INFO_SYSTEMLAYER, - (stream->demux_plugin->demux_class->get_identifier(stream->demux_plugin->demux_class))); + stream->demux_plugin->demux_class->identifier); free(demux_name); } else { xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n")); @@ -1004,7 +1004,7 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { lprintf ("demux and input plugin found\n"); _x_meta_info_set_utf8(stream, XINE_META_INFO_SYSTEMLAYER, - (stream->demux_plugin->demux_class->get_identifier(stream->demux_plugin->demux_class))); + stream->demux_plugin->demux_class->identifier); free(demux_name); } else { xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n")); @@ -1210,11 +1210,11 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { lprintf ("demux and input plugin found\n"); _x_meta_info_set_utf8(stream, XINE_META_INFO_SYSTEMLAYER, - (stream->demux_plugin->demux_class->get_identifier(stream->demux_plugin->demux_class))); + stream->demux_plugin->demux_class->identifier); } xine_log (stream->xine, XINE_LOG_MSG, _("xine: found demuxer plugin: %s\n"), - stream->demux_plugin->demux_class->get_description(stream->demux_plugin->demux_class)); + gettext(stream->demux_plugin->demux_class->description)); _x_extra_info_reset( stream->current_extra_info ); _x_extra_info_reset( stream->video_decoder_extra_info ); -- cgit v1.2.3 From 051c26d8e93ce4eacf071c068b32fe9c06b3739d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 10:58:08 +0100 Subject: Leave to the plugin the call to gettext exactly as before. This way external plugins can use their own gettext catalog for i18n. --- src/audio_out/audio_none_out.c | 12 ++---------- src/audio_out/audio_pulse_out.c | 12 ++---------- src/xine-engine/load_plugins.c | 2 +- src/xine-engine/xine.c | 4 ++-- 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c index a815d645a..f4c9d83c1 100644 --- a/src/audio_out/audio_none_out.c +++ b/src/audio_out/audio_none_out.c @@ -215,14 +215,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, * class functions */ -static char* get_identifier (audio_driver_class_t *this_gen) { - return "none"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine dummy audio output plugin"); -} - static void dispose_class (audio_driver_class_t *this_gen) { none_class_t *this = (none_class_t *) this_gen; @@ -241,8 +233,8 @@ static void *init_class (xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "none"; + this->driver_class.description = N_("xine dummy audio output plugin"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c index 26d121bf6..a853ee58a 100644 --- a/src/audio_out/audio_pulse_out.c +++ b/src/audio_out/audio_pulse_out.c @@ -574,14 +574,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da * class functions */ -static char* get_identifier (audio_driver_class_t *this_gen) { - return "pulseaudio"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine audio output plugin using pulseaudio sound server"); -} - static void dispose_class (audio_driver_class_t *this_gen) { pulse_class_t *this = (pulse_class_t *) this_gen; @@ -606,9 +598,9 @@ static void *init_class (xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; this->driver_class.dispose = dispose_class; + this->driver_class.identifier = "pulseaudio"; + this->driver_class.description = _("xine audio output plugin using pulseaudio sound server"); this->xine = xine; diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 1c59099a5..22d199295 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -2299,7 +2299,7 @@ const char *const *xine_list_post_plugins_typed(xine_t *xine, uint32_t type) { else \ return NULL; \ } \ - return gettext(ic->description); \ + return ic->description; \ } \ } \ return NULL; \ diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index abd9a932c..eb5d624e2 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -862,7 +862,7 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { int res; xine_log (stream->xine, XINE_LOG_MSG, _("xine: found input plugin : %s\n"), - gettext(stream->input_plugin->input_class->description)); + stream->input_plugin->input_class->description); if (stream->input_plugin->input_class->eject_media) stream->eject_class = stream->input_plugin->input_class; _x_meta_info_set_utf8(stream, XINE_META_INFO_INPUT_PLUGIN, @@ -1214,7 +1214,7 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { } xine_log (stream->xine, XINE_LOG_MSG, _("xine: found demuxer plugin: %s\n"), - gettext(stream->demux_plugin->demux_class->description)); + stream->demux_plugin->demux_class->description); _x_extra_info_reset( stream->current_extra_info ); _x_extra_info_reset( stream->video_decoder_extra_info ); -- cgit v1.2.3 From 6965b6d4998a38ddd8bc65c755a2668d51c52451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 11:07:18 +0100 Subject: Update to the new identifier/description interface and call _(). --- src/audio_out/audio_fusionsound_out.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c index 92eadc6cf..2af4a963b 100644 --- a/src/audio_out/audio_fusionsound_out.c +++ b/src/audio_out/audio_fusionsound_out.c @@ -434,14 +434,6 @@ static ao_driver_t* open_plugin(audio_driver_class_t *ao_class, * class functions */ -static char* get_identifier(audio_driver_class_t *ao_class) { - return "FusionSound"; -} - -static char* get_description(audio_driver_class_t *ao_class) { - return "xine FusionSound audio output plugin"; -} - static void dispose_class(audio_driver_class_t *ao_class) { free (ao_class); } @@ -468,8 +460,8 @@ static void* init_class(xine_t *xine, void *data) { } class->ao_class.open_plugin = open_plugin; - class->ao_class.get_identifier = get_identifier; - class->ao_class.get_description = get_description; + class->ao_class.identifier = "FunsionSound"; + class->ao_class.description = _("xine FusionSound audio output plugin"); class->ao_class.dispose = dispose_class; class->xine = xine; -- cgit v1.2.3 From 3a4daf90fdd45ed0e0c896ee87d7dae6c8a02683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 11:48:44 +0100 Subject: Update all audio output plugins to the new identifier/description interface. --- src/audio_out/audio_alsa_out.c | 12 ++---------- src/audio_out/audio_coreaudio_out.c | 12 ++---------- src/audio_out/audio_directx2_out.c | 14 ++------------ src/audio_out/audio_directx_out.c | 12 ++---------- src/audio_out/audio_esd_out.c | 12 ++---------- src/audio_out/audio_file_out.c | 12 ++---------- src/audio_out/audio_jack_out.c | 12 ++---------- src/audio_out/audio_oss_out.c | 12 ++---------- src/audio_out/audio_sun_out.c | 12 ++---------- 9 files changed, 18 insertions(+), 92 deletions(-) diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 4ce2b1be3..472863ac1 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -1663,14 +1663,6 @@ static void alsa_speaker_arrangement_cb (void *user_data, * class functions */ -static char* get_identifier (audio_driver_class_t *this_gen) { - return "alsa"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine audio output plugin using alsa-compliant audio devices/drivers"); -} - static void dispose_class (audio_driver_class_t *this_gen) { alsa_class_t *this = (alsa_class_t *) this_gen; @@ -1687,8 +1679,8 @@ static void *init_class (xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "alsa"; + this->driver_class.description = _("xine audio output plugin using alsa-compliant audio devices/drivers"); this->driver_class.dispose = dispose_class; /* this->config = xine->config; */ diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c index eecab8f95..33c009511 100644 --- a/src/audio_out/audio_coreaudio_out.c +++ b/src/audio_out/audio_coreaudio_out.c @@ -561,14 +561,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, * class functions */ -static char* get_identifier (audio_driver_class_t *this_gen) { - return "coreaudio"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine output plugin for Coreaudio/Mac OS X"); -} - static void dispose_class (audio_driver_class_t *this_gen) { coreaudio_class_t *this = (coreaudio_class_t *) this_gen; @@ -587,8 +579,8 @@ static void *init_class (xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "coreaudio"; + this->driver_class.description = _("xine output plugin for Coreaudio/Mac OS X"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index d9688b647..d35fb310c 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.c @@ -989,16 +989,6 @@ static ao_driver_t *open_plugin(audio_driver_class_t *class_gen, const void *dat } -static char* get_identifier(audio_driver_class_t *this_gen) { - return "directx2"; -} - - -static char *get_description(audio_driver_class_t *this_gen) { - return _("second xine audio output plugin using directx"); -} - - static void dispose_class(audio_driver_class_t *this_gen) { free(this_gen); } @@ -1014,8 +1004,8 @@ static void *init_class(xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "directx2"; + this->driver_class.description = _("second xine audio output plugin using directx"); this->driver_class.dispose = dispose_class; this->xine = xine; diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index 77e3e15b9..496ef545a 100644 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -819,14 +819,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da return ( ao_driver_t * ) ao_directx; } -static char* get_identifier (audio_driver_class_t *this_gen) { - return "DirectX"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine audio output plugin for win32 using directx"); -} - static void dispose_class (audio_driver_class_t *this_gen) { audiox_class_t *audiox = (audiox_class_t *) this_gen; @@ -846,8 +838,8 @@ static void *init_class (xine_t *xine, void *data) { return NULL; audiox->driver_class.open_plugin = open_plugin; - audiox->driver_class.get_identifier = get_identifier; - audiox->driver_class.get_description = get_description; + audiox->driver_class.identifier = "DirectX"; + audiox->driver_class.description = _("xine audio output plugin for win32 using directx"); audiox->driver_class.dispose = dispose_class; audiox->xine = xine; diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c index 4b209bea1..b7b6a2baa 100644 --- a/src/audio_out/audio_esd_out.c +++ b/src/audio_out/audio_esd_out.c @@ -564,14 +564,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, * class functions */ -static char* get_identifier (audio_driver_class_t *this_gen) { - return "esd"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine audio output plugin using esound"); -} - static void dispose_class (audio_driver_class_t *this_gen) { esd_class_t *this = (esd_class_t *) this_gen; @@ -588,8 +580,8 @@ static void *init_class (xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "esd"; + this->driver_class.description = _("xine audio output plugin using esound"); this->driver_class.dispose = dispose_class; this->xine = xine; diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c index 225d64d0e..5473dcaa8 100644 --- a/src/audio_out/audio_file_out.c +++ b/src/audio_out/audio_file_out.c @@ -354,14 +354,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, * class functions */ -static char* get_identifier (audio_driver_class_t *this_gen) { - return "file"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine file audio output plugin"); -} - static void dispose_class (audio_driver_class_t *this_gen) { file_class_t *this = (file_class_t *) this_gen; @@ -380,8 +372,8 @@ static void *init_class (xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "file"; + this->driver_class.description = _("xine file audio output plugin"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c index 1bc070527..214e8d4fa 100644 --- a/src/audio_out/audio_jack_out.c +++ b/src/audio_out/audio_jack_out.c @@ -398,14 +398,6 @@ static ao_driver_t *open_jack_plugin (audio_driver_class_t *class_gen, * class functions */ -static char* get_identifier (audio_driver_class_t *this_gen) { - return "jack"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine output plugin for JACK Audio Connection Kit"); -} - static void dispose_class (audio_driver_class_t *this_gen) { jack_class_t *this = (jack_class_t *) this_gen; @@ -419,8 +411,8 @@ static void *init_class (xine_t *xine, void *data) { this = (jack_class_t *) xine_xmalloc (sizeof (jack_class_t)); this->driver_class.open_plugin = open_jack_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "jack"; + this->driver_class.description = _("xine output plugin for JACK Audio Connection Kit"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index a6e0fe494..3de1c708b 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.c @@ -1146,14 +1146,6 @@ static void oss_speaker_arrangement_cb (void *user_data, * class functions */ -static char* get_identifier (audio_driver_class_t *this_gen) { - return "oss"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine audio output plugin using oss-compliant audio devices/drivers"); -} - static void dispose_class (audio_driver_class_t *this_gen) { oss_class_t *this = (oss_class_t *) this_gen; @@ -1170,8 +1162,8 @@ static void *init_class (xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "oss"; + this->driver_class.description = _("xine audio output plugin using oss-compliant audio devices/drivers"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c index 838230dbe..d2ca3bf6f 100644 --- a/src/audio_out/audio_sun_out.c +++ b/src/audio_out/audio_sun_out.c @@ -1012,14 +1012,6 @@ static ao_driver_t *ao_sun_open_plugin (audio_driver_class_t *class_gen, const v * class functions */ -static char* ao_sun_get_identifier (audio_driver_class_t *this_gen) { - return "sun"; -} - -static char* ao_sun_get_description (audio_driver_class_t *this_gen) { - return _("xine audio output plugin using sun-compliant audio devices/drivers"); -} - static void ao_sun_dispose_class (audio_driver_class_t *this_gen) { sun_class_t *this = (sun_class_t *) this_gen; @@ -1035,8 +1027,8 @@ static void *ao_sun_init_class (xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = ao_sun_open_plugin; - this->driver_class.get_identifier = ao_sun_get_identifier; - this->driver_class.get_description = ao_sun_get_description; + this->driver_class.identifier = "sun"; + this->driver_class.description = _("xine audio output plugin using sun-compliant audio devices/drivers"); this->driver_class.dispose = ao_sun_dispose_class; this->xine = xine; -- cgit v1.2.3 From f8b45084853fd3f1c40ad611e5f1649851eb9d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 11:58:43 +0100 Subject: Update to the new identifier/description interface and call _(). --- src/video_out/video_out_pgx32.c | 14 ++------------ src/video_out/video_out_pgx64.c | 14 ++------------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index d903efc89..d8504e711 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.c @@ -855,16 +855,6 @@ static vo_driver_t *pgx32_init_driver(video_driver_class_t *class_gen, const voi return (vo_driver_t *)this; } -static char *pgx32_get_identifier(video_driver_class_t *class_gen) -{ - return "pgx32"; -} - -static char *pgx32_get_description(video_driver_class_t *class_gen) -{ - return "xine video output plugin for Sun PGX32 framebuffers"; -} - static void *pgx32_init_class(xine_t *xine, void *visual_gen) { pgx32_driver_class_t *class; @@ -877,8 +867,8 @@ static void *pgx32_init_class(xine_t *xine, void *visual_gen) DGA_INIT(); class->vo_driver_class.open_plugin = pgx32_init_driver; - class->vo_driver_class.get_identifier = pgx32_get_identifier; - class->vo_driver_class.get_description = pgx32_get_description; + class->vo_driver_class.identifier = "pgx32"; + class->vo_driver_class.description = _("xine video output plugin for Sun PGX32 framebuffers"); class->vo_driver_class.dispose = pgx32_dispose_class; class->xine = xine; diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index 4abb794d7..a706872cd 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -1479,16 +1479,6 @@ static vo_driver_t *pgx64_init_driver(video_driver_class_t *class_gen, const voi return (vo_driver_t *)this; } -static char *pgx64_get_identifier(video_driver_class_t *class_gen) -{ - return "pgx64"; -} - -static char *pgx64_get_description(video_driver_class_t *class_gen) -{ - return "xine video output plugin for Sun XVR100/PGX64/PGX24 framebuffers"; -} - static void *pgx64_init_class(xine_t *xine, void *visual_gen) { pgx64_driver_class_t *class; @@ -1501,8 +1491,8 @@ static void *pgx64_init_class(xine_t *xine, void *visual_gen) DGA_INIT(); class->vo_driver_class.open_plugin = pgx64_init_driver; - class->vo_driver_class.get_identifier = pgx64_get_identifier; - class->vo_driver_class.get_description = pgx64_get_description; + class->vo_driver_class.identifier = "pgx64"; + class->vo_driver_class.description = _("xine video output plugin for Sun XVR100/PGX64/PGX24 framebuffers"); class->vo_driver_class.dispose = pgx64_dispose_class; class->xine = xine; -- cgit v1.2.3 From bbb97d24340fb6b780b55f54da0f0d3b94956bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 12:01:59 +0100 Subject: Update all video output plugins to the new identifier/description interface. --- src/video_out/video_out_aa.c | 12 ++---------- src/video_out/video_out_caca.c | 12 ++---------- src/video_out/video_out_directfb.c | 24 ++++-------------------- src/video_out/video_out_directx.c | 12 ++---------- src/video_out/video_out_fb.c | 14 ++------------ src/video_out/video_out_macosx.m | 11 ++--------- src/video_out/video_out_none.c | 12 ++---------- src/video_out/video_out_opengl.c | 12 ++---------- src/video_out/video_out_sdl.c | 12 ++---------- src/video_out/video_out_stk.c | 14 ++------------ src/video_out/video_out_syncfb.c | 12 ++---------- src/video_out/video_out_vidix.c | 24 ++++-------------------- src/video_out/video_out_xcbshm.c | 12 ++---------- src/video_out/video_out_xcbxv.c | 12 ++---------- src/video_out/video_out_xshm.c | 12 ++---------- src/video_out/video_out_xv.c | 12 ++---------- src/video_out/video_out_xvmc.c | 12 ++---------- src/video_out/video_out_xxmc.c | 12 ++---------- 18 files changed, 40 insertions(+), 203 deletions(-) diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index 012db9665..74d19b6f6 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -300,14 +300,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi return &this->vo_driver; } -static char* get_identifier (video_driver_class_t *this_gen) { - return "AA"; -} - -static char* get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the ascii-art library"); -} - static void dispose_class (video_driver_class_t *this_gen) { aa_class_t *this = (aa_class_t *) this_gen; free(this); @@ -319,8 +311,8 @@ static void *init_class (xine_t *xine, void *visual_gen) { this = (aa_class_t *) xine_xmalloc(sizeof(aa_class_t)); this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "AA"; + this->driver_class.description = _("xine video output plugin using the ascii-art library"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index 866eabcd8..b7ea21ba1 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -307,14 +307,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi return &this->vo_driver; } -static char* get_identifier (video_driver_class_t *this_gen) { - return "CACA"; -} - -static char* get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the Color AsCii Art library"); -} - static void dispose_class (video_driver_class_t *this_gen) { caca_class_t *this = (caca_class_t *) this_gen; free(this); @@ -325,8 +317,8 @@ static void *init_class (xine_t *xine, void *visual_gen) { this = (caca_class_t *) xine_xmalloc(sizeof(caca_class_t)); this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "CACA"; + this->driver_class.description = _("xine video output plugin using the Color AsCii Art library"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index 1ab1fb8e8..fc4757680 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -1880,14 +1880,6 @@ static vo_driver_t *open_plugin_fb (video_driver_class_t *class_gen, const void return &this->vo_driver; } -static char* get_identifier_fb (video_driver_class_t *this_gen) { - return "DirectFB"; -} - -static char* get_description_fb (video_driver_class_t *this_gen) { - return _("xine video output plugin using DirectFB."); -} - static void dispose_class_fb (video_driver_class_t *this_gen) { directfb_class_t *this = (directfb_class_t *) this_gen; free (this); @@ -1910,8 +1902,8 @@ static void *init_class_fb (xine_t *xine, void *visual_gen) { this = (directfb_class_t *) xine_xmalloc (sizeof (directfb_class_t)); this->driver_class.open_plugin = open_plugin_fb; - this->driver_class.get_identifier = get_identifier_fb; - this->driver_class.get_description = get_description_fb; + this->driver_class.identifier = "DirectFB"; + this->driver_class.description = _("xine video output plugin using DirectFB."); this->driver_class.dispose = dispose_class_fb; this->xine = xine; @@ -2088,14 +2080,6 @@ static vo_driver_t *open_plugin_x11 (video_driver_class_t *class_gen, const void return &this->vo_driver; } -static char* get_identifier_x11 (video_driver_class_t *this_gen) { - return "XDirectFB"; -} - -static char* get_description_x11 (video_driver_class_t *this_gen) { - return _("xine video output plugin using DirectFB under XDirectFB."); -} - static void dispose_class_x11 (video_driver_class_t *this_gen) { directfb_class_t *this = (directfb_class_t *) this_gen; @@ -2129,8 +2113,8 @@ static void *init_class_x11 (xine_t *xine, void *visual_gen) { this = (directfb_class_t *) xine_xmalloc (sizeof (directfb_class_t)); this->driver_class.open_plugin = open_plugin_x11; - this->driver_class.get_identifier = get_identifier_x11; - this->driver_class.get_description = get_description_x11; + this->driver_class.identifier = "XDirectFB"; + this->driver_class.description = _("xine video output plugin using DirectFB under XDirectFB."); this->driver_class.dispose = dispose_class_x11; this->visual_type = XINE_VISUAL_TYPE_X11; diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 11ee709e1..9494a2194 100644 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -1228,14 +1228,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *wi } -static char* get_identifier (video_driver_class_t *this_gen) { - return "DirectX"; -} - -static char* get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin for win32 using directx"); -} - static void dispose_class (video_driver_class_t *this_gen) { directx_class_t *directx = (directx_class_t *) this_gen; @@ -1252,8 +1244,8 @@ static void *init_class (xine_t *xine, void *visual_gen) { directx = (directx_class_t *) xine_xmalloc (sizeof (directx_class_t)); directx->driver_class.open_plugin = open_plugin; - directx->driver_class.get_identifier = get_identifier; - directx->driver_class.get_description = get_description; + directx->driver_class.identifier = "DirectX"; + directx->driver_class.description = _("xine video output plugin for win32 using directx"); directx->driver_class.dispose = dispose_class; directx->xine = xine; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index 08663ae61..e061ab781 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -1046,16 +1046,6 @@ error: return 0; } -static char* fb_get_identifier(video_driver_class_t *this_gen) -{ - return "fb"; -} - -static char* fb_get_description(video_driver_class_t *this_gen) -{ - return _("Xine video output plugin using the Linux frame buffer device"); -} - static void fb_dispose_class(video_driver_class_t *this_gen) { fb_class_t *this = (fb_class_t *)this_gen; @@ -1067,8 +1057,8 @@ static void *fb_init_class(xine_t *xine, void *visual_gen) fb_class_t *this = (fb_class_t *)xine_xmalloc(sizeof(fb_class_t)); this->driver_class.open_plugin = fb_open_plugin; - this->driver_class.get_identifier = fb_get_identifier; - this->driver_class.get_description = fb_get_description; + this->driver_class.identifier = "fb"; + this->driver_class.description = _("Xine video output plugin using the Linux frame buffer device"); this->driver_class.dispose = fb_dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m index 4621d31b9..27e9814a2 100644 --- a/src/video_out/video_out_macosx.m +++ b/src/video_out/video_out_macosx.m @@ -349,13 +349,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void * /* * Class related functions. */ -static char* get_identifier (video_driver_class_t *driver_class) { - return "MacOSX"; -} - -static char* get_description (video_driver_class_t *driver_class) { - return _("xine video output plugin for Mac OS X"); -} static void dispose_class (video_driver_class_t *driver_class) { macosx_class_t *this = (macosx_class_t *) driver_class; @@ -369,8 +362,8 @@ static void *init_class (xine_t *xine, void *visual) { this = (macosx_class_t *) xine_xmalloc(sizeof(macosx_class_t)); this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "MacOSX"; + this->driver_class.description = _("xine video output plugin for Mac OS X"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index 5f2424a60..f97c5abab 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -269,14 +269,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void * /* * Class related functions. */ -static char* get_identifier (video_driver_class_t *driver_class) { - return "None"; -} - -static char* get_description (video_driver_class_t *driver_class) { - return _("xine video output plugin which displays nothing"); -} - static void dispose_class (video_driver_class_t *driver_class) { none_class_t *this = (none_class_t *) driver_class; @@ -289,8 +281,8 @@ static void *init_class (xine_t *xine, void *visual) { this = (none_class_t *) xine_xmalloc(sizeof(none_class_t)); this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "none"; + this->driver_class.description = _("xine video output plugin which displays nothing"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 54696f452..d86ef80f3 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -1955,14 +1955,6 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v * class functions */ -static char* opengl_get_identifier (video_driver_class_t *this_gen) { - return "opengl"; -} - -static char* opengl_get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the OpenGL 3D graphics API"); -} - static void opengl_dispose_class (video_driver_class_t *this_gen) { opengl_class_t *this = (opengl_class_t *) this_gen; @@ -1973,8 +1965,8 @@ static void *opengl_init_class (xine_t *xine, void *visual_gen) { opengl_class_t *this = (opengl_class_t *) xine_xmalloc (sizeof (opengl_class_t)); this->driver_class.open_plugin = opengl_open_plugin; - this->driver_class.get_identifier = opengl_get_identifier; - this->driver_class.get_description = opengl_get_description; + this->driver_class.identifier = "opengl"; + this->driver_class.description = _("xine video output plugin using the OpenGL 3D graphics API"); this->driver_class.dispose = opengl_dispose_class; this->xine = xine; diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index f4f645e8c..95c937326 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -563,14 +563,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi /** * Class Functions */ -static char* get_identifier (video_driver_class_t *this_gen) { - return "SDL"; -} - -static char* get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the Simple Direct Media Layer"); -} - static void dispose_class (video_driver_class_t *this_gen) { free(this_gen); } @@ -591,8 +583,8 @@ static void *init_class (xine_t *xine, void *visual_gen) { this = (sdl_class_t*) xine_xmalloc (sizeof (sdl_class_t)); this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "SDL"; + this->driver_class.description = _("xine video output plugin using the Simple Direct Media Layer"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index dfc4ae385..ba357cd73 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.c @@ -442,16 +442,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis /** * Class Functions */ -static char* get_identifier (video_driver_class_t *this_gen) { - //printf("video_out_stk: get_identifier()\n"); - return "stk"; -} - -static char* get_description (video_driver_class_t *this_gen) { - //printf("video_out_stk: get_description()\n"); - return _("xine video output plugin using the Libstk Surface Set-top Toolkit"); -} - static void dispose_class (video_driver_class_t *this_gen) { //printf("video_out_stk: dispose_class()\n"); free(this_gen); @@ -466,8 +456,8 @@ static void *init_class (xine_t *xine, void *visual_gen) { this = (stk_class_t *) xine_xmalloc(sizeof(stk_class_t)); this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "stk"; + this->driver_class.description = _("xine video output plugin using the Libstk Surface Set-top Toolkit"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index 86be3422e..f133d52d7 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -1050,14 +1050,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi * class functions */ -static char* get_identifier (video_driver_class_t *this_gen) { - return "SyncFB"; -} - -static char* get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the SyncFB module for Matrox G200/G400 cards"); -} - static void dispose_class (video_driver_class_t *this_gen) { syncfb_class_t *this = (syncfb_class_t *) this_gen; @@ -1096,8 +1088,8 @@ static void *init_class (xine_t *xine, void *visual_gen) { this = (syncfb_class_t *) xine_xmalloc (sizeof (syncfb_class_t)); this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "SyncFB"; + this->driver_class.description = _("xine video output plugin using the SyncFB module for Matrox G200/G400 cards"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 21e361d93..f8e004583 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -1193,22 +1193,14 @@ static vo_driver_t *vidix_open_plugin (video_driver_class_t *class_gen, const vo return &this->vo_driver; } -static char* vidix_get_identifier (video_driver_class_t *this_gen) { - return "vidix"; -} - -static char* vidix_get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using libvidix for x11"); -} - static void *vidix_init_class (xine_t *xine, void *visual_gen) { vidix_class_t *this = init_class (xine, visual_gen); if(this) { this->driver_class.open_plugin = vidix_open_plugin; - this->driver_class.get_identifier = vidix_get_identifier; - this->driver_class.get_description = vidix_get_description; + this->driver_class.identifier = "vidix"; + this->driver_class.description = _("xine video output plugin using libvidix for x11"); this->driver_class.dispose = dispose_class; } @@ -1275,22 +1267,14 @@ static vo_driver_t *vidixfb_open_plugin (video_driver_class_t *class_gen, const return &this->vo_driver; } -static char* vidixfb_get_identifier (video_driver_class_t *this_gen) { - return "vidixfb"; -} - -static char* vidixfb_get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using libvidix for linux frame buffer"); -} - static void *vidixfb_init_class (xine_t *xine, void *visual_gen) { vidix_class_t *this = init_class (xine, visual_gen); if(this) { this->driver_class.open_plugin = vidixfb_open_plugin; - this->driver_class.get_identifier = vidixfb_get_identifier; - this->driver_class.get_description = vidixfb_get_description; + this->driver_class.identifier = "vidixfb"; + this->driver_class.description = _("xine video output plugin using libvidix for linux frame buffer"); this->driver_class.dispose = dispose_class; } diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 5de8a4fd3..87b5a9b92 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -1230,14 +1230,6 @@ static vo_driver_t *xshm_open_plugin(video_driver_class_t *class_gen, const void * class functions */ -static char* xshm_get_identifier (video_driver_class_t *this_gen) { - return "XShm"; -} - -static char* xshm_get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the MIT X shared memory extension"); -} - static void xshm_dispose_class (video_driver_class_t *this_gen) { xshm_class_t *this = (xshm_class_t *) this_gen; @@ -1248,8 +1240,8 @@ static void *xshm_init_class (xine_t *xine, void *visual_gen) { xshm_class_t *this = (xshm_class_t *) xine_xmalloc (sizeof (xshm_class_t)); this->driver_class.open_plugin = xshm_open_plugin; - this->driver_class.get_identifier = xshm_get_identifier; - this->driver_class.get_description = xshm_get_description; + this->driver_class.identifier = "XShm"; + this->driver_class.description = _("xine video output plugin using the MIT X shared memory extension"); this->driver_class.dispose = xshm_dispose_class; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index dd19172cf..67890bd6d 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -1370,14 +1370,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis * class functions */ -static char* get_identifier (video_driver_class_t *this_gen) { - return "Xv"; -} - -static char* get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the MIT X video extension"); -} - static void dispose_class (video_driver_class_t *this_gen) { xv_class_t *this = (xv_class_t *) this_gen; @@ -1388,8 +1380,8 @@ static void *init_class (xine_t *xine, void *visual_gen) { xv_class_t *this = (xv_class_t *) xine_xmalloc (sizeof (xv_class_t)); this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "Xv"; + this->driver_class.description = _("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 40986899a..775211098 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -1291,14 +1291,6 @@ static vo_driver_t *xshm_open_plugin_old (video_driver_class_t *class_gen, const * class functions */ -static char* xshm_get_identifier (video_driver_class_t *this_gen) { - return "XShm"; -} - -static char* xshm_get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the MIT X shared memory extension"); -} - static void xshm_dispose_class (video_driver_class_t *this_gen) { xshm_class_t *this = (xshm_class_t *) this_gen; @@ -1309,8 +1301,8 @@ static void *xshm_init_class (xine_t *xine, void *visual_gen) { xshm_class_t *this = (xshm_class_t *) xine_xmalloc (sizeof (xshm_class_t)); this->driver_class.open_plugin = xshm_open_plugin_old; - this->driver_class.get_identifier = xshm_get_identifier; - this->driver_class.get_description = xshm_get_description; + this->driver_class.identifier = "XShm"; + this->driver_class.description = _("xine video output plugin using the MIT X shared memory extension"); this->driver_class.dispose = xshm_dispose_class; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index a082c9d19..21d4aa0c4 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -1453,14 +1453,6 @@ static vo_driver_t *open_plugin_old (video_driver_class_t *class_gen, const void * class functions */ -static char* get_identifier (video_driver_class_t *this_gen) { - return "Xv"; -} - -static char* get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the MIT X video extension"); -} - static void dispose_class (video_driver_class_t *this_gen) { xv_class_t *this = (xv_class_t *) this_gen; @@ -1471,8 +1463,8 @@ static void *init_class (xine_t *xine, void *visual_gen) { xv_class_t *this = (xv_class_t *) xine_xmalloc (sizeof (xv_class_t)); this->driver_class.open_plugin = open_plugin_old; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "Xv"; + this->driver_class.description = _("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 3ff30fa25..8dab2fb83 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.c @@ -1494,14 +1494,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi * class functions */ -static char* get_identifier (video_driver_class_t *this_gen) { - return "XvMC"; -} - -static char* get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the XvMC X video extension"); -} - static void dispose_class (video_driver_class_t *this_gen) { xvmc_class_t *this = (xvmc_class_t *) this_gen; @@ -1674,8 +1666,8 @@ static void *init_class (xine_t *xine, void *visual_gen) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "XvMC"; + this->driver_class.description = _("xine video output plugin using the XvMC X video extension"); this->driver_class.dispose = dispose_class; this->display = display; diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index d4c43ab37..89c8f58ed 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -2750,14 +2750,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi * class functions */ -static char* get_identifier (video_driver_class_t *this_gen) { - return "XxMC"; -} - -static char* get_description (video_driver_class_t *this_gen) { - return _("xine video output plugin using the MIT X video extension"); -} - static void dispose_class (video_driver_class_t *this_gen) { xxmc_class_t *this = (xxmc_class_t *) this_gen; @@ -2768,8 +2760,8 @@ static void *init_class (xine_t *xine, void *visual_gen) { xxmc_class_t *this = (xxmc_class_t *) xine_xmalloc (sizeof (xxmc_class_t)); this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "XxMC"; + this->driver_class.description = _("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; -- cgit v1.2.3 From 8837a03dc8f5127d71c2a5640bb4cd7c9fe4242c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 12:26:40 +0100 Subject: Update all input plugins to the new identifier/description interface. --- src/input/input_cdda.c | 12 ++---------- src/input/input_dvb.c | 13 ++----------- src/input/input_dvd.c | 16 ++-------------- src/input/input_file.c | 12 ++---------- src/input/input_gnome_vfs.c | 16 ++-------------- src/input/input_http.c | 12 ++---------- src/input/input_mms.c | 12 ++---------- src/input/input_net.c | 12 ++---------- src/input/input_pnm.c | 12 ++---------- src/input/input_pvr.c | 14 ++------------ src/input/input_rtp.c | 13 ++----------- src/input/input_rtsp.c | 12 ++---------- src/input/input_smb.c | 16 ++-------------- src/input/input_stdin_fifo.c | 13 ++----------- src/input/input_v4l.c | 20 ++++---------------- src/input/input_vcd.c | 13 ++----------- src/input/vcd/xineplug_inp_vcd.c | 29 ++--------------------------- 17 files changed, 36 insertions(+), 211 deletions(-) diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 621aff14a..0cd8982e1 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -2679,14 +2679,6 @@ static input_plugin_t *cdda_class_get_instance (input_class_t *cls_gen, xine_str } -static const char *cdda_class_get_identifier (input_class_t *this_gen) { - return "cdda"; -} - -static const char *cdda_class_get_description (input_class_t *this_gen) { - return _("CD Digital Audio (aka. CDDA)"); -} - static void cdda_class_dispose (input_class_t *this_gen) { cdda_input_class_t *this = (cdda_input_class_t *) this_gen; config_values_t *config = this->xine->config; @@ -2722,8 +2714,8 @@ static void *init_plugin (xine_t *xine, void *data) { config = xine->config; this->input_class.get_instance = cdda_class_get_instance; - this->input_class.get_identifier = cdda_class_get_identifier; - this->input_class.get_description = cdda_class_get_description; + this->input_class.identifier = "cdda"; + this->input_class.description = _("CD Digital Audio (aka. CDDA)"); /* this->input_class.get_dir = cdda_class_get_dir; */ this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = cdda_class_get_autoplay_list; diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index fbfc62921..1409e9c05 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -3141,15 +3141,6 @@ static input_plugin_t *dvb_class_get_instance (input_class_t *class_gen, * dvb input plugin class stuff */ -static const char *dvb_class_get_description (input_class_t *this_gen) { - return _("DVB (Digital TV) input plugin"); -} - -static const char *dvb_class_get_identifier (input_class_t *this_gen) { - return "dvb"; -} - - static void dvb_class_dispose(input_class_t * this_gen) { dvb_input_class_t *class = (dvb_input_class_t *) this_gen; @@ -3252,8 +3243,8 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->input_class.get_instance = dvb_class_get_instance; - this->input_class.get_identifier = dvb_class_get_identifier; - this->input_class.get_description = dvb_class_get_description; + this->input_class.identifier = "dvb"; + this->input_class.description = _("DVB (Digital TV) input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = dvb_class_get_autoplay_list; this->input_class.dispose = dvb_class_dispose; diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 55e975eab..e2c0277c9 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -1686,18 +1686,6 @@ static input_plugin_t *dvd_class_get_instance (input_class_t *class_gen, xine_st return &this->input_plugin; } -static const char *dvd_class_get_description (input_class_t *this_gen) { - trace_print("Called\n"); - - return "DVD Navigator"; -} - -static const char *dvd_class_get_identifier (input_class_t *this_gen) { - trace_print("Called\n"); - - return "DVD"; -} - /* FIXME: adapt to new api. */ #if 0 static xine_mrl_t **dvd_class_get_dir (input_class_t *this_gen, @@ -1770,8 +1758,8 @@ static void *init_class (xine_t *xine, void *data) { return NULL; this->input_class.get_instance = dvd_class_get_instance; - this->input_class.get_identifier = dvd_class_get_identifier; - this->input_class.get_description = dvd_class_get_description; + this->input_class.identifier = "DVD"; + this->input_class.description = _("DVD Navigator"); /* this->input_class.get_dir = dvd_class_get_dir; */ diff --git a/src/input/input_file.c b/src/input/input_file.c index 0ed4ab682..d29a1270b 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -635,14 +635,6 @@ static off_t get_file_size(char *filepathname, char *origin) { return pstat.st_size; } -static const char *file_class_get_description (input_class_t *this_gen) { - return _("file input plugin"); -} - -static const char *file_class_get_identifier (input_class_t *this_gen) { - return "file"; -} - static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, const char *filename, int *nFiles) { @@ -987,8 +979,8 @@ static void *init_plugin (xine_t *xine, void *data) { config = xine->config; this->input_class.get_instance = file_class_get_instance; - this->input_class.get_identifier = file_class_get_identifier; - this->input_class.get_description = file_class_get_description; + this->input_class.identifier = "file"; + this->input_class.description = _("file input plugin"); this->input_class.get_dir = file_class_get_dir; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = file_class_dispose; diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c index 3315a52ea..24ef652c7 100644 --- a/src/input/input_gnome_vfs.c +++ b/src/input/input_gnome_vfs.c @@ -211,18 +211,6 @@ gnomevfs_plugin_get_mrl (input_plugin_t *this_gen) return this->mrl; } -static const char -*gnomevfs_klass_get_description (input_class_t *this_gen) -{ - return _("gnome-vfs input plugin as shipped with xine"); -} - -static const char -*gnomevfs_klass_get_identifier (input_class_t *this_gen) -{ - return "gnomevfs"; -} - static int gnomevfs_plugin_get_optional_data (input_plugin_t *this_gen, void *data, int data_type) @@ -375,8 +363,8 @@ static void this->xine = xine; this->input_class.get_instance = gnomevfs_klass_get_instance; - this->input_class.get_identifier = gnomevfs_klass_get_identifier; - this->input_class.get_description = gnomevfs_klass_get_description; + this->input_class.identifier = "gnomevfs"; + this->input_class.description = _("gnome-vfs input plugin as shipped with xine"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = gnomevfs_klass_dispose; diff --git a/src/input/input_http.c b/src/input/input_http.c index 328ab523e..ffeb79bd7 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -1065,14 +1065,6 @@ static input_plugin_t *http_class_get_instance (input_class_t *cls_gen, xine_str return &this->input_plugin; } -static const char *http_class_get_description (input_class_t *this_gen) { - return _("http input plugin"); -} - -static const char *http_class_get_identifier (input_class_t *this_gen) { - return "http"; -} - static void http_class_dispose (input_class_t *this_gen) { http_input_class_t *this = (http_input_class_t *) this_gen; @@ -1094,8 +1086,8 @@ static void *init_class (xine_t *xine, void *data) { config = xine->config; this->input_class.get_instance = http_class_get_instance; - this->input_class.get_identifier = http_class_get_identifier; - this->input_class.get_description = http_class_get_description; + this->input_class.identifier = "http"; + this->input_class.description = _("http input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = http_class_dispose; diff --git a/src/input/input_mms.c b/src/input/input_mms.c index 3e4b7172c..7adf929b4 100644 --- a/src/input/input_mms.c +++ b/src/input/input_mms.c @@ -438,14 +438,6 @@ static input_plugin_t *mms_class_get_instance (input_class_t *cls_gen, xine_stre * mms input plugin class stuff */ -static const char *mms_class_get_description (input_class_t *this_gen) { - return _("mms streaming input plugin"); -} - -static const char *mms_class_get_identifier (input_class_t *this_gen) { - return "mms"; -} - static void mms_class_dispose (input_class_t *this_gen) { mms_input_class_t *this = (mms_input_class_t *) this_gen; @@ -466,8 +458,8 @@ static void *init_class (xine_t *xine, void *data) { this->ip = NULL; this->input_class.get_instance = mms_class_get_instance; - this->input_class.get_identifier = mms_class_get_identifier; - this->input_class.get_description = mms_class_get_description; + this->input_class.identifier = "mms"; + this->input_class.description = _("mms streaming input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = mms_class_dispose; diff --git a/src/input/input_net.c b/src/input/input_net.c index b3d7a5396..68cf5ab97 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -505,14 +505,6 @@ static input_plugin_t *net_class_get_instance (input_class_t *cls_gen, xine_stre * net plugin class */ -static const char *net_class_get_description (input_class_t *this_gen) { - return _("net input plugin as shipped with xine"); -} - -static const char *net_class_get_identifier (input_class_t *this_gen) { - return "TCP"; -} - static void net_class_dispose (input_class_t *this_gen) { net_input_class_t *this = (net_input_class_t *) this_gen; @@ -528,8 +520,8 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->input_class.get_instance = net_class_get_instance; - this->input_class.get_description = net_class_get_description; - this->input_class.get_identifier = net_class_get_identifier; + this->input_class.description = _("net input plugin as shipped with xine"); + this->input_class.identifier = "TCP"; this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = net_class_dispose; diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c index b49060faa..c90fadd31 100644 --- a/src/input/input_pnm.c +++ b/src/input/input_pnm.c @@ -259,14 +259,6 @@ static input_plugin_t *pnm_class_get_instance (input_class_t *cls_gen, xine_stre * pnm input plugin class stuff */ -static const char *pnm_class_get_description (input_class_t *this_gen) { - return _("pnm streaming input plugin"); -} - -static const char *pnm_class_get_identifier (input_class_t *this_gen) { - return "pnm"; -} - static void pnm_class_dispose (input_class_t *this_gen) { pnm_input_class_t *this = (pnm_input_class_t *) this_gen; @@ -282,8 +274,8 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->input_class.get_instance = pnm_class_get_instance; - this->input_class.get_identifier = pnm_class_get_identifier; - this->input_class.get_description = pnm_class_get_description; + this->input_class.identifier = "pnm"; + this->input_class.description = _("pnm streaming input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = pnm_class_dispose; diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 84b8468db..f6f7d51c9 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -1522,16 +1522,6 @@ static input_plugin_t *pvr_class_get_instance (input_class_t *cls_gen, xine_stre /* * plugin class functions */ - -static const char *pvr_class_get_description (input_class_t *this_gen) { - return _("WinTV-PVR 250/350 input plugin"); -} - -static const char *pvr_class_get_identifier (input_class_t *this_gen) { - return "pvr"; -} - - static void pvr_class_dispose (input_class_t *this_gen) { pvr_input_class_t *this = (pvr_input_class_t *) this_gen; @@ -1556,8 +1546,8 @@ static void *init_plugin (xine_t *xine, void *data) { NULL); this->input_class.get_instance = pvr_class_get_instance; - this->input_class.get_identifier = pvr_class_get_identifier; - this->input_class.get_description = pvr_class_get_description; + this->input_class.identifier = "pvr"; + this->input_class.description = _("WinTV-PVR 250/350 input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = pvr_class_dispose; diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index 1a57b7a6d..12e97bd02 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -765,15 +765,6 @@ static input_plugin_t *rtp_class_get_instance (input_class_t *cls_gen, /* * net plugin class */ - -static const char *rtp_class_get_description (input_class_t *this_gen) { - return _("RTP and UDP input plugin as shipped with xine"); -} - -static const char *rtp_class_get_identifier (input_class_t *this_gen) { - return "RTP/UDP"; -} - static void rtp_class_dispose (input_class_t *this_gen) { rtp_input_class_t *this = (rtp_input_class_t *) this_gen; @@ -790,8 +781,8 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->input_class.get_instance = rtp_class_get_instance; - this->input_class.get_description = rtp_class_get_description; - this->input_class.get_identifier = rtp_class_get_identifier; + this->input_class.description = _("RTP and UDP input plugin as shipped with xine"); + this->input_class.identifier = "RTP/UDP"; this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = rtp_class_dispose; diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c index 318659b88..266ff6f6e 100644 --- a/src/input/input_rtsp.c +++ b/src/input/input_rtsp.c @@ -280,14 +280,6 @@ static input_plugin_t *rtsp_class_get_instance (input_class_t *cls_gen, xine_str * rtsp input plugin class stuff */ -static const char *rtsp_class_get_description (input_class_t *this_gen) { - return _("rtsp streaming input plugin"); -} - -static const char *rtsp_class_get_identifier (input_class_t *this_gen) { - return "rtsp"; -} - static void rtsp_class_dispose (input_class_t *this_gen) { rtsp_input_class_t *this = (rtsp_input_class_t *) this_gen; @@ -303,8 +295,8 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->input_class.get_instance = rtsp_class_get_instance; - this->input_class.get_identifier = rtsp_class_get_identifier; - this->input_class.get_description = rtsp_class_get_description; + this->input_class.identifier = "rtsp"; + this->input_class.description = _("rtsp streaming input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = rtsp_class_dispose; diff --git a/src/input/input_smb.c b/src/input/input_smb.c index 9fd4e50c8..d0e81ae32 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.c @@ -151,18 +151,6 @@ static uint32_t smb_plugin_get_blocksize (input_plugin_t *this_gen) { return 0; } -static char -*smb_class_get_description (input_class_t *this_gen) -{ - return _("CIFS/SMB input plugin based on libsmbclient"); -} - -static const char -*smb_class_get_identifier (input_class_t *this_gen) -{ - return "smb"; -} - /* * Sorting function, it comes from GNU fileutils package. */ @@ -519,8 +507,8 @@ static void this->xine = xine; this->input_class.get_instance = smb_class_get_instance; - this->input_class.get_identifier = smb_class_get_identifier; - this->input_class.get_description = smb_class_get_description; + this->input_class.identifier = "smb"; + this->input_class.description = _("CIFS/SMB input plugin based on libsmbclient"); this->input_class.get_dir = smb_class_get_dir; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = smb_class_dispose; diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index 01fef7431..4640cbf31 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.c @@ -344,15 +344,6 @@ static input_plugin_t *stdin_class_get_instance (input_class_t *class_gen, /* * stdin input plugin class stuff */ - -static const char *stdin_class_get_description (input_class_t *this_gen) { - return _("stdin streaming input plugin"); -} - -static const char *stdin_class_get_identifier (input_class_t *this_gen) { - return "stdin_fifo"; -} - static void stdin_class_dispose (input_class_t *this_gen) { stdin_input_class_t *this = (stdin_input_class_t *) this_gen; @@ -368,8 +359,8 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->input_class.get_instance = stdin_class_get_instance; - this->input_class.get_identifier = stdin_class_get_identifier; - this->input_class.get_description = stdin_class_get_description; + this->input_class.identifier = "stdin_fifo"; + this->input_class.description = _("stdin streaming input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = stdin_class_dispose; diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index b9ac7296a..f698f8772 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -1901,18 +1901,6 @@ static input_plugin_t *v4l_class_get_radio_instance (input_class_t *cls_gen, * v4l input plugin class stuff */ -static char *v4l_class_get_video_description (input_class_t *this_gen) { - return _("v4l tv input plugin"); -} - -static char *v4l_class_get_radio_description (input_class_t *this_gen) { - return _("v4l radio input plugin"); -} - -static const char *v4l_class_get_identifier (input_class_t *this_gen) { - return "v4l"; -} - static void v4l_class_dispose (input_class_t *this_gen) { v4l_input_class_t *this = (v4l_input_class_t *) this_gen; @@ -1929,8 +1917,8 @@ static void *init_video_class (xine_t *xine, void *data) this->xine = xine; this->input_class.get_instance = v4l_class_get_video_instance; - this->input_class.get_identifier = v4l_class_get_identifier; - this->input_class.get_description = v4l_class_get_video_description; + this->input_class.identifier = "v4l"; + this->input_class.description = _("v4l tv input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = v4l_class_dispose; @@ -1961,8 +1949,8 @@ static void *init_radio_class (xine_t *xine, void *data) this->xine = xine; this->input_class.get_instance = v4l_class_get_radio_instance; - this->input_class.get_identifier = v4l_class_get_identifier; - this->input_class.get_description = v4l_class_get_radio_description; + this->input_class.identifier = "v4l"; + this->input_class.description = _("v4l radio input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = v4l_class_dispose; diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index d5895c9a8..71c828eea 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -918,15 +918,6 @@ static input_plugin_t *vcd_class_get_instance (input_class_t *cls_gen, xine_stre /* * vcd input plugin class stuff */ - -static const char *vcd_class_get_description (input_class_t *this_gen) { - return _("Video CD input plugin"); -} - -static const char *vcd_class_get_identifier (input_class_t *this_gen) { - return "vcdo"; -} - static void vcd_class_dispose (input_class_t *this_gen) { vcd_input_class_t *this = (vcd_input_class_t *) this_gen; @@ -1087,8 +1078,8 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->input_class.get_instance = vcd_class_get_instance; - this->input_class.get_identifier = vcd_class_get_identifier; - this->input_class.get_description = vcd_class_get_description; + this->input_class.identifier = "vcdo"; + this->input_class.description = _("Video CD input plugin"); this->input_class.get_dir = vcd_class_get_dir; this->input_class.get_autoplay_list = vcd_class_get_autoplay_list; this->input_class.dispose = vcd_class_dispose; diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index 474cc7339..4b11096c0 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1002,31 +1002,6 @@ vcd_plugin_get_mrl (input_plugin_t *this_gen) } } -/*! - From xine plugin spec: - - return human readable (verbose = 1 line) description for this plugin -*/ -static const char * -vcd_class_get_description (input_class_t *this_gen) -{ - dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n"); - return _("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "); -} - -/*! - From xine plugin spec: - - return short, human readable identifier for this plugin - this is used for GUI buttons, The identifier must have max. 4 characters - characters (max. 5 including terminating \0) -*/ -static const char * -vcd_class_get_identifier (input_class_t *this_gen) { - dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n"); - return SHORT_PLUGIN_NAME; -} - /* Handle all queued keyboard/mouse events. Return TRUE if this causes a change in the play item. @@ -1776,8 +1751,8 @@ vcd_init (xine_t *xine, void *data) class->mrls = NULL; class->input_class.get_instance = vcd_class_get_instance; - class->input_class.get_identifier = vcd_class_get_identifier; - class->input_class.get_description = vcd_class_get_description; + class->input_class.identifier = SHORT_PLUGIN_NAME; + class->input_class.description = _("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "); class->input_class.get_dir = vcd_class_get_dir; class->input_class.get_autoplay_list = vcd_class_get_autoplay_list; class->input_class.dispose = vcd_class_dispose; -- cgit v1.2.3 From c31cccf01ca4b18da57daaf5eae2db63950f4cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 12:58:07 +0100 Subject: Update all demux plugins to the new identifier/description interface. Add _() where missing, for i18n. --- src/demuxers/demux_4xm.c | 12 ++---------- src/demuxers/demux_aac.c | 12 ++---------- src/demuxers/demux_ac3.c | 12 ++---------- src/demuxers/demux_aiff.c | 12 ++---------- src/demuxers/demux_asf.c | 12 ++---------- src/demuxers/demux_aud.c | 12 ++---------- src/demuxers/demux_avi.c | 13 ++----------- src/demuxers/demux_cdda.c | 12 ++---------- src/demuxers/demux_dts.c | 12 ++---------- src/demuxers/demux_eawve.c | 12 ++---------- src/demuxers/demux_elem.c | 12 ++---------- src/demuxers/demux_film.c | 12 ++---------- src/demuxers/demux_flac.c | 12 ++---------- src/demuxers/demux_fli.c | 12 ++---------- src/demuxers/demux_flv.c | 12 ++---------- src/demuxers/demux_idcin.c | 12 ++---------- src/demuxers/demux_iff.c | 12 ++---------- src/demuxers/demux_image.c | 12 ++---------- src/demuxers/demux_ipmovie.c | 12 ++---------- src/demuxers/demux_matroska.c | 15 ++------------- src/demuxers/demux_mng.c | 12 ++---------- src/demuxers/demux_mod.c | 12 ++---------- src/demuxers/demux_mpc.c | 12 ++---------- src/demuxers/demux_mpeg.c | 12 ++---------- src/demuxers/demux_mpeg_block.c | 12 ++---------- src/demuxers/demux_mpeg_pes.c | 12 ++---------- src/demuxers/demux_mpgaudio.c | 12 ++---------- src/demuxers/demux_nsv.c | 12 ++---------- src/demuxers/demux_playlist.c | 12 ++---------- src/demuxers/demux_pva.c | 12 ++---------- src/demuxers/demux_qt.c | 12 ++---------- src/demuxers/demux_rawdv.c | 12 ++---------- src/demuxers/demux_real.c | 12 ++---------- src/demuxers/demux_realaudio.c | 12 ++---------- src/demuxers/demux_roq.c | 12 ++---------- src/demuxers/demux_shn.c | 12 ++---------- src/demuxers/demux_slave.c | 12 ++---------- src/demuxers/demux_smjpeg.c | 12 ++---------- src/demuxers/demux_snd.c | 12 ++---------- src/demuxers/demux_str.c | 12 ++---------- src/demuxers/demux_ts.c | 12 ++---------- src/demuxers/demux_tta.c | 12 ++---------- src/demuxers/demux_vmd.c | 12 ++---------- src/demuxers/demux_voc.c | 12 ++---------- src/demuxers/demux_vox.c | 12 ++---------- src/demuxers/demux_vqa.c | 12 ++---------- src/demuxers/demux_wav.c | 12 ++---------- src/demuxers/demux_wc3movie.c | 12 ++---------- src/demuxers/demux_yuv4mpeg2.c | 12 ++---------- src/demuxers/demux_yuv_frames.c | 12 ++---------- 50 files changed, 100 insertions(+), 504 deletions(-) diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 24aee1ac4..9e4197652 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -521,14 +521,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "4X Technologies (4xm) demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "4X Technologies"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "4xm"; } @@ -549,8 +541,8 @@ void *demux_fourxm_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_fourxm_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("4X Technologies (4xm) demux plugin"); + this->demux_class.identifier = "4X Technologies"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index d80413f83..8e65098bc 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -308,14 +308,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "ADIF/ADTS AAC demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "AAC"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "aac"; } @@ -336,8 +328,8 @@ void *demux_aac_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_aac_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("ADIF/ADTS AAC demux plugin"); + this->demux_class.identifier = "AAC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index c0fae275b..86e3082a0 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -466,14 +466,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Raw AC3 demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "AC3"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "ac3"; } @@ -494,8 +486,8 @@ void *demux_ac3_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_ac3_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Raw AC3 demux plugin"); + this->demux_class.identifier = "AC3"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 7fcaea70e..27f04bf89 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -386,14 +386,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "AIFF file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "AIFF"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "aif aiff"; } @@ -416,8 +408,8 @@ void *demux_aiff_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_aiff_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("AIFF file demux plugin"); + this->demux_class.identifier = "AIFF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 742fa6541..35c126044 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -2096,14 +2096,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "ASF demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "ASF"; -} - static const char *get_extensions (demux_class_t *this_gen) { /* asx, wvx, wax are metafile or playlist */ return "asf wmv wma asx wvx wax"; @@ -2137,8 +2129,8 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("ASF demux plugin"); + this->demux_class.identifier = "ASF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 6223a4068..44378d9dc 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -318,14 +318,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Westwood Studios AUD file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "Westwood Studios AUD"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "aud"; } @@ -346,8 +338,8 @@ void *demux_aud_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_aud_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Westwood Studios AUD file demux plugin"); + this->demux_class.identifier = "Westwood Studios AUD"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 544c19d76..5e8e44168 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -2310,15 +2310,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str /* * demux avi class */ - -static const char *get_description (demux_class_t *this_gen) { - return "AVI/RIFF demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "AVI"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "avi"; } @@ -2340,8 +2331,8 @@ static void *init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_avi_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("AVI/RIFF demux plugin"); + this->demux_class.identifier = "AVI"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index 0f34a7cec..8946bdb44 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -225,14 +225,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "CD Digital Audio demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "CDDA"; -} - static const char *get_extensions (demux_class_t *this_gen) { return NULL; } @@ -253,8 +245,8 @@ void *demux_cdda_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_cdda_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("CD Digital Audio demux plugin"); + this->demux_class.identifier = "CDDA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index 7c9b47fcd..d39d8a234 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -393,14 +393,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Raw DTS demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "DTS"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "dts"; } @@ -421,8 +413,8 @@ void *demux_dts_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_dts_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Raw DTS demux plugin"); + this->demux_class.identifier = "DTS"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index 2359d3baf..7dd8757b3 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -398,14 +398,6 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre return &this->demux_plugin; } -static const char *get_description(demux_class_t *this_gen){ - return "Electronics Arts WVE format demux plugin"; -} - -static const char *get_identifier(demux_class_t *this_gen){ - return "EA WVE"; -} - static const char *get_extensions(demux_class_t *this_gen){ return "wve"; } @@ -424,8 +416,8 @@ void *demux_eawve_init_plugin(xine_t *xine, void *data) { this = xine_xmalloc(sizeof(demux_eawve_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Electronics Arts WVE format demux plugin"); + this->demux_class.identifier = "EA WVE"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index d0a821504..49e802daa 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -259,14 +259,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Elementary MPEG stream demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "MPEG_ELEM"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "mpv"; } @@ -287,8 +279,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_mpeg_elem_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Elementary MPEG stream demux plugin"); + this->demux_class.identifier = "MPEG_ELEM"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 26a7a9713..585bd5ccb 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -902,14 +902,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "FILM (CPK) demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "FILM (CPK)"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "cpk cak film"; } @@ -930,8 +922,8 @@ void *demux_film_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_film_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("FILM (CPK) demux plugin"); + this->demux_class.identifier = "FILM (CPK)"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c index 9bf78ff38..3698bfcf0 100644 --- a/src/demuxers/demux_flac.c +++ b/src/demuxers/demux_flac.c @@ -530,14 +530,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Free Lossless Audio Codec (flac) demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "FLAC"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "flac"; } @@ -558,8 +550,8 @@ void *demux_flac_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_flac_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Free Lossless Audio Codec (flac) demux plugin"); + this->demux_class.identifier = "FLAC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index 99843a68c..dd82bf12e 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -352,14 +352,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Autodesk Animator FLI/FLC demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "FLI/FLC"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "fli flc"; } @@ -380,8 +372,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_fli_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Autodesk Animator FLI/FLC demux plugin"); + this->demux_class.identifier = "FLI/FLC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index adb29d69d..a8317f0be 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -879,14 +879,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Flash Video file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "FLV"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "flv"; } @@ -907,8 +899,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_flv_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Flash Video file demux plugin"); + this->demux_class.identifier = "FLV"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index 11cb8cb9e..a295fc39c 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -523,14 +523,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } -static const char *get_description (demux_class_t *this_gen) { - return "Id Quake II Cinematic file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "Id CIN"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "cin"; } @@ -551,8 +543,8 @@ void *demux_idcin_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_idcin_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Id Quake II Cinematic file demux plugin"); + this->demux_class.identifier = "Id CIN"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index d914405db..30d8ed5b7 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -1283,14 +1283,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "IFF demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "IFF"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "iff svx 8svx 16sv ilbm ham ham6 ham8 anim anim3 anim5 anim7 anim8"; } @@ -1318,8 +1310,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_iff_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("IFF demux plugin"); + this->demux_class.identifier = "IFF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index 9f53e4173..741a4c17c 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -223,14 +223,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, * image demuxer class */ -static const char *get_description (demux_class_t *this_gen) { - return "image demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "imagedmx"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "png gif jpg jpeg"; } @@ -252,8 +244,8 @@ static void *init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_image_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("image demux plugin"); + this->demux_class.identifier = "imagedmx"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index cd21896c0..d78877b62 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -721,14 +721,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Interplay MVE Movie demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "Interplay MVE"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "mve mv8"; } @@ -749,8 +741,8 @@ void *demux_ipmovie_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_ipmovie_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Interplay MVE Movie demux plugin"); + this->demux_class.identifier = "Interplay MVE"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 0169651a0..e00efb426 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -2861,17 +2861,6 @@ error: /* * demux matroska class */ - -static const char *get_description (demux_class_t *this_gen) { - return "matroska demux plugin"; -} - - -static const char *get_identifier (demux_class_t *this_gen) { - return "matroska"; -} - - static const char *get_extensions (demux_class_t *this_gen) { return "mkv"; } @@ -2897,8 +2886,8 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("matroska demux plugin"); + this->demux_class.identifier = "matroska"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index 12da8ca86..ca1fc0108 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -334,14 +334,6 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre return &this->demux_plugin; } -static const char *get_description(demux_class_t *this_gen){ - return "Multiple-image Network Graphics demux plugin"; -} - -static const char *get_identifier(demux_class_t *this_gen){ - return "MNG"; -} - static const char *get_extensions(demux_class_t *this_gen){ return "png mng"; } @@ -363,8 +355,8 @@ static void *init_plugin(xine_t *xine, void *data){ this = xine_xmalloc (sizeof (demux_mng_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Multiple-image Network Graphics demux plugin"); + this->demux_class.identifier = "MNG"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index 397a952c0..4c15c7c6d 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -352,14 +352,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "ModPlug Amiga MOD Music file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "mod"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "mod it stm s3m 669 amf med mdl xm"; } @@ -380,8 +372,8 @@ static void *demux_mod_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_mod_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("ModPlug Amiga MOD Music file demux plugin"); + this->demux_class.identifier = "mod"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index 346f0c2e6..a8fb500e3 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.c @@ -372,14 +372,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Musepack demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "Musepack"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "mpc mp+"; } @@ -400,8 +392,8 @@ void *demux_mpc_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_mpc_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Musepack demux plugin"); + this->demux_class.identifier = "Musepack"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 4419f8404..72fe97473 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -1220,14 +1220,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "MPEG program stream demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "MPEG"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "mpg mpeg"; } @@ -1249,8 +1241,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_mpeg_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("MPEG program stream demux plugin"); + this->demux_class.identifier = "MPEG"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 32638129d..e9f7226ee 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -1513,14 +1513,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "DVD/VOB demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "MPEG_BLOCK"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "vob"; } @@ -1545,8 +1537,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("DVD/VOB demux plugin"); + this->demux_class.identifier = "MPEG_BLOCK"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 423da5e24..85a8fa14d 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -1760,14 +1760,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "mpeg pes demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "MPEG_PES"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "pes"; } @@ -1791,8 +1783,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("mpeg pes demux plugin"); + this->demux_class.identifier = "MPEG_PES"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 9c997c9f5..6bfa0d770 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -1031,14 +1031,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str * demux mpegaudio class */ -static const char *get_description (demux_class_t *this_gen) { - return "MPEG audio demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "MPEGAUDIO"; -} - static const char *get_extensions (demux_class_t *this_gen) { demux_mpgaudio_class_t *this = (demux_mpgaudio_class_t *) this_gen; @@ -1081,8 +1073,8 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("MPEG audio demux plugin"); + this->demux_class.identifier = "MPEGAUDIO"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 44bb18c79..88d4c6ea5 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -643,14 +643,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Nullsoft Video demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "Nullsoft NSV"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "nsv"; } @@ -671,8 +663,8 @@ static void *demux_nsv_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_nsv_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Nullsoft Video demux plugin"); + this->demux_class.identifier = "Nullsoft NSV"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c index bbe6998e6..138c0491d 100644 --- a/src/demuxers/demux_playlist.c +++ b/src/demuxers/demux_playlist.c @@ -686,14 +686,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Playlist demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "playlist"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "m3u ram pls asx wax wvx smi smil qtl xspf rss"; } @@ -723,8 +715,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof(demux_playlist_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Playlist demux plugin"); + this->demux_class.identifier = "playlist"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 298d936b5..0100c19b8 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -478,14 +478,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "TechnoTrend PVA demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "TechnoTrend PVA"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "pva"; } @@ -506,8 +498,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_pva_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("TechnoTrend PVA demux plugin"); + this->demux_class.identifier = "TechnoTrend PVA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 89d0283ac..4bc9eb890 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -3122,14 +3122,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Apple Quicktime (MOV) and MPEG-4 demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "MOV/MPEG-4"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "mov qt mp4 m4a m4b"; } @@ -3157,8 +3149,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = ("Apple Quicktime (MOV) and MPEG-4 demux plugin"); + this->demux_class.identifier = "MOV/MPEG-4"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index 2d21f080d..db59e831e 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -411,14 +411,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Raw DV Video stream"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "raw_dv"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "dv dif"; } @@ -439,8 +431,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_raw_dv_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Raw DV Video stream"); + this->demux_class.identifier = "raw_dv"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 60fa91451..4a5b2cae7 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -1616,14 +1616,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "RealMedia file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "Real"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "rm rmvb ram"; } @@ -1647,8 +1639,8 @@ static void *init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_real_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("RealMedia file demux plugin"); + this->demux_class.identifier = "Real"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index 1e7c3c7de..c24a8c247 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -377,14 +377,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "RealAudio file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "RA"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "ra"; } @@ -405,8 +397,8 @@ void *demux_realaudio_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_ra_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("RealAudio file demux plugin"); + this->demux_class.identifier = "RA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 18edaea87..0c89d9b5a 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -460,14 +460,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Id RoQ file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "RoQ"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "roq"; } @@ -488,8 +480,8 @@ void *demux_roq_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_roq_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Id RoQ file demux plugin"); + this->demux_class.identifier = "RoQ"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c index 87324ab45..19b55cd20 100644 --- a/src/demuxers/demux_shn.c +++ b/src/demuxers/demux_shn.c @@ -228,14 +228,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Shorten demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "Shorten"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "shn"; } @@ -256,8 +248,8 @@ void *demux_shn_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_shn_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Shorten demux plugin"); + this->demux_class.identifier = "Shorten"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index 436d37579..22eed6973 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -389,14 +389,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return ""; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "slave"; -} - static const char *get_extensions (demux_class_t *this_gen) { return ""; } @@ -417,8 +409,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_slave_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = ""; + this->demux_class.identifier = "slave"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index 899fbf7e3..a715f2309 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -449,14 +449,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "SMJPEG file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "SMJPEG"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "mjpg"; } @@ -477,8 +469,8 @@ void *demux_smjpeg_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_smjpeg_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("SMJPEG file demux plugin"); + this->demux_class.identifier = "SMJPEG"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index 0965a75ae..79b7412e7 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -367,14 +367,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "SND/AU file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "SND/AU"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "snd au"; } @@ -398,8 +390,8 @@ void *demux_snd_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_snd_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("SND/AU file demux plugin"); + this->demux_class.identifier = "SND/AU"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index 2cf542014..51a2b324d 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -603,14 +603,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Sony Playstation STR file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "PSX STR"; -} - static const char *get_extensions (demux_class_t *this_gen) { /* also .mov, but we don't want to hijack that extension */ return "str iki ik2 dps dat xa xa1 xa2 xas xap"; @@ -631,8 +623,8 @@ void *demux_str_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_str_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Sony Playstation STR file demux plugin"); + this->demux_class.identifier = "PSX STR"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 19826bf71..f4a0a1b10 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -2263,14 +2263,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, * ts demuxer class */ -static const char *get_description (demux_class_t *this_gen) { - return "MPEG Transport Stream demuxer"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "MPEG_TS"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "ts m2t trp"; } @@ -2295,8 +2287,8 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("MPEG Transport Stream demuxer"); + this->demux_class.identifier = "MPEG_TS"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index 9b2730018..0d8efd10d 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.c @@ -281,14 +281,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "True Audio demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "True Audio"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "tta"; } @@ -309,8 +301,8 @@ void *demux_tta_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_tta_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("True Audio demux plugin"); + this->demux_class.identifier = "True Audio"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c index 8b0087417..f83e1976d 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.c @@ -470,14 +470,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Sierra VMD file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "VMD"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "vmd"; } @@ -498,8 +490,8 @@ void *demux_vmd_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_vmd_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Sierra VMD file demux plugin"); + this->demux_class.identifier = "VMD"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index 0439980f8..1b38e2116 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -345,14 +345,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "VOC file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "VOC"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "voc"; } @@ -373,8 +365,8 @@ void *demux_voc_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_voc_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("VOC file demux plugin"); + this->demux_class.identifier = "VOC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index 3ce2ad705..d68bcc0d6 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -222,14 +222,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Dialogic VOX file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "VOX"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "vox"; } @@ -250,8 +242,8 @@ void *demux_vox_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_vox_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Dialogic VOX file demux plugin"); + this->demux_class.identifier = "VOX"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index 40242476b..f06a936af 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -383,14 +383,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Westwood Studios VQA file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "VQA"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "vqa"; } @@ -411,8 +403,8 @@ void *demux_vqa_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_vqa_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Westwood Studios VQA file demux plugin"); + this->demux_class.identifier = "VQA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index 9b46336fe..8647d12ae 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -391,14 +391,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "WAV file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "WAV"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "wav"; } @@ -422,8 +414,8 @@ void *demux_wav_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_wav_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("WAV file demux plugin"); + this->demux_class.identifier = "WAV"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index a69c6b46a..34f0b6a8b 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -714,14 +714,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "Wing Commander III Movie (MVE) demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "WC3 Movie"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "mve"; } @@ -742,8 +734,8 @@ void *demux_wc3movie_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_mve_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Wing Commander III Movie (MVE) demux plugin"); + this->demux_class.identifier = "WC3 Movie"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 9c5856710..b44e9719d 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -452,14 +452,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "YUV4MPEG2 file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "YUV4MPEG2"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "y4m"; } @@ -480,8 +472,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_yuv4mpeg2_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("YUV4MPEG2 file demux plugin"); + this->demux_class.identifier = "YUV4MPEG2"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 774329c05..661f10342 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -228,14 +228,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, * demuxer class */ -static const char *get_description (demux_class_t *this_gen) { - return "YUV frames dummy demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "YUV_FRAMES"; -} - static const char *get_extensions (demux_class_t *this_gen) { return NULL; } @@ -256,8 +248,8 @@ static void *init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_yuv_frames_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("YUV frames dummy demux plugin"); + this->demux_class.identifier = "YUV_FRAMES"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; -- cgit v1.2.3 From a446e560469e1c071d8bbbc2e8805c3328fbb1c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 13:02:57 +0100 Subject: Update all combined plugins to the new identifier/description interface. Add _() where missing, for i18n. --- src/combined/flac_decoder.c | 12 ++---------- src/combined/flac_demuxer.c | 14 ++------------ src/combined/nsf_decoder.c | 16 ++-------------- src/combined/nsf_demuxer.c | 12 ++---------- src/combined/wavpack_decoder.c | 12 ++---------- src/combined/wavpack_demuxer.c | 12 ++---------- src/combined/xine_ogg_demuxer.c | 24 ++++-------------------- src/combined/xine_speex_decoder.c | 12 ++---------- src/combined/xine_theora_decoder.c | 20 ++------------------ src/combined/xine_vorbis_decoder.c | 12 ++---------- 10 files changed, 22 insertions(+), 124 deletions(-) diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c index 75465f6fe..80d16903f 100644 --- a/src/combined/flac_decoder.c +++ b/src/combined/flac_decoder.c @@ -380,14 +380,6 @@ open_plugin (audio_decoder_class_t *class_gen, xine_stream_t *stream) { * flac plugin class */ -static char *get_identifier (audio_decoder_class_t *this) { - return "flacdec"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "flac audio decoder plugin"; -} - static void dispose_class (audio_decoder_class_t *this) { free (this); } @@ -399,8 +391,8 @@ init_plugin (xine_t *xine, void *data) { this = (flac_class_t *) xine_xmalloc (sizeof (flac_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "flacdec"; + this->decoder_class.description = _("flac audio decoder plugin"); this->decoder_class.dispose = dispose_class; diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c index 7a5aabe0b..e4ac98258 100644 --- a/src/combined/flac_demuxer.c +++ b/src/combined/flac_demuxer.c @@ -713,16 +713,6 @@ open_plugin (demux_class_t *class_gen, /* FLAC Demuxer class */ -static char * -get_description (demux_class_t *this_gen) { - return "FLAC demux plugin"; -} - -static char * -get_identifier (demux_class_t *this_gen) { - return "FLAC"; -} - static char * get_extensions (demux_class_t *this_gen) { return "flac"; @@ -754,8 +744,8 @@ demux_flac_init_class (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("FLAC demux plugin"); + this->demux_class.identifier = "FLAC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c index a809ff9cc..ea03138c1 100644 --- a/src/combined/nsf_decoder.c +++ b/src/combined/nsf_decoder.c @@ -230,18 +230,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -/* This function returns a brief string that describes (usually with the - * decoder's most basic name) the audio decoder plugin. */ -static char *get_identifier (audio_decoder_class_t *this) { - return "NSF"; -} - -/* This function returns a slightly longer string describing the audio - * decoder plugin. */ -static char *get_description (audio_decoder_class_t *this) { - return "NES Music audio decoder plugin"; -} - /* This function frees the audio decoder class and any other memory that was * allocated. */ static void dispose_class (audio_decoder_class_t *this_gen) { @@ -260,8 +248,8 @@ void *decoder_nsf_init_plugin (xine_t *xine, void *data) { this = (nsf_class_t *) xine_xmalloc (sizeof (nsf_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "NSF"; + this->decoder_class.description = _("NES Music audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c index 95897e3ac..63658eeef 100644 --- a/src/combined/nsf_demuxer.c +++ b/src/combined/nsf_demuxer.c @@ -349,14 +349,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_description (demux_class_t *this_gen) { - return "NES Music file demux plugin"; -} - -static const char *get_identifier (demux_class_t *this_gen) { - return "NSF"; -} - static const char *get_extensions (demux_class_t *this_gen) { return "nsf"; } @@ -377,8 +369,8 @@ void *demux_nsf_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_nsf_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("NES Music file demux plugin"); + this->demux_class.identifier = "NSF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c index 2bd0339d8..f1201bbcd 100644 --- a/src/combined/wavpack_decoder.c +++ b/src/combined/wavpack_decoder.c @@ -311,14 +311,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre * wavpack plugin class */ -static char *get_identifier (audio_decoder_class_t *this) { - return "wavpackdec"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "wavpack audio decoder plugin"; -} - static void dispose_class (audio_decoder_class_t *this) { free (this); } @@ -329,8 +321,8 @@ void *decoder_wavpack_init_plugin (xine_t *xine, void *data) { this = (wavpack_class_t *) xine_xmalloc (sizeof (wavpack_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "wavpackdec"; + this->decoder_class.description = _("wavpack audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c index 4b8300d44..a3f217703 100644 --- a/src/combined/wavpack_demuxer.c +++ b/src/combined/wavpack_demuxer.c @@ -378,14 +378,6 @@ static demux_plugin_t *open_plugin (demux_class_t *const class_gen, return &this->demux_plugin; } -static const char *get_description (demux_class_t *const this_gen) { - return "Wavpack demux plugin"; -} - -static const char *get_identifier (demux_class_t *const this_gen) { - return "Wavpack"; -} - static const char *get_extensions (demux_class_t *const this_gen) { return "wv"; } @@ -404,8 +396,8 @@ void *demux_wv_init_plugin (xine_t *const xine, void *const data) { demux_wv_class_t *const this = xine_xmalloc (sizeof (demux_wv_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.get_description = get_description; - this->demux_class.get_identifier = get_identifier; + this->demux_class.description = _("Wavpack demux plugin"); + this->demux_class.identifier = "Wavpack"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; this->demux_class.dispose = class_dispose; diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 2a69c4da2..5d10e3926 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -2117,14 +2117,6 @@ static demux_plugin_t *ogg_open_plugin (demux_class_t *class_gen, * Annodex demuxer class */ -static const char *anx_get_description (demux_class_t *this_gen) { - return "Annodex demux plugin"; -} - -static const char *anx_get_identifier (demux_class_t *this_gen) { - return "Annodex"; -} - static const char *anx_get_extensions (demux_class_t *this_gen) { return "anx axa axv"; } @@ -2145,8 +2137,8 @@ static void *anx_init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_anx_class_t)); this->demux_class.open_plugin = anx_open_plugin; - this->demux_class.get_description = anx_get_description; - this->demux_class.get_identifier = anx_get_identifier; + this->demux_class.description = _("Annodex demux plugin"); + this->demux_class.identifier = "Annodex"; this->demux_class.get_mimetypes = anx_get_mimetypes; this->demux_class.get_extensions = anx_get_extensions; this->demux_class.dispose = anx_class_dispose; @@ -2158,14 +2150,6 @@ static void *anx_init_class (xine_t *xine, void *data) { * ogg demuxer class */ -static const char *ogg_get_description (demux_class_t *this_gen) { - return "OGG demux plugin"; -} - -static const char *ogg_get_identifier (demux_class_t *this_gen) { - return "OGG"; -} - static const char *ogg_get_extensions (demux_class_t *this_gen) { return "ogg ogm spx"; } @@ -2189,8 +2173,8 @@ static void *ogg_init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_ogg_class_t)); this->demux_class.open_plugin = ogg_open_plugin; - this->demux_class.get_description = ogg_get_description; - this->demux_class.get_identifier = ogg_get_identifier; + this->demux_class.description = _("OGG demux plugin"); + this->demux_class.identifier = "OGG"; this->demux_class.get_mimetypes = ogg_get_mimetypes; this->demux_class.get_extensions = ogg_get_extensions; this->demux_class.dispose = ogg_class_dispose; diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c index fa1ede0f2..ee93c520d 100644 --- a/src/combined/xine_speex_decoder.c +++ b/src/combined/xine_speex_decoder.c @@ -376,14 +376,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, * speex plugin class */ -static char *get_identifier (audio_decoder_class_t *this) { - return "speex"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "Speex audio decoder plugin"; -} - static void dispose_class (audio_decoder_class_t *this) { free (this); } @@ -395,8 +387,8 @@ void *speex_init_plugin (xine_t *xine, void *data) { this = (speex_class_t *) xine_xmalloc (sizeof (speex_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "speex"; + this->decoder_class.description = _("Speex audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c index 9fd3d6416..e7d59624a 100644 --- a/src/combined/xine_theora_decoder.c +++ b/src/combined/xine_theora_decoder.c @@ -343,22 +343,6 @@ static video_decoder_t *theora_open_plugin (video_decoder_class_t *class_gen, xi /* * theora plugin class */ - -static char *theora_get_identifier (video_decoder_class_t *this) { - /* - * return short, human readable identifier for this plugin class - */ - return "theora video"; -} - -static char *theora_get_description (video_decoder_class_t *this) { - /* - * return human readable (verbose = 1 line) description for - * this plugin class - */ - return "theora video decoder plugin"; -} - static void theora_dispose_class (video_decoder_class_t *this) { /* * free all class-related resources @@ -373,8 +357,8 @@ void *theora_init_plugin (xine_t *xine, void *data) { this = (theora_class_t *) xine_xmalloc (sizeof (theora_class_t)); this->decoder_class.open_plugin = theora_open_plugin; - this->decoder_class.get_identifier = theora_get_identifier; - this->decoder_class.get_description = theora_get_description; + this->decoder_class.identifier = "theora video"; + this->decoder_class.description = _("theora video decoder plugin"); this->decoder_class.dispose = theora_dispose_class; return this; diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c index 29d095228..5409ba935 100644 --- a/src/combined/xine_vorbis_decoder.c +++ b/src/combined/xine_vorbis_decoder.c @@ -311,14 +311,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, * vorbis plugin class */ -static char *get_identifier (audio_decoder_class_t *this) { - return "vorbis"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "vorbis audio decoder plugin"; -} - static void dispose_class (audio_decoder_class_t *this) { free (this); } @@ -330,8 +322,8 @@ void *vorbis_init_plugin (xine_t *xine, void *data) { this = (vorbis_class_t *) xine_xmalloc (sizeof (vorbis_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "vorbis"; + this->decoder_class.description = _("vorbis audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; -- cgit v1.2.3 From 4c6079008803ebe11ad05051a2c220a9347feea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 13:18:58 +0100 Subject: Update all audio decoder plugins to the new identifier/description interface. Add _() where missing, for i18n. --- src/libxineadec/fooaudio.c | 16 ++-------------- src/libxineadec/gsm610.c | 12 ++---------- src/libxineadec/xine_a52_decoder.c | 14 ++------------ src/libxineadec/xine_dts_decoder.c | 12 ++---------- src/libxineadec/xine_faad_decoder.c | 12 ++---------- src/libxineadec/xine_lpcm_decoder.c | 12 ++---------- src/libxineadec/xine_mad_decoder.c | 12 ++---------- src/libxineadec/xine_musepack_decoder.c | 8 ++------ 8 files changed, 16 insertions(+), 82 deletions(-) diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c index 5ab4fa1f6..cfcaabc50 100644 --- a/src/libxineadec/fooaudio.c +++ b/src/libxineadec/fooaudio.c @@ -283,18 +283,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -/* This function returns a brief string that describes (usually with the - * decoder's most basic name) the audio decoder plugin. */ -static char *get_identifier (audio_decoder_class_t *this) { - return "fooaudio"; -} - -/* This function returns a slightly longer string describing the audio - * decoder plugin. */ -static char *get_description (audio_decoder_class_t *this) { - return "fooaudio: reference xine audio decoder plugin"; -} - /* This function frees the audio decoder class and any other memory that was * allocated. */ static void dispose_class (audio_decoder_class_t *this_gen) { @@ -313,8 +301,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (fooaudio_class_t *) xine_malloc (sizeof (fooaudio_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "fooaudio"; + this->decoder_class.description = _("fooaudio: reference xine audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c index 84d28cc3a..8cd0a7042 100644 --- a/src/libxineadec/gsm610.c +++ b/src/libxineadec/gsm610.c @@ -249,14 +249,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static char *get_identifier (audio_decoder_class_t *this) { - return "GSM 6.10"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "GSM 6.10 audio decoder plugin"; -} - static void dispose_class (audio_decoder_class_t *this) { free (this); } @@ -268,8 +260,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (gsm610_class_t *) xine_xmalloc (sizeof (gsm610_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "GSM 6.10"; + this->decoder_class.description = _("GSM 6.10 audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c index bb4bdba29..25a315abb 100644 --- a/src/libxineadec/xine_a52_decoder.c +++ b/src/libxineadec/xine_a52_decoder.c @@ -769,16 +769,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static char *get_identifier (audio_decoder_class_t *this) { - lprintf ("get_identifier called\n"); - return "a/52dec"; -} - -static char *get_description (audio_decoder_class_t *this) { - lprintf ("get_description called\n"); - return "liba52 based a52 audio decoder plugin"; -} - static void dispose_class (audio_decoder_class_t *this) { lprintf ("dispose_class called\n"); free (this); @@ -792,8 +782,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (a52dec_class_t *) xine_xmalloc (sizeof (a52dec_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "a/52dec"; + this->decoder_class.description = _("liba52 based a52 audio decoder plugin"); this->decoder_class.dispose = dispose_class; cfg = this->config = xine->config; diff --git a/src/libxineadec/xine_dts_decoder.c b/src/libxineadec/xine_dts_decoder.c index f62aa1b94..3f34b68c2 100644 --- a/src/libxineadec/xine_dts_decoder.c +++ b/src/libxineadec/xine_dts_decoder.c @@ -547,14 +547,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static char *get_identifier (audio_decoder_class_t *this) { - return "DTS"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "DTS passthru audio format decoder plugin"; -} - static void dispose_class (audio_decoder_class_t *this) { lprintf("dispose_class\n"); @@ -569,8 +561,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (dts_class_t *) xine_xmalloc (sizeof (dts_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "DTS"; + this->decoder_class.description = _("DTS passthru audio format decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c index 4a2097ec4..61fbfc1de 100644 --- a/src/libxineadec/xine_faad_decoder.c +++ b/src/libxineadec/xine_faad_decoder.c @@ -445,14 +445,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static char *get_identifier (audio_decoder_class_t *this) { - return "FAAD"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "Freeware Advanced Audio Decoder"; -} - static void dispose_class (audio_decoder_class_t *this) { free (this); } @@ -464,8 +456,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (faad_class_t *) xine_xmalloc (sizeof (faad_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "FAAD"; + this->decoder_class.description = _("Freeware Advanced Audio Decoder"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c index 66cdcf637..c3d450d51 100644 --- a/src/libxineadec/xine_lpcm_decoder.c +++ b/src/libxineadec/xine_lpcm_decoder.c @@ -248,14 +248,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static char *get_identifier (audio_decoder_class_t *this) { - return "Linear PCM"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "Linear PCM audio decoder plugin"; -} - static void dispose_class (audio_decoder_class_t *this) { free (this); } @@ -267,8 +259,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (lpcm_class_t *) xine_xmalloc (sizeof (lpcm_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "Linear PCM"; + this->decoder_class.description = _("Linear PCM audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c index 2057505e8..db74f655c 100644 --- a/src/libxineadec/xine_mad_decoder.c +++ b/src/libxineadec/xine_mad_decoder.c @@ -336,14 +336,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre * mad plugin class */ -static char *get_identifier (audio_decoder_class_t *this) { - return "mad"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "libmad based mpeg audio layer 1/2/3 decoder plugin"; -} - static void dispose_class (audio_decoder_class_t *this) { free (this); } @@ -355,8 +347,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (mad_class_t *) xine_xmalloc (sizeof (mad_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "mad"; + this->decoder_class.description = _("libmad based mpeg audio layer 1/2/3 decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/xine_musepack_decoder.c b/src/libxineadec/xine_musepack_decoder.c index 7e6b93f45..13f67b137 100644 --- a/src/libxineadec/xine_musepack_decoder.c +++ b/src/libxineadec/xine_musepack_decoder.c @@ -434,10 +434,6 @@ static char *get_identifier (audio_decoder_class_t *this) { return "mpc"; } -static char *get_description (audio_decoder_class_t *this) { - return "mpc: musepack audio decoder plugin"; -} - static void dispose_class (audio_decoder_class_t *this_gen) { mpc_class_t *this = (mpc_class_t *)this_gen; @@ -452,8 +448,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (mpc_class_t *) xine_xmalloc (sizeof (mpc_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "mpc"; + this->decoder_class.description = _("mpc: musepack audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; -- cgit v1.2.3 From 982dbe6dcd3e119227e453f368e6b5ecaac35f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 13:20:42 +0100 Subject: Update all video decoder plugins to the new identifier/description interface. Add _() where missing, for i18n. --- src/libxinevdec/bitplane.c | 12 ++---------- src/libxinevdec/foovideo.c | 20 ++------------------ src/libxinevdec/gdkpixbuf.c | 12 ++---------- src/libxinevdec/image.c | 12 ++---------- src/libxinevdec/rgb.c | 12 ++---------- src/libxinevdec/yuv.c | 12 ++---------- 6 files changed, 12 insertions(+), 68 deletions(-) diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index b6940813f..1c7f387c6 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.c @@ -1544,14 +1544,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre return &this->video_decoder; } -static char *get_identifier (video_decoder_class_t *this) { - return "bitplane"; -} - -static char *get_description (video_decoder_class_t *this) { - return "Raw bitplane video decoder plugin"; -} - static void dispose_class (video_decoder_class_t *this) { free (this); } @@ -1561,8 +1553,8 @@ static void *init_plugin (xine_t *xine, void *data) { bitplane_class_t *this = (bitplane_class_t *) xine_xmalloc (sizeof (bitplane_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "bitplane"; + this->decoder_class.description = _("Raw bitplane video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c index 98e0ebc0b..dfcb8630d 100644 --- a/src/libxinevdec/foovideo.c +++ b/src/libxinevdec/foovideo.c @@ -224,22 +224,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre return &this->video_decoder; } -/* - * This function returns a brief string that describes (usually with the - * decoder's most basic name) the video decoder plugin. - */ -static char *get_identifier (video_decoder_class_t *this) { - return "foovideo"; -} - -/* - * This function returns a slightly longer string describing the video - * decoder plugin. - */ -static char *get_description (video_decoder_class_t *this) { - return "foovideo: reference xine video decoder plugin"; -} - /* * This function frees the video decoder class and any other memory that was * allocated. @@ -259,8 +243,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (foovideo_class_t *) xine_xmalloc (sizeof (foovideo_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "foovideo"; + this->decoder_class.description = _("foovideo: reference xine video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c index b5acdfa42..bbd66f42f 100644 --- a/src/libxinevdec/gdkpixbuf.c +++ b/src/libxinevdec/gdkpixbuf.c @@ -257,14 +257,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, * image plugin class */ -static char *get_identifier (video_decoder_class_t *this) { - return "gdkpixbuf"; -} - -static char *get_description (video_decoder_class_t *this) { - return "gdk-pixbuf image video decoder plugin"; -} - static void dispose_class (video_decoder_class_t *this_gen) { image_class_t *this = (image_class_t *) this_gen; @@ -280,8 +272,8 @@ static void *init_class (xine_t *xine, void *data) { this = (image_class_t *) xine_xmalloc (sizeof (image_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "gdkpixbuf"; + this->decoder_class.description = _("gdk-pixbuf image video decoder plugin"); this->decoder_class.dispose = dispose_class; /* diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index a338e3cab..2807fc5d6 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -235,14 +235,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, * image plugin class */ -static char *get_identifier (video_decoder_class_t *this) { - return "imagevdec"; -} - -static char *get_description (video_decoder_class_t *this) { - return "image video decoder plugin"; -} - static void dispose_class (video_decoder_class_t *this_gen) { image_class_t *this = (image_class_t *) this_gen; @@ -258,8 +250,8 @@ static void *init_class (xine_t *xine, void *data) { this = (image_class_t *) xine_xmalloc (sizeof (image_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "imagevdec"; + this->decoder_class.description = _("image video decoder plugin"); this->decoder_class.dispose = dispose_class; /* diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index 0e7be4c18..54adeeec1 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -416,14 +416,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre return &this->video_decoder; } -static char *get_identifier (video_decoder_class_t *this) { - return "RGB"; -} - -static char *get_description (video_decoder_class_t *this) { - return "Raw RGB video decoder plugin"; -} - static void dispose_class (video_decoder_class_t *this) { free (this); } @@ -435,8 +427,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (rgb_class_t *) xine_xmalloc (sizeof (rgb_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "RGB"; + this->decoder_class.description = _("Raw RGB video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index 2b8657685..bcbb4bbe7 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -339,14 +339,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre return &this->video_decoder; } -static char *get_identifier (video_decoder_class_t *this) { - return "YUV"; -} - -static char *get_description (video_decoder_class_t *this) { - return "Raw YUV video decoder plugin"; -} - static void dispose_class (video_decoder_class_t *this) { free (this); } @@ -358,8 +350,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (yuv_class_t *) xine_xmalloc (sizeof (yuv_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "YUV"; + this->decoder_class.description = _("Raw YUV video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; -- cgit v1.2.3 From f8bd5f9976485960fa7b2ffd1ca2a347044b38ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 13:21:21 +0100 Subject: Remove stray function. --- src/libxineadec/xine_musepack_decoder.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libxineadec/xine_musepack_decoder.c b/src/libxineadec/xine_musepack_decoder.c index 13f67b137..d2db57806 100644 --- a/src/libxineadec/xine_musepack_decoder.c +++ b/src/libxineadec/xine_musepack_decoder.c @@ -430,10 +430,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static char *get_identifier (audio_decoder_class_t *this) { - return "mpc"; -} - static void dispose_class (audio_decoder_class_t *this_gen) { mpc_class_t *this = (mpc_class_t *)this_gen; -- cgit v1.2.3 From 78fc25b90a9659048ba3a9a178a45a3e536765f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 13:26:26 +0100 Subject: Update all misc plugins to the new identifier/description interface. Add _() where missing, for i18n. --- src/dxr3/dxr3_decode_spu.c | 20 ++++---------------- src/dxr3/dxr3_decode_video.c | 20 ++++---------------- src/dxr3/video_out_dxr3.c | 16 ++-------------- src/libffmpeg/ff_audio_decoder.c | 12 ++---------- src/libffmpeg/ff_dvaudio_decoder.c | 12 ++---------- src/libffmpeg/ff_video_decoder.c | 12 ++---------- src/libmpeg2/xine_mpeg2_decoder.c | 12 ++---------- src/libmpeg2new/xine_mpeg2new_decoder.c | 12 ++---------- src/libreal/xine_real_audio_decoder.c | 12 ++---------- src/libreal/xine_real_video_decoder.c | 12 ++---------- src/libspucc/xine_cc_decoder.c | 12 ++---------- src/libspucmml/xine_cmml_decoder.c | 12 ++---------- src/libspudec/xine_spu_decoder.c | 18 ++---------------- src/libspudvb/xine_spudvb_decoder.c | 14 ++------------ src/libsputext/demux_sputext.c | 4 ++-- src/libsputext/xine_sputext_decoder.c | 12 ++---------- src/libw32dll/qt_decoder.c | 24 ++++-------------------- src/libw32dll/w32codec.c | 24 ++++-------------------- src/vdr/input_vdr.c | 14 ++------------ src/vdr/post_vdr.h | 16 +++------------- src/vdr/post_vdr_audio.c | 16 ++-------------- src/vdr/post_vdr_video.c | 16 ++-------------- 22 files changed, 53 insertions(+), 269 deletions(-) diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index 139939d8e..ac0908266 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -80,8 +80,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { /* plugin class functions */ static spu_decoder_t *dxr3_spudec_open_plugin(spu_decoder_class_t *class_gen, xine_stream_t *stream); -static char *dxr3_spudec_get_identifier(spu_decoder_class_t *class_gen); -static char *dxr3_spudec_get_description(spu_decoder_class_t *class_gen); static void dxr3_spudec_class_dispose(spu_decoder_class_t *class_gen); /* plugin instance functions */ @@ -155,8 +153,8 @@ static inline int dxr3_present(xine_stream_t *stream) node = (plugin_node_t *)stream->video_driver->node; if (node->plugin_class) { vo_class = (video_driver_class_t *)node->plugin_class; - if (vo_class->get_identifier) - present = (strcmp(vo_class->get_identifier(vo_class), DXR3_VO_ID) == 0); + if (vo_class->identifier) + present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); } } llprintf(LOG_SPU, "dxr3 %s\n", present ? "present" : "not present"); @@ -202,8 +200,8 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void* data) if (!this) return NULL; this->spu_decoder_class.open_plugin = dxr3_spudec_open_plugin; - this->spu_decoder_class.get_identifier = dxr3_spudec_get_identifier; - this->spu_decoder_class.get_description = dxr3_spudec_get_description; + this->spu_decoder_class.identifier = "dxr3-spudec"; + this->spu_decoder_class.description = _("subtitle decoder plugin using the hardware decoding capabilities of a DXR3 decoder card"); this->spu_decoder_class.dispose = dxr3_spudec_class_dispose; this->instance = 0; @@ -275,16 +273,6 @@ static spu_decoder_t *dxr3_spudec_open_plugin(spu_decoder_class_t *class_gen, xi return &this->spu_decoder; } -static char *dxr3_spudec_get_identifier(spu_decoder_class_t *class_gen) -{ - return "dxr3-spudec"; -} - -static char *dxr3_spudec_get_description(spu_decoder_class_t *class_gen) -{ - return "subtitle decoder plugin using the hardware decoding capabilities of a DXR3 decoder card"; -} - static void dxr3_spudec_class_dispose(spu_decoder_class_t *class_gen) { free(class_gen); diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 3f1c273ff..71c7fe8d7 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -81,8 +81,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { /* plugin class functions */ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_stream_t *stream); -static char *dxr3_get_identifier(video_decoder_class_t *class_gen); -static char *dxr3_get_description(video_decoder_class_t *class_gen); static void dxr3_class_dispose(video_decoder_class_t *class_gen); /* plugin instance functions */ @@ -169,8 +167,8 @@ static inline int dxr3_present(xine_stream_t *stream) node = (plugin_node_t *)stream->video_driver->node; if (node->plugin_class) { vo_class = (video_driver_class_t *)node->plugin_class; - if (vo_class->get_identifier) - present = (strcmp(vo_class->get_identifier(vo_class), DXR3_VO_ID) == 0); + if (vo_class->identifier) + present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); } } llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present"); @@ -197,8 +195,8 @@ static void *dxr3_init_plugin(xine_t *xine, void *data) if (!this) return NULL; this->video_decoder_class.open_plugin = dxr3_open_plugin; - this->video_decoder_class.get_identifier = dxr3_get_identifier; - this->video_decoder_class.get_description = dxr3_get_description; + this->video_decoder_class.identifier = "dxr3-mpeg2"; + this->video_decoder_class.description = _("MPEGI/II decoder plugin using the hardware decoding capabilities of a DXR3 decoder card."); this->video_decoder_class.dispose = dxr3_class_dispose; this->instance = 0; @@ -299,16 +297,6 @@ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_ return &this->video_decoder; } -static char *dxr3_get_identifier(video_decoder_class_t *class_gen) -{ - return "dxr3-mpeg2"; -} - -static char *dxr3_get_description(video_decoder_class_t *class_gen) -{ - return "MPEGI/II decoder plugin using the hardware decoding capabilities of a DXR3 decoder card."; -} - static void dxr3_class_dispose(video_decoder_class_t *class_gen) { free(class_gen); diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 73eb133e1..c8b95febd 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -101,8 +101,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { /* plugin class functions */ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const void *visual); -static char *dxr3_vo_get_identifier(video_driver_class_t *class_gen); -static char *dxr3_vo_get_description(video_driver_class_t *class_gen); static void dxr3_vo_class_dispose(video_driver_class_t *class_gen); /* plugin instance functions */ @@ -176,8 +174,8 @@ static dxr3_driver_class_t *dxr3_vo_init_plugin(xine_t *xine, void *visual_gen) CONF_KEY, 0, CONF_NAME, CONF_HELP, 10, NULL, NULL); this->video_driver_class.open_plugin = dxr3_vo_open_plugin; - this->video_driver_class.get_identifier = dxr3_vo_get_identifier; - this->video_driver_class.get_description = dxr3_vo_get_description; + this->video_driver_class.identifier = DXR3_VO_ID; + this->video_driver_class.description = _("video output plugin displaying images through your DXR3 decoder card"); this->video_driver_class.dispose = dxr3_vo_class_dispose; this->xine = xine; @@ -189,16 +187,6 @@ static dxr3_driver_class_t *dxr3_vo_init_plugin(xine_t *xine, void *visual_gen) return this; } -static char *dxr3_vo_get_identifier(video_driver_class_t *class_gen) -{ - return DXR3_VO_ID; -} - -static char *dxr3_vo_get_description(video_driver_class_t *class_gen) -{ - return "video output plugin displaying images through your DXR3 decoder card"; -} - static void dxr3_vo_class_dispose(video_driver_class_t *class_gen) { dxr3_driver_class_t *class = (dxr3_driver_class_t *)class_gen; diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c index b9762c66b..bbfb07c6e 100644 --- a/src/libffmpeg/ff_audio_decoder.c +++ b/src/libffmpeg/ff_audio_decoder.c @@ -415,14 +415,6 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen, return &this->audio_decoder; } -static char *ff_audio_get_identifier (audio_decoder_class_t *this) { - return "ffmpeg audio"; -} - -static char *ff_audio_get_description (audio_decoder_class_t *this) { - return "ffmpeg based audio decoder plugin"; -} - static void ff_audio_dispose_class (audio_decoder_class_t *this) { free (this); } @@ -434,8 +426,8 @@ void *init_audio_plugin (xine_t *xine, void *data) { this = (ff_audio_class_t *) xine_xmalloc (sizeof (ff_audio_class_t)); this->decoder_class.open_plugin = ff_audio_open_plugin; - this->decoder_class.get_identifier = ff_audio_get_identifier; - this->decoder_class.get_description = ff_audio_get_description; + this->decoder_class.identifier = "ffmpeg audio"; + this->decoder_class.description = _("ffmpeg based audio decoder plugin"); this->decoder_class.dispose = ff_audio_dispose_class; pthread_once( &once_control, init_once_routine ); diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index 08ddf4e30..0eb0d2732 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -377,14 +377,6 @@ static audio_decoder_t *dvaudio_open_plugin (audio_decoder_class_t *class_gen, x return &this->audio_decoder; } -static char *dvaudio_get_identifier (audio_decoder_class_t *this) { - return "dv audio"; -} - -static char *dvaudio_get_description (audio_decoder_class_t *this) { - return "dv audio decoder plugin"; -} - static void dvaudio_dispose_class (audio_decoder_class_t *this) { free (this); } @@ -396,8 +388,8 @@ static void *init_dvaudio_plugin (xine_t *xine, void *data) { this = (dvaudio_class_t *) xine_xmalloc (sizeof (dvaudio_class_t)); this->decoder_class.open_plugin = dvaudio_open_plugin; - this->decoder_class.get_identifier = dvaudio_get_identifier; - this->decoder_class.get_description = dvaudio_get_description; + this->decoder_class.identifier = "dv audio"; + this->decoder_class.description = _("dv audio decoder plugin"); this->decoder_class.dispose = dvaudio_dispose_class; return this; diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index df0973030..9b55db919 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -1524,14 +1524,6 @@ static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen, return &this->video_decoder; } -static char *ff_video_get_identifier (video_decoder_class_t *this) { - return "ffmpeg video"; -} - -static char *ff_video_get_description (video_decoder_class_t *this) { - return "ffmpeg based video decoder plugin"; -} - static void ff_video_dispose_class (video_decoder_class_t *this) { free (this); } @@ -1544,8 +1536,8 @@ void *init_video_plugin (xine_t *xine, void *data) { this = (ff_video_class_t *) xine_xmalloc (sizeof (ff_video_class_t)); this->decoder_class.open_plugin = ff_video_open_plugin; - this->decoder_class.get_identifier = ff_video_get_identifier; - this->decoder_class.get_description = ff_video_get_description; + this->decoder_class.identifier = "ffmpeg video"; + this->decoder_class.description = _("ffmpeg based video decoder plugin"); this->decoder_class.dispose = ff_video_dispose_class; this->xine = xine; diff --git a/src/libmpeg2/xine_mpeg2_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c index 4c4cc8654..ea3af9762 100644 --- a/src/libmpeg2/xine_mpeg2_decoder.c +++ b/src/libmpeg2/xine_mpeg2_decoder.c @@ -139,14 +139,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre * mpeg2 plugin class */ -static char *get_identifier (video_decoder_class_t *this) { - return "mpeg2dec"; -} - -static char *get_description (video_decoder_class_t *this) { - return "mpeg2 based video decoder plugin"; -} - static void dispose_class (video_decoder_class_t *this) { free (this); } @@ -158,8 +150,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (mpeg2_class_t *) xine_xmalloc (sizeof (mpeg2_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "mpeg2dec"; + this->decoder_class.description = _("mpeg2 based video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libmpeg2new/xine_mpeg2new_decoder.c b/src/libmpeg2new/xine_mpeg2new_decoder.c index 7ceac9178..8443eca79 100644 --- a/src/libmpeg2new/xine_mpeg2new_decoder.c +++ b/src/libmpeg2new/xine_mpeg2new_decoder.c @@ -474,14 +474,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre * mpeg2 plugin class */ -static char *get_identifier (video_decoder_class_t *this) { - return "mpeg2new"; -} - -static char *get_description (video_decoder_class_t *this) { - return "mpeg2 based video decoder plugin"; -} - static void dispose_class (video_decoder_class_t *this) { free (this); } @@ -493,8 +485,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (mpeg2_class_t *) xine_xmalloc (sizeof (mpeg2_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "mpeg2new"; + this->decoder_class.description = _("mpeg2 based video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c index 1b21de2d0..ddf399b54 100644 --- a/src/libreal/xine_real_audio_decoder.c +++ b/src/libreal/xine_real_audio_decoder.c @@ -583,14 +583,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, * real plugin class */ -static char *get_identifier (audio_decoder_class_t *this) { - return "realadec"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "real binary-only codec based audio decoder plugin"; -} - static void dispose_class (audio_decoder_class_t *this) { free (this); } @@ -603,8 +595,8 @@ void *init_realadec (xine_t *xine, void *data) { this = (real_class_t *) xine_xmalloc (sizeof (real_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "realadec"; + this->decoder_class.description = _("real binary-only codec based audio decoder plugin"); this->decoder_class.dispose = dispose_class; _x_real_codecs_init(xine); diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c index d68c7390e..7763cf680 100644 --- a/src/libreal/xine_real_video_decoder.c +++ b/src/libreal/xine_real_video_decoder.c @@ -511,14 +511,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, * real plugin class */ -static char *get_identifier (video_decoder_class_t *this) { - return "realvdec"; -} - -static char *get_description (video_decoder_class_t *this) { - return "real binary-only codec based video decoder plugin"; -} - static void dispose_class (video_decoder_class_t *this) { free (this); } @@ -531,8 +523,8 @@ void *init_realvdec (xine_t *xine, void *data) { this = (real_class_t *) xine_xmalloc (sizeof (real_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "realvdec"; + this->decoder_class.description = _("real binary-only codec based video decoder plugin"); this->decoder_class.dispose = dispose_class; _x_real_codecs_init(xine); diff --git a/src/libspucc/xine_cc_decoder.c b/src/libspucc/xine_cc_decoder.c index 9cdb4c4ea..3891fb76a 100644 --- a/src/libspucc/xine_cc_decoder.c +++ b/src/libspucc/xine_cc_decoder.c @@ -321,14 +321,6 @@ static spu_decoder_t *spudec_open_plugin (spu_decoder_class_t *class, xine_strea return &this->spu_decoder; } -static char *spudec_get_identifier(spu_decoder_class_t *class) { - return "spucc"; -} - -static char *spudec_get_description(spu_decoder_class_t *class) { - return "closed caption decoder plugin"; -} - static void spudec_class_dispose(spu_decoder_class_t *class) { free(class); } @@ -341,8 +333,8 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this = (spucc_class_t *) xine_xmalloc (sizeof (spucc_class_t)); this->spu_class.open_plugin = spudec_open_plugin; - this->spu_class.get_identifier = spudec_get_identifier; - this->spu_class.get_description = spudec_get_description; + this->spu_class.identifier = "spucc"; + this->spu_class.description = _("closed caption decoder plugin"); this->spu_class.dispose = spudec_class_dispose; spucc_register_cfg_vars(this, xine->config); diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c index b684d21cb..5daf5e7fc 100644 --- a/src/libspucmml/xine_cmml_decoder.c +++ b/src/libspucmml/xine_cmml_decoder.c @@ -494,14 +494,6 @@ static void spucmml_class_dispose (spu_decoder_class_t *this) { free (this); } -static char *spucmml_class_get_identifier (spu_decoder_class_t *this) { - return "spucmml"; -} - -static char *spucmml_class_get_description (spu_decoder_class_t *this) { - return "CMML subtitle decoder plugin"; -} - static void update_src_encoding(void *this_gen, xine_cfg_entry_t *entry) { spucmml_class_t *this = (spucmml_class_t *)this_gen; @@ -517,8 +509,8 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this = (spucmml_class_t *) xine_xmalloc (sizeof (spucmml_class_t)); this->class.open_plugin = spucmml_class_open_plugin; - this->class.get_identifier = spucmml_class_get_identifier; - this->class.get_description = spucmml_class_get_description; + this->class.identifier = "spucmml"; + this->class.description = _("CMML subtitle decoder plugin"); this->class.dispose = spucmml_class_dispose; this->xine = xine; diff --git a/src/libspudec/xine_spu_decoder.c b/src/libspudec/xine_spu_decoder.c index 0ab91d906..cac5a8d09 100644 --- a/src/libspudec/xine_spu_decoder.c +++ b/src/libspudec/xine_spu_decoder.c @@ -350,20 +350,6 @@ static spu_decoder_t *open_plugin (spu_decoder_class_t *class_gen, xine_stream_t return &this->spu_decoder; } -static char *get_identifier (spu_decoder_class_t *this) { -#ifdef LOG_DEBUG - printf ("libspudec:get_identifier called\n"); -#endif - return "spudec"; -} - -static char *get_description (spu_decoder_class_t *this) { -#ifdef LOG_DEBUG - printf ("libspudec:get_description called\n"); -#endif - return "DVD/VOB SPU decoder plugin"; -} - static void dispose_class (spu_decoder_class_t *this) { #ifdef LOG_DEBUG printf ("libspudec:dispose_class called\n"); @@ -379,8 +365,8 @@ static void *init_plugin (xine_t *xine, void *data) { this = (spudec_class_t *) xine_xmalloc (sizeof (spudec_class_t)); this->decoder_class.open_plugin = open_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "spudec"; + this->decoder_class.description = _("DVD/VOB SPU decoder plugin"); this->decoder_class.dispose = dispose_class; lprintf ("libspudec:init_plugin called\n"); diff --git a/src/libspudvb/xine_spudvb_decoder.c b/src/libspudvb/xine_spudvb_decoder.c index af9000a0b..29554699a 100644 --- a/src/libspudvb/xine_spudvb_decoder.c +++ b/src/libspudvb/xine_spudvb_decoder.c @@ -971,16 +971,6 @@ static void dvb_spu_class_dispose (spu_decoder_class_t * this) free (this); } -static char *dvb_spu_class_get_identifier (spu_decoder_class_t * this) -{ - return "spudvb"; -} - -static char *dvb_spu_class_get_description (spu_decoder_class_t * this) -{ - return "DVB subtitle decoder plugin"; -} - static void *init_spu_decoder_plugin (xine_t * xine, void *data) { @@ -988,8 +978,8 @@ static void *init_spu_decoder_plugin (xine_t * xine, void *data) this = (dvb_spu_class_t *) xine_xmalloc (sizeof (dvb_spu_class_t)); this->class.open_plugin = dvb_spu_class_open_plugin; - this->class.get_identifier = dvb_spu_class_get_identifier; - this->class.get_description = dvb_spu_class_get_description; + this->class.identifier = "spudvb"; + this->class.description = _("DVB subtitle decoder plugin"); this->class.dispose = dvb_spu_class_dispose; this->xine = xine; diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index 502ef6580..161bb10d3 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.c @@ -1488,8 +1488,8 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_sputext_class_t)); this->demux_class.open_plugin = open_demux_plugin; - this->demux_class.get_description = get_demux_description; - this->demux_class.get_identifier = get_demux_identifier; + this->demux_class.description = FLAMEFIXMEget_demux_description; + this->demux_class.identifier = FLAMEFIXMEget_demux_identifier; this->demux_class.get_mimetypes = get_demux_mimetypes; this->demux_class.get_extensions = get_demux_extensions; this->demux_class.dispose = demux_class_dispose; diff --git a/src/libsputext/xine_sputext_decoder.c b/src/libsputext/xine_sputext_decoder.c index dabb2dddc..d21e8dd6f 100644 --- a/src/libsputext/xine_sputext_decoder.c +++ b/src/libsputext/xine_sputext_decoder.c @@ -887,14 +887,6 @@ static void sputext_class_dispose (spu_decoder_class_t *class_gen) { free (this); } -static char *sputext_class_get_identifier (spu_decoder_class_t *this) { - return "sputext"; -} - -static char *sputext_class_get_description (spu_decoder_class_t *this) { - return "external subtitle decoder plugin"; -} - static void update_src_encoding(void *class_gen, xine_cfg_entry_t *entry) { sputext_class_t *class = (sputext_class_t *)class_gen; @@ -915,8 +907,8 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this = (sputext_class_t *) xine_xmalloc (sizeof (sputext_class_t)); this->class.open_plugin = sputext_class_open_plugin; - this->class.get_identifier = sputext_class_get_identifier; - this->class.get_description = sputext_class_get_description; + this->class.identifier = "sputext"; + this->class.description = _("external subtitle decoder plugin"); this->class.dispose = sputext_class_dispose; this->xine = xine; diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index 3053b2b68..2bb5286b2 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.c @@ -570,14 +570,6 @@ static audio_decoder_t *qta_open_plugin (audio_decoder_class_t *class_gen, * qta plugin class */ -static char *qta_get_identifier (audio_decoder_class_t *this) { - return "qta"; -} - -static char *qta_get_description (audio_decoder_class_t *this) { - return "quicktime audio decoder plugin"; -} - static void qta_dispose_class (audio_decoder_class_t *this) { free (this); } @@ -595,8 +587,8 @@ static void *qta_init_class (xine_t *xine, void *data) { this = (qta_class_t *) xine_xmalloc (sizeof (qta_class_t)); this->decoder_class.open_plugin = qta_open_plugin; - this->decoder_class.get_identifier = qta_get_identifier; - this->decoder_class.get_description = qta_get_description; + this->decoder_class.identifier = "qta"; + this->decoder_class.description = _("quicktime audio decoder plugin"); this->decoder_class.dispose = qta_dispose_class; return this; @@ -1081,14 +1073,6 @@ static video_decoder_t *qtv_open_plugin (video_decoder_class_t *class_gen, * qtv plugin class */ -static char *qtv_get_identifier (video_decoder_class_t *this) { - return "qtvdec"; -} - -static char *qtv_get_description (video_decoder_class_t *this) { - return "quicktime binary-only codec based video decoder plugin"; -} - static void qtv_dispose_class (video_decoder_class_t *this) { free (this); } @@ -1119,8 +1103,8 @@ static void *qtv_init_class (xine_t *xine, void *data) { this = (qtv_class_t *) xine_xmalloc (sizeof (qtv_class_t)); this->decoder_class.open_plugin = qtv_open_plugin; - this->decoder_class.get_identifier = qtv_get_identifier; - this->decoder_class.get_description = qtv_get_description; + this->decoder_class.identifier = "qtvdec"; + this->decoder_class.description = _("quicktime binary-only codec based video decoder plugin"); this->decoder_class.dispose = qtv_dispose_class; return this; diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 88790ebc7..48556f4ad 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -1568,14 +1568,6 @@ static video_decoder_t *open_video_decoder_plugin (video_decoder_class_t *class_ * video decoder class */ -static char *get_video_identifier (video_decoder_class_t *this) { - return "w32v"; -} - -static char *get_video_description (video_decoder_class_t *this) { - return "win32 binary video codec plugin"; -} - static void dispose_video_class (video_decoder_class_t *this) { free (this); } @@ -1596,8 +1588,8 @@ static void *init_video_decoder_class (xine_t *xine, void *data) { this = (w32v_class_t *) xine_xmalloc (sizeof (w32v_class_t)); this->decoder_class.open_plugin = open_video_decoder_plugin; - this->decoder_class.get_identifier = get_video_identifier; - this->decoder_class.get_description = get_video_description; + this->decoder_class.identifier = "w32v"; + this->decoder_class.description = _("win32 binary video codec plugin"); this->decoder_class.dispose = dispose_video_class; pthread_once (&once_control, init_routine); @@ -1635,14 +1627,6 @@ static audio_decoder_t *open_audio_decoder_plugin (audio_decoder_class_t *class_ * audio decoder plugin class */ -static char *get_identifier (audio_decoder_class_t *this) { - return "win32 audio"; -} - -static char *get_description (audio_decoder_class_t *this) { - return "win32 binary audio codec plugin"; -} - static void dispose_class (audio_decoder_class_t *this) { free (this); } @@ -1658,8 +1642,8 @@ static void *init_audio_decoder_class (xine_t *xine, void *data) { this = (w32a_class_t *) xine_xmalloc (sizeof (w32a_class_t)); this->decoder_class.open_plugin = open_audio_decoder_plugin; - this->decoder_class.get_identifier = get_identifier; - this->decoder_class.get_description = get_description; + this->decoder_class.identifier = "win32 audio"; + this->decoder_class.description = _("win32 binary audio codec plugin"); this->decoder_class.dispose = dispose_class; pthread_once (&once_control, init_routine); diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c index 069eb734a..9a1ec0f8e 100644 --- a/src/vdr/input_vdr.c +++ b/src/vdr/input_vdr.c @@ -2628,16 +2628,6 @@ static input_plugin_t *vdr_class_get_instance(input_class_t *cls_gen, xine_strea * vdr input plugin class stuff */ -static const char *vdr_class_get_description(input_class_t *this_gen) -{ - return _("VDR display device plugin"); -} - -static const char *vdr_class_get_identifier (input_class_t *this_gen) -{ - return "VDR"; -} - static void vdr_class_dispose (input_class_t *this_gen) { vdr_input_class_t *this = (vdr_input_class_t *)this_gen; @@ -2668,8 +2658,8 @@ static void *init_class(xine_t *xine, void *data) this->mrls[ 1 ] = 0; this->input_class.get_instance = vdr_class_get_instance; - this->input_class.get_identifier = vdr_class_get_identifier; - this->input_class.get_description = vdr_class_get_description; + this->input_class.identifier = "VDR"; + this->input_class.description = _("VDR display device plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = vdr_class_get_autoplay_list; this->input_class.dispose = vdr_class_dispose; diff --git a/src/vdr/post_vdr.h b/src/vdr/post_vdr.h index b16a2d2df..46aa8dcb3 100644 --- a/src/vdr/post_vdr.h +++ b/src/vdr/post_vdr.h @@ -62,19 +62,9 @@ inline static int vdr_is_vdr_stream(xine_stream_t *stream) return 0; } - { - input_class_t *input_class = stream->input_plugin->input_class; - - if (input_class->get_identifier) - { - const char *identifier = input_class->get_identifier(input_class); - if (identifier - && 0 == strcmp(identifier, "VDR")) - { - return 1; - } - } - } + if (stream->input_plugin->input_class->identifier && + strcmp(stream->input_plugin->input_class->identifier, "VDR")) + return 1; return 0; } diff --git a/src/vdr/post_vdr_audio.c b/src/vdr/post_vdr_audio.c index 9248e9c45..6ebefd70e 100644 --- a/src/vdr/post_vdr_audio.c +++ b/src/vdr/post_vdr_audio.c @@ -58,8 +58,6 @@ static void vdr_audio_select_audio(vdr_audio_post_plugin_t *this, uint8_t channe static post_plugin_t *vdr_audio_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *vdr_audio_get_identifier(post_class_t *class_gen); -static char *vdr_audio_get_description(post_class_t *class_gen); static void vdr_audio_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -80,8 +78,8 @@ void *vdr_audio_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = vdr_audio_open_plugin; - class->get_identifier = vdr_audio_get_identifier; - class->get_description = vdr_audio_get_description; + class->identifier = "vdr_audio"; + class->description = _("modifies every audio frame as requested by VDR"); class->dispose = vdr_audio_class_dispose; return class; @@ -120,16 +118,6 @@ fprintf(stderr, "~~~~~~~~~~ vdr open plugin\n"); return &this->post_plugin; } -static char *vdr_audio_get_identifier(post_class_t *class_gen) -{ - return "vdr_audio"; -} - -static char *vdr_audio_get_description(post_class_t *class_gen) -{ - return "modifies every audio frame as requested by VDR"; -} - static void vdr_audio_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/vdr/post_vdr_video.c b/src/vdr/post_vdr_video.c index 85536819a..ae02c31e0 100644 --- a/src/vdr/post_vdr_video.c +++ b/src/vdr/post_vdr_video.c @@ -81,8 +81,6 @@ static void vdr_video_set_video_window(vdr_video_post_plugin_t *this, int32_t x, static post_plugin_t *vdr_video_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *vdr_video_get_identifier(post_class_t *class_gen); -static char *vdr_video_get_description(post_class_t *class_gen); static void vdr_video_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -103,8 +101,8 @@ void *vdr_video_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = vdr_video_open_plugin; - class->get_identifier = vdr_video_get_identifier; - class->get_description = vdr_video_get_description; + class->identifier = "vdr"; + class->description = _("modifies every video frame as requested by VDR"); class->dispose = vdr_video_class_dispose; return class; @@ -146,16 +144,6 @@ static post_plugin_t *vdr_video_open_plugin(post_class_t *class_gen, int inputs, return &this->post_plugin; } -static char *vdr_video_get_identifier(post_class_t *class_gen) -{ - return "vdr"; -} - -static char *vdr_video_get_description(post_class_t *class_gen) -{ - return "modifies every video frame as requested by VDR"; -} - static void vdr_video_class_dispose(post_class_t *class_gen) { free(class_gen); -- cgit v1.2.3 From 6834a34aeb2da67dc0d1bb4c73133625cd34fc95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 13:33:26 +0100 Subject: Update libsputext demuxer, which I forgot on the previous run. --- src/libsputext/demux_sputext.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index 161bb10d3..a1b1d93a2 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.c @@ -1448,14 +1448,6 @@ static demux_plugin_t *open_demux_plugin (demux_class_t *class_gen, xine_stream_ return NULL; } -static const char *get_demux_description (demux_class_t *this_gen) { - return "sputext demuxer plugin"; -} - -static const char *get_demux_identifier (demux_class_t *this_gen) { - return "sputext"; -} - static const char *get_demux_extensions (demux_class_t *this_gen) { return "asc txt sub srt smi ssa"; } @@ -1488,8 +1480,8 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_sputext_class_t)); this->demux_class.open_plugin = open_demux_plugin; - this->demux_class.description = FLAMEFIXMEget_demux_description; - this->demux_class.identifier = FLAMEFIXMEget_demux_identifier; + this->demux_class.description = _("sputext demuxer plugin"); + this->demux_class.identifier = "sputext"; this->demux_class.get_mimetypes = get_demux_mimetypes; this->demux_class.get_extensions = get_demux_extensions; this->demux_class.dispose = demux_class_dispose; -- cgit v1.2.3 From b3419984efb0af7b31c9faebb779ee412e3d02f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 13:44:10 +0100 Subject: Update all post plugins to the new identifier/description interface. Add _() where missing, for i18n. --- src/post/audio/stretch.c | 14 ++------------ src/post/audio/upmix.c | 14 ++------------ src/post/audio/upmix_mono.c | 14 ++------------ src/post/audio/volnorm.c | 14 ++------------ src/post/deinterlace/xine_plugin.c | 16 ++-------------- src/post/goom/xine_goom.c | 16 ++-------------- src/post/mosaico/mosaico.c | 16 ++-------------- src/post/mosaico/switch.c | 16 ++-------------- src/post/planar/boxblur.c | 16 ++-------------- src/post/planar/denoise3d.c | 16 ++-------------- src/post/planar/eq.c | 16 ++-------------- src/post/planar/eq2.c | 16 ++-------------- src/post/planar/expand.c | 16 ++-------------- src/post/planar/fill.c | 16 ++-------------- src/post/planar/invert.c | 16 ++-------------- src/post/planar/noise.c | 16 ++-------------- src/post/planar/pp.c | 16 ++-------------- src/post/planar/unsharp.c | 16 ++-------------- src/post/visualizations/fftgraph.c | 14 ++------------ src/post/visualizations/fftscope.c | 14 ++------------ src/post/visualizations/fooviz.c | 14 ++------------ src/post/visualizations/oscope.c | 14 ++------------ 22 files changed, 44 insertions(+), 292 deletions(-) diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c index 5aa7a0617..455001deb 100644 --- a/src/post/audio/stretch.c +++ b/src/post/audio/stretch.c @@ -659,16 +659,6 @@ static post_plugin_t *stretch_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *stretch_get_identifier(post_class_t *class_gen) -{ - return "stretch"; -} - -static char *stretch_get_description(post_class_t *class_gen) -{ - return "Time stretch by a given factor, optionally preserving pitch"; -} - static void stretch_class_dispose(post_class_t *class_gen) { free(class_gen); @@ -683,8 +673,8 @@ void *stretch_init_plugin(xine_t *xine, void *data) return NULL; class->post_class.open_plugin = stretch_open_plugin; - class->post_class.get_identifier = stretch_get_identifier; - class->post_class.get_description = stretch_get_description; + class->post_class.identifier = "stretch"; + class->post_class.description = _("Time stretch by a given factor, optionally preserving pitch"); class->post_class.dispose = stretch_class_dispose; class->xine = xine; diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index e1b2afbe3..e2c9f84a3 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -414,16 +414,6 @@ static post_plugin_t *upmix_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *upmix_get_identifier(post_class_t *class_gen) -{ - return "upmix"; -} - -static char *upmix_get_description(post_class_t *class_gen) -{ - return "upmix"; -} - static void upmix_class_dispose(post_class_t *class_gen) { free(class_gen); @@ -438,8 +428,8 @@ void *upmix_init_plugin(xine_t *xine, void *data) return NULL; class->post_class.open_plugin = upmix_open_plugin; - class->post_class.get_identifier = upmix_get_identifier; - class->post_class.get_description = upmix_get_description; + class->post_class.identifier = "upmix"; + class->post_class.description = _("upmix"); class->post_class.dispose = upmix_class_dispose; class->xine = xine; diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c index 195831123..dad9e5274 100644 --- a/src/post/audio/upmix_mono.c +++ b/src/post/audio/upmix_mono.c @@ -329,16 +329,6 @@ static post_plugin_t *upmix_mono_open_plugin(post_class_t *class_gen, int inputs return &this->post; } -static char *upmix_mono_get_identifier(post_class_t *class_gen) -{ - return "upmix_mono"; -} - -static char *upmix_mono_get_description(post_class_t *class_gen) -{ - return "converts Mono into Stereo"; -} - static void upmix_mono_class_dispose(post_class_t *class_gen) { free(class_gen); @@ -353,8 +343,8 @@ void *upmix_mono_init_plugin(xine_t *xine, void *data) return NULL; class->post_class.open_plugin = upmix_mono_open_plugin; - class->post_class.get_identifier = upmix_mono_get_identifier; - class->post_class.get_description = upmix_mono_get_description; + class->post_class.identifier = "upmix_mono"; + class->post_class.description = _("converts Mono into Stereo"); class->post_class.dispose = upmix_mono_class_dispose; class->xine = xine; diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c index 783c1e26d..47cd400be 100644 --- a/src/post/audio/volnorm.c +++ b/src/post/audio/volnorm.c @@ -447,16 +447,6 @@ static post_plugin_t *volnorm_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *volnorm_get_identifier(post_class_t *class_gen) -{ - return "volnorm"; -} - -static char *volnorm_get_description(post_class_t *class_gen) -{ - return "Normalize volume"; -} - static void volnorm_class_dispose(post_class_t *class_gen) { free(class_gen); @@ -471,8 +461,8 @@ void *volnorm_init_plugin(xine_t *xine, void *data) return NULL; class->post_class.open_plugin = volnorm_open_plugin; - class->post_class.get_identifier = volnorm_get_identifier; - class->post_class.get_description = volnorm_get_description; + class->post_class.identifier = "volnorm"; + class->post_class.description = _("Normalize volume"); class->post_class.dispose = volnorm_class_dispose; class->xine = xine; diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index 99bd597f6..cbe024d19 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.c @@ -268,8 +268,6 @@ static xine_post_api_t post_api = { static post_plugin_t *deinterlace_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *deinterlace_get_identifier(post_class_t *class_gen); -static char *deinterlace_get_description(post_class_t *class_gen); static void deinterlace_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -299,8 +297,8 @@ static void *deinterlace_init_plugin(xine_t *xine, void *data) return NULL; class->class.open_plugin = deinterlace_open_plugin; - class->class.get_identifier = deinterlace_get_identifier; - class->class.get_description = deinterlace_get_description; + class->class.identifier = "tvtime"; + class->class.description = _("advanced deinterlacer plugin with pulldown detection"); class->class.dispose = deinterlace_class_dispose; @@ -412,16 +410,6 @@ static post_plugin_t *deinterlace_open_plugin(post_class_t *class_gen, int input return &this->post; } -static char *deinterlace_get_identifier(post_class_t *class_gen) -{ - return "tvtime"; -} - -static char *deinterlace_get_description(post_class_t *class_gen) -{ - return "advanced deinterlacer plugin with pulldown detection"; -} - static void deinterlace_class_dispose(post_class_t *class_gen) { xine_buffer_free(help_string); diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c index 351c997ba..4371785f5 100644 --- a/src/post/goom/xine_goom.c +++ b/src/post/goom/xine_goom.c @@ -125,8 +125,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { static post_plugin_t *goom_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *goom_get_identifier(post_class_t *class_gen); -static char *goom_get_description(post_class_t *class_gen); static void goom_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -194,8 +192,8 @@ static void *goom_init_plugin(xine_t *xine, void *data) return NULL; this->class.open_plugin = goom_open_plugin; - this->class.get_identifier = goom_get_identifier; - this->class.get_description = goom_get_description; + this->class.identifier = "goom"; + this->class.description = _("What a GOOM"); this->class.dispose = goom_class_dispose; this->ip = NULL; this->xine = xine; @@ -307,16 +305,6 @@ static post_plugin_t *goom_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *goom_get_identifier(post_class_t *class_gen) -{ - return "goom"; -} - -static char *goom_get_description(post_class_t *class_gen) -{ - return "What a GOOM"; -} - static void goom_class_dispose(post_class_t *class_gen) { post_class_goom_t *this = (post_class_goom_t*) class_gen; diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c index 05c1f5f19..af84dca8f 100644 --- a/src/post/mosaico/mosaico.c +++ b/src/post/mosaico/mosaico.c @@ -96,8 +96,6 @@ struct post_mosaico_s { static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *mosaico_get_identifier(post_class_t *class_gen); -static char *mosaico_get_description(post_class_t *class_gen); static void mosaico_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -128,8 +126,8 @@ static void *mosaico_init_plugin(xine_t *xine, void *data) return NULL; this->class.open_plugin = mosaico_open_plugin; - this->class.get_identifier = mosaico_get_identifier; - this->class.get_description = mosaico_get_description; + this->class.identifier = "mosaico"; + this->class.description = _("Mosaico is a picture in picture (pip) post plugin"); this->class.dispose = mosaico_class_dispose; this->xine = xine; @@ -202,16 +200,6 @@ static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *mosaico_get_identifier(post_class_t *class_gen) -{ - return "mosaico"; -} - -static char *mosaico_get_description(post_class_t *class_gen) -{ - return "Mosaico is a picture in picture (pip) post plugin"; -} - static void mosaico_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/mosaico/switch.c b/src/post/mosaico/switch.c index 8fec5ee77..3561226b1 100644 --- a/src/post/mosaico/switch.c +++ b/src/post/mosaico/switch.c @@ -82,8 +82,6 @@ struct post_switch_s { static post_plugin_t *switch_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *switch_get_identifier(post_class_t *class_gen); -static char *switch_get_description(post_class_t *class_gen); static void switch_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -107,8 +105,8 @@ static void *switch_init_plugin(xine_t *xine, void *data) return NULL; this->class.open_plugin = switch_open_plugin; - this->class.get_identifier = switch_get_identifier; - this->class.get_description = switch_get_description; + this->class.identifier = "switch"; + this->class.description = _("Switch is a post plugin able to switch at any time between different streams"); this->class.dispose = switch_class_dispose; this->xine = xine; @@ -168,16 +166,6 @@ static post_plugin_t *switch_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *switch_get_identifier(post_class_t *class_gen) -{ - return "switch"; -} - -static char *switch_get_description(post_class_t *class_gen) -{ - return "Switch is a post plugin able to switch at any time between different streams"; -} - static void switch_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c index b7a6f524f..dd22bef44 100644 --- a/src/post/planar/boxblur.c +++ b/src/post/planar/boxblur.c @@ -120,8 +120,6 @@ static xine_post_api_t post_api = { static post_plugin_t *boxblur_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *boxblur_get_identifier(post_class_t *class_gen); -static char *boxblur_get_description(post_class_t *class_gen); static void boxblur_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -142,8 +140,8 @@ void *boxblur_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = boxblur_open_plugin; - class->get_identifier = boxblur_get_identifier; - class->get_description = boxblur_get_description; + class->identifier = "boxblur"; + class->description = _("box blur filter from mplayer"); class->dispose = boxblur_class_dispose; return class; @@ -194,16 +192,6 @@ static post_plugin_t *boxblur_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *boxblur_get_identifier(post_class_t *class_gen) -{ - return "boxblur"; -} - -static char *boxblur_get_description(post_class_t *class_gen) -{ - return "box blur filter from mplayer"; -} - static void boxblur_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c index fb3c1102b..5bac53e52 100644 --- a/src/post/planar/denoise3d.c +++ b/src/post/planar/denoise3d.c @@ -157,8 +157,6 @@ static xine_post_api_t post_api = { static post_plugin_t *denoise3d_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *denoise3d_get_identifier(post_class_t *class_gen); -static char *denoise3d_get_description(post_class_t *class_gen); static void denoise3d_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -182,8 +180,8 @@ void *denoise3d_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = denoise3d_open_plugin; - class->get_identifier = denoise3d_get_identifier; - class->get_description = denoise3d_get_description; + class->identifier = "denoise3d"; + class->description = _("3D Denoiser (variable lowpass filter)"); class->dispose = denoise3d_class_dispose; return class; @@ -237,16 +235,6 @@ static post_plugin_t *denoise3d_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *denoise3d_get_identifier(post_class_t *class_gen) -{ - return "denoise3d"; -} - -static char *denoise3d_get_description(post_class_t *class_gen) -{ - return "3D Denoiser (variable lowpass filter)"; -} - static void denoise3d_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c index b2cf6e50f..bd1571603 100644 --- a/src/post/planar/eq.c +++ b/src/post/planar/eq.c @@ -208,8 +208,6 @@ static xine_post_api_t post_api = { static post_plugin_t *eq_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *eq_get_identifier(post_class_t *class_gen); -static char *eq_get_description(post_class_t *class_gen); static void eq_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -234,8 +232,8 @@ void *eq_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = eq_open_plugin; - class->get_identifier = eq_get_identifier; - class->get_description = eq_get_description; + class->identifier = "eq"; + class->description = _("soft video equalizer"); class->dispose = eq_class_dispose; return class; @@ -292,16 +290,6 @@ static post_plugin_t *eq_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *eq_get_identifier(post_class_t *class_gen) -{ - return "eq"; -} - -static char *eq_get_description(post_class_t *class_gen) -{ - return "soft video equalizer"; -} - static void eq_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c index 6b277c347..e33f6075b 100644 --- a/src/post/planar/eq2.c +++ b/src/post/planar/eq2.c @@ -389,8 +389,6 @@ static xine_post_api_t post_api = { static post_plugin_t *eq2_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *eq2_get_identifier(post_class_t *class_gen); -static char *eq2_get_description(post_class_t *class_gen); static void eq2_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -415,8 +413,8 @@ void *eq2_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = eq2_open_plugin; - class->get_identifier = eq2_get_identifier; - class->get_description = eq2_get_description; + class->identifier = "eq2"; + class->description = _("Software video equalizer"); class->dispose = eq2_class_dispose; return class; @@ -489,16 +487,6 @@ static post_plugin_t *eq2_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *eq2_get_identifier(post_class_t *class_gen) -{ - return "eq2"; -} - -static char *eq2_get_description(post_class_t *class_gen) -{ - return "Software video equalizer"; -} - static void eq2_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/planar/expand.c b/src/post/planar/expand.c index 67d449153..d654190f5 100644 --- a/src/post/planar/expand.c +++ b/src/post/planar/expand.c @@ -100,8 +100,6 @@ typedef struct post_expand_s { static post_plugin_t *expand_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *expand_get_identifier(post_class_t *class_gen); -static char *expand_get_description(post_class_t *class_gen); static void expand_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -136,8 +134,8 @@ void *expand_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = expand_open_plugin; - class->get_identifier = expand_get_identifier; - class->get_description = expand_get_description; + class->identifier = "expand"; + class->description = _("add black borders to top and bottom of video to expand it to 4:3 aspect ratio"); class->dispose = expand_class_dispose; return class; @@ -191,16 +189,6 @@ static post_plugin_t *expand_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *expand_get_identifier(post_class_t *class_gen) -{ - return "expand"; -} - -static char *expand_get_description(post_class_t *class_gen) -{ - return "add black borders to top and bottom of video to expand it to 4:3 aspect ratio"; -} - static void expand_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/planar/fill.c b/src/post/planar/fill.c index 32a9d5dfb..3406a57b1 100644 --- a/src/post/planar/fill.c +++ b/src/post/planar/fill.c @@ -32,8 +32,6 @@ void *fill_init_plugin(xine_t *xine, void *); static post_plugin_t *fill_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *fill_get_identifier(post_class_t *class_gen); -static char *fill_get_description(post_class_t *class_gen); static void fill_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -54,8 +52,8 @@ void *fill_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = fill_open_plugin; - class->get_identifier = fill_get_identifier; - class->get_description = fill_get_description; + class->identifier = "fill"; + class->description = _("crops left and right of video to fill 4:3 aspect ratio"); class->dispose = fill_class_dispose; return class; @@ -92,16 +90,6 @@ static post_plugin_t *fill_open_plugin(post_class_t *class_gen, int inputs, return this; } -static char *fill_get_identifier(post_class_t *class_gen) -{ - return "fill"; -} - -static char *fill_get_description(post_class_t *class_gen) -{ - return "crops left and right of video to fill 4:3 aspect ratio"; -} - static void fill_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c index 1aa5c2a2e..d8a83ee28 100644 --- a/src/post/planar/invert.c +++ b/src/post/planar/invert.c @@ -33,8 +33,6 @@ void *invert_init_plugin(xine_t *xine, void *); static post_plugin_t *invert_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *invert_get_identifier(post_class_t *class_gen); -static char *invert_get_description(post_class_t *class_gen); static void invert_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -55,8 +53,8 @@ void *invert_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = invert_open_plugin; - class->get_identifier = invert_get_identifier; - class->get_description = invert_get_description; + class->identifier = "invert"; + class->description = _("inverts the colours of every video frame"); class->dispose = invert_class_dispose; return class; @@ -91,16 +89,6 @@ static post_plugin_t *invert_open_plugin(post_class_t *class_gen, int inputs, return this; } -static char *invert_get_identifier(post_class_t *class_gen) -{ - return "invert"; -} - -static char *invert_get_description(post_class_t *class_gen) -{ - return "inverts the colours of every video frame"; -} - static void invert_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c index 8c04f2e72..31d61c62b 100644 --- a/src/post/planar/noise.c +++ b/src/post/planar/noise.c @@ -429,8 +429,6 @@ static xine_post_api_t post_api = { static post_plugin_t *noise_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *noise_get_identifier(post_class_t *class_gen); -static char *noise_get_description(post_class_t *class_gen); static void noise_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -451,8 +449,8 @@ void *noise_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = noise_open_plugin; - class->get_identifier = noise_get_identifier; - class->get_description = noise_get_description; + class->identifier = "noise"; + class->description = _("Adds noise"); class->dispose = noise_class_dispose; #ifdef ARCH_X86 @@ -515,16 +513,6 @@ static post_plugin_t *noise_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *noise_get_identifier(post_class_t *class_gen) -{ - return "noise"; -} - -static char *noise_get_description(post_class_t *class_gen) -{ - return "Adds noise"; -} - static void noise_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index e13119311..dead0e543 100644 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.c @@ -135,8 +135,6 @@ static xine_post_api_t post_api = { static post_plugin_t *pp_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *pp_get_identifier(post_class_t *class_gen); -static char *pp_get_description(post_class_t *class_gen); static void pp_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -157,8 +155,8 @@ void *pp_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = pp_open_plugin; - class->get_identifier = pp_get_identifier; - class->get_description = pp_get_description; + class->identifier = "pp"; + class->description = _("plugin for ffmpeg libpostprocess"); class->dispose = pp_class_dispose; return class; @@ -221,16 +219,6 @@ static post_plugin_t *pp_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *pp_get_identifier(post_class_t *class_gen) -{ - return "pp"; -} - -static char *pp_get_description(post_class_t *class_gen) -{ - return "plugin for ffmpeg libpostprocess"; -} - static void pp_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c index b9b791a8e..ffce45a91 100644 --- a/src/post/planar/unsharp.c +++ b/src/post/planar/unsharp.c @@ -253,8 +253,6 @@ static xine_post_api_t post_api = { static post_plugin_t *unsharp_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static char *unsharp_get_identifier(post_class_t *class_gen); -static char *unsharp_get_description(post_class_t *class_gen); static void unsharp_class_dispose(post_class_t *class_gen); /* plugin instance functions */ @@ -275,8 +273,8 @@ void *unsharp_init_plugin(xine_t *xine, void *data) return NULL; class->open_plugin = unsharp_open_plugin; - class->get_identifier = unsharp_get_identifier; - class->get_description = unsharp_get_description; + class->identifier = "unsharp"; + class->description = _("unsharp mask & gaussian blur"); class->dispose = unsharp_class_dispose; return class; @@ -332,16 +330,6 @@ static post_plugin_t *unsharp_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *unsharp_get_identifier(post_class_t *class_gen) -{ - return "unsharp"; -} - -static char *unsharp_get_description(post_class_t *class_gen) -{ - return "unsharp mask & gaussian blur"; -} - static void unsharp_class_dispose(post_class_t *class_gen) { free(class_gen); diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c index 5068bd37a..1194c956f 100644 --- a/src/post/visualizations/fftgraph.c +++ b/src/post/visualizations/fftgraph.c @@ -452,16 +452,6 @@ static post_plugin_t *fftgraph_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *fftgraph_get_identifier(post_class_t *class_gen) -{ - return "fftgraph"; -} - -static char *fftgraph_get_description(post_class_t *class_gen) -{ - return "fftgraph Visualization Post Plugin"; -} - static void fftgraph_class_dispose(post_class_t *class_gen) { free(class_gen); @@ -476,8 +466,8 @@ void *fftgraph_init_plugin(xine_t *xine, void *data) return NULL; class->post_class.open_plugin = fftgraph_open_plugin; - class->post_class.get_identifier = fftgraph_get_identifier; - class->post_class.get_description = fftgraph_get_description; + class->post_class.identifier = "fftgraph"; + class->post_class.description = _("fftgraph Visualization Post Plugin"); class->post_class.dispose = fftgraph_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c index ba34437f5..6f152f15c 100644 --- a/src/post/visualizations/fftscope.c +++ b/src/post/visualizations/fftscope.c @@ -473,16 +473,6 @@ static post_plugin_t *fftscope_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *fftscope_get_identifier(post_class_t *class_gen) -{ - return "FFT Scope"; -} - -static char *fftscope_get_description(post_class_t *class_gen) -{ - return "FFT Scope"; -} - static void fftscope_class_dispose(post_class_t *class_gen) { free(class_gen); @@ -497,8 +487,8 @@ void *fftscope_init_plugin(xine_t *xine, void *data) return NULL; class->post_class.open_plugin = fftscope_open_plugin; - class->post_class.get_identifier = fftscope_get_identifier; - class->post_class.get_description = fftscope_get_description; + class->post_class.identifier = "FFT Scope"; + class->post_class.description = _("FFT Scope"); class->post_class.dispose = fftscope_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c index 21854afc6..6b0a583be 100644 --- a/src/post/visualizations/fooviz.c +++ b/src/post/visualizations/fooviz.c @@ -284,16 +284,6 @@ static post_plugin_t *fooviz_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *fooviz_get_identifier(post_class_t *class_gen) -{ - return "fooviz"; -} - -static char *fooviz_get_description(post_class_t *class_gen) -{ - return "fooviz"; -} - static void fooviz_class_dispose(post_class_t *class_gen) { free(class_gen); @@ -308,8 +298,8 @@ static void *fooviz_init_plugin(xine_t *xine, void *data) return NULL; class->post_class.open_plugin = fooviz_open_plugin; - class->post_class.get_identifier = fooviz_get_identifier; - class->post_class.get_description = fooviz_get_description; + class->post_class.identifier = "fooviz"; + class->post_class.description = _("fooviz"); class->post_class.dispose = fooviz_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c index a435604d4..5c91472fa 100644 --- a/src/post/visualizations/oscope.c +++ b/src/post/visualizations/oscope.c @@ -355,16 +355,6 @@ static post_plugin_t *oscope_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *oscope_get_identifier(post_class_t *class_gen) -{ - return "Oscilloscope"; -} - -static char *oscope_get_description(post_class_t *class_gen) -{ - return "Oscilloscope"; -} - static void oscope_class_dispose(post_class_t *class_gen) { free(class_gen); @@ -379,8 +369,8 @@ void *oscope_init_plugin(xine_t *xine, void *data) return NULL; class->post_class.open_plugin = oscope_open_plugin; - class->post_class.get_identifier = oscope_get_identifier; - class->post_class.get_description = oscope_get_description; + class->post_class.identifier = "Oscilloscope"; + class->post_class.description = _("Oscilloscope"); class->post_class.dispose = oscope_class_dispose; class->xine = xine; -- cgit v1.2.3 From 5b812f5ae063e9e6dadb4eff65bbbe78e977c6f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 14:02:35 +0100 Subject: Add a textdomain field to allow using a different i18n catalog for the description translation. --- src/demuxers/demux.h | 5 +++++ src/input/input_plugin.h | 5 +++++ src/xine-engine/audio_decoder.h | 5 +++++ src/xine-engine/audio_out.h | 5 +++++ src/xine-engine/post.h | 5 +++++ src/xine-engine/spu_decoder.h | 5 +++++ src/xine-engine/video_decoder.h | 5 +++++ src/xine-engine/video_out.h | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index 301fe0f2b..0e57a535a 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -65,6 +65,11 @@ struct demux_class_s { */ const char *description; + /** + * @brief Optional non-standard catalog to use with dgettext() for description. + */ + const char *textdomain; + /* * return MIME types supported for this plugin */ diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index 31a4f9846..95df4be97 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -60,6 +60,11 @@ struct input_class_s { */ const char *description; + /** + * @brief Optional non-standard catalog to use with dgettext() for description. + */ + const char *textdomain; + /* * ls function, optional: may be NULL * return value: NULL => filename is a file, **char=> filename is a dir diff --git a/src/xine-engine/audio_decoder.h b/src/xine-engine/audio_decoder.h index 7ad46e2f8..df8556902 100644 --- a/src/xine-engine/audio_decoder.h +++ b/src/xine-engine/audio_decoder.h @@ -59,6 +59,11 @@ struct audio_decoder_class_s { */ const char *description; + /** + * @brief Optional non-standard catalog to use with dgettext() for description. + */ + const char *textdomain; + /* * free all class-related resources */ diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h index 415c47cc7..32d9d5813 100644 --- a/src/xine-engine/audio_out.h +++ b/src/xine-engine/audio_out.h @@ -249,6 +249,11 @@ struct audio_driver_class_s { */ const char *description; + /** + * @brief Optional non-standard catalog to use with dgettext() for description. + */ + const char *textdomain; + /* * free all class-related resources */ diff --git a/src/xine-engine/post.h b/src/xine-engine/post.h index 006daa20c..940f269e1 100644 --- a/src/xine-engine/post.h +++ b/src/xine-engine/post.h @@ -66,6 +66,11 @@ struct post_class_s { */ const char *description; + /** + * @brief Optional non-standard catalog to use with dgettext() for description. + */ + const char *textdomain; + /* * free all class-related resources */ diff --git a/src/xine-engine/spu_decoder.h b/src/xine-engine/spu_decoder.h index 7acd8618d..badf15e41 100644 --- a/src/xine-engine/spu_decoder.h +++ b/src/xine-engine/spu_decoder.h @@ -60,6 +60,11 @@ struct spu_decoder_class_s { */ const char *description; + /** + * @brief Optional non-standard catalog to use with dgettext() for description. + */ + const char *textdomain; + /* * free all class-related resources */ diff --git a/src/xine-engine/video_decoder.h b/src/xine-engine/video_decoder.h index 7dfd10a14..249b86b4c 100644 --- a/src/xine-engine/video_decoder.h +++ b/src/xine-engine/video_decoder.h @@ -60,6 +60,11 @@ struct video_decoder_class_s { */ const char *description; + /** + * @brief Optional non-standard catalog to use with dgettext() for description. + */ + const char *textdomain; + /* * free all class-related resources */ diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index 161fbd899..e81947276 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -381,6 +381,11 @@ struct video_driver_class_s { */ const char *description; + /** + * @brief Optional non-standard catalog to use with dgettext() for description. + */ + const char *textdomain; + /* * free all class-related resources */ -- cgit v1.2.3 From c17489d9fc412f779631fad1ad97b15fbffa5276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 14:03:29 +0100 Subject: Use dgettext to localise the description string for plugins. --- src/xine-engine/load_plugins.c | 2 +- src/xine-engine/xine.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 22d199295..3e6708e65 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -2299,7 +2299,7 @@ const char *const *xine_list_post_plugins_typed(xine_t *xine, uint32_t type) { else \ return NULL; \ } \ - return ic->description; \ + return dgettext(ic->textdomain ? : XINE_TEXTDOMAIN, ic->description); \ } \ } \ return NULL; \ diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index eb5d624e2..17ea5d679 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -862,7 +862,8 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { int res; xine_log (stream->xine, XINE_LOG_MSG, _("xine: found input plugin : %s\n"), - stream->input_plugin->input_class->description); + dgettext(stream->input_plugin->input_class->textdomain ? : XINE_TEXTDOMAIN, + stream->input_plugin->input_class->description)); if (stream->input_plugin->input_class->eject_media) stream->eject_class = stream->input_plugin->input_class; _x_meta_info_set_utf8(stream, XINE_META_INFO_INPUT_PLUGIN, @@ -1214,7 +1215,8 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { } xine_log (stream->xine, XINE_LOG_MSG, _("xine: found demuxer plugin: %s\n"), - stream->demux_plugin->demux_class->description); + dgettext(stream->demux_plugin->demux_class->textdomain ? : XINE_TEXTDOMAIN, + stream->demux_plugin->demux_class->description)); _x_extra_info_reset( stream->current_extra_info ); _x_extra_info_reset( stream->video_decoder_extra_info ); -- cgit v1.2.3 From e2a10c5fdaed1f45040fb3d737ab79f0e5d774d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 14:12:35 +0100 Subject: Use N_() rather than _(), passing the string just once to gettext(). This way the gettext code for description does not need to be repeated by every plugin. --- src/audio_out/audio_alsa_out.c | 2 +- src/audio_out/audio_coreaudio_out.c | 2 +- src/audio_out/audio_directx2_out.c | 2 +- src/audio_out/audio_directx_out.c | 2 +- src/audio_out/audio_esd_out.c | 2 +- src/audio_out/audio_file_out.c | 2 +- src/audio_out/audio_fusionsound_out.c | 2 +- src/audio_out/audio_jack_out.c | 2 +- src/audio_out/audio_oss_out.c | 2 +- src/audio_out/audio_pulse_out.c | 2 +- src/audio_out/audio_sun_out.c | 2 +- src/combined/flac_decoder.c | 2 +- src/combined/flac_demuxer.c | 2 +- src/combined/nsf_decoder.c | 2 +- src/combined/nsf_demuxer.c | 2 +- src/combined/wavpack_decoder.c | 2 +- src/combined/wavpack_demuxer.c | 2 +- src/combined/xine_ogg_demuxer.c | 4 ++-- src/combined/xine_speex_decoder.c | 2 +- src/combined/xine_theora_decoder.c | 2 +- src/combined/xine_vorbis_decoder.c | 2 +- src/demuxers/demux_4xm.c | 2 +- src/demuxers/demux_aac.c | 2 +- src/demuxers/demux_ac3.c | 2 +- src/demuxers/demux_aiff.c | 2 +- src/demuxers/demux_asf.c | 2 +- src/demuxers/demux_aud.c | 2 +- src/demuxers/demux_avi.c | 2 +- src/demuxers/demux_cdda.c | 2 +- src/demuxers/demux_dts.c | 2 +- src/demuxers/demux_eawve.c | 2 +- src/demuxers/demux_elem.c | 2 +- src/demuxers/demux_film.c | 2 +- src/demuxers/demux_flac.c | 2 +- src/demuxers/demux_fli.c | 2 +- src/demuxers/demux_flv.c | 2 +- src/demuxers/demux_idcin.c | 2 +- src/demuxers/demux_iff.c | 2 +- src/demuxers/demux_image.c | 2 +- src/demuxers/demux_ipmovie.c | 2 +- src/demuxers/demux_matroska.c | 2 +- src/demuxers/demux_mng.c | 2 +- src/demuxers/demux_mod.c | 2 +- src/demuxers/demux_mpc.c | 2 +- src/demuxers/demux_mpeg.c | 2 +- src/demuxers/demux_mpeg_block.c | 2 +- src/demuxers/demux_mpeg_pes.c | 2 +- src/demuxers/demux_mpgaudio.c | 2 +- src/demuxers/demux_nsv.c | 2 +- src/demuxers/demux_playlist.c | 2 +- src/demuxers/demux_pva.c | 2 +- src/demuxers/demux_qt.c | 2 +- src/demuxers/demux_rawdv.c | 2 +- src/demuxers/demux_real.c | 2 +- src/demuxers/demux_realaudio.c | 2 +- src/demuxers/demux_roq.c | 2 +- src/demuxers/demux_shn.c | 2 +- src/demuxers/demux_smjpeg.c | 2 +- src/demuxers/demux_snd.c | 2 +- src/demuxers/demux_str.c | 2 +- src/demuxers/demux_ts.c | 2 +- src/demuxers/demux_tta.c | 2 +- src/demuxers/demux_vmd.c | 2 +- src/demuxers/demux_voc.c | 2 +- src/demuxers/demux_vox.c | 2 +- src/demuxers/demux_vqa.c | 2 +- src/demuxers/demux_wav.c | 2 +- src/demuxers/demux_wc3movie.c | 2 +- src/demuxers/demux_yuv4mpeg2.c | 2 +- src/demuxers/demux_yuv_frames.c | 2 +- src/dxr3/dxr3_decode_spu.c | 2 +- src/dxr3/dxr3_decode_video.c | 2 +- src/dxr3/video_out_dxr3.c | 2 +- src/input/input_cdda.c | 2 +- src/input/input_dvb.c | 2 +- src/input/input_dvd.c | 2 +- src/input/input_file.c | 2 +- src/input/input_gnome_vfs.c | 2 +- src/input/input_http.c | 2 +- src/input/input_mms.c | 2 +- src/input/input_net.c | 2 +- src/input/input_pnm.c | 2 +- src/input/input_pvr.c | 2 +- src/input/input_rtp.c | 2 +- src/input/input_rtsp.c | 2 +- src/input/input_smb.c | 2 +- src/input/input_stdin_fifo.c | 2 +- src/input/input_v4l.c | 4 ++-- src/input/input_vcd.c | 2 +- src/input/vcd/xineplug_inp_vcd.c | 2 +- src/libffmpeg/ff_audio_decoder.c | 2 +- src/libffmpeg/ff_dvaudio_decoder.c | 2 +- src/libffmpeg/ff_video_decoder.c | 2 +- src/libmpeg2/xine_mpeg2_decoder.c | 2 +- src/libmpeg2new/xine_mpeg2new_decoder.c | 2 +- src/libreal/xine_real_audio_decoder.c | 2 +- src/libreal/xine_real_video_decoder.c | 2 +- src/libspucc/xine_cc_decoder.c | 2 +- src/libspucmml/xine_cmml_decoder.c | 2 +- src/libspudec/xine_spu_decoder.c | 2 +- src/libspudvb/xine_spudvb_decoder.c | 2 +- src/libsputext/demux_sputext.c | 2 +- src/libsputext/xine_sputext_decoder.c | 2 +- src/libw32dll/qt_decoder.c | 4 ++-- src/libw32dll/w32codec.c | 4 ++-- src/libxineadec/fooaudio.c | 2 +- src/libxineadec/gsm610.c | 2 +- src/libxineadec/xine_a52_decoder.c | 2 +- src/libxineadec/xine_dts_decoder.c | 2 +- src/libxineadec/xine_faad_decoder.c | 2 +- src/libxineadec/xine_lpcm_decoder.c | 2 +- src/libxineadec/xine_mad_decoder.c | 2 +- src/libxineadec/xine_musepack_decoder.c | 2 +- src/libxinevdec/bitplane.c | 2 +- src/libxinevdec/foovideo.c | 2 +- src/libxinevdec/gdkpixbuf.c | 2 +- src/libxinevdec/image.c | 2 +- src/libxinevdec/rgb.c | 2 +- src/libxinevdec/yuv.c | 2 +- src/post/audio/stretch.c | 2 +- src/post/audio/upmix.c | 2 +- src/post/audio/upmix_mono.c | 2 +- src/post/audio/volnorm.c | 2 +- src/post/deinterlace/xine_plugin.c | 2 +- src/post/goom/xine_goom.c | 2 +- src/post/mosaico/mosaico.c | 2 +- src/post/mosaico/switch.c | 2 +- src/post/planar/boxblur.c | 2 +- src/post/planar/denoise3d.c | 2 +- src/post/planar/eq.c | 2 +- src/post/planar/eq2.c | 2 +- src/post/planar/expand.c | 2 +- src/post/planar/fill.c | 2 +- src/post/planar/invert.c | 2 +- src/post/planar/noise.c | 2 +- src/post/planar/pp.c | 2 +- src/post/planar/unsharp.c | 2 +- src/post/visualizations/fftgraph.c | 2 +- src/post/visualizations/fftscope.c | 2 +- src/post/visualizations/fooviz.c | 2 +- src/post/visualizations/oscope.c | 2 +- src/vdr/input_vdr.c | 2 +- src/vdr/post_vdr_audio.c | 2 +- src/vdr/post_vdr_video.c | 2 +- src/video_out/video_out_aa.c | 2 +- src/video_out/video_out_caca.c | 2 +- src/video_out/video_out_directfb.c | 4 ++-- src/video_out/video_out_directx.c | 2 +- src/video_out/video_out_fb.c | 2 +- src/video_out/video_out_macosx.m | 2 +- src/video_out/video_out_none.c | 2 +- src/video_out/video_out_opengl.c | 2 +- src/video_out/video_out_pgx32.c | 2 +- src/video_out/video_out_pgx64.c | 2 +- src/video_out/video_out_sdl.c | 2 +- src/video_out/video_out_stk.c | 2 +- src/video_out/video_out_syncfb.c | 2 +- src/video_out/video_out_vidix.c | 4 ++-- src/video_out/video_out_xcbshm.c | 2 +- src/video_out/video_out_xcbxv.c | 2 +- src/video_out/video_out_xshm.c | 2 +- src/video_out/video_out_xv.c | 2 +- src/video_out/video_out_xvmc.c | 2 +- src/video_out/video_out_xxmc.c | 2 +- 164 files changed, 170 insertions(+), 170 deletions(-) diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 472863ac1..5ee467317 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -1680,7 +1680,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "alsa"; - this->driver_class.description = _("xine audio output plugin using alsa-compliant audio devices/drivers"); + this->driver_class.description = N_("xine audio output plugin using alsa-compliant audio devices/drivers"); this->driver_class.dispose = dispose_class; /* this->config = xine->config; */ diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c index 33c009511..805996166 100644 --- a/src/audio_out/audio_coreaudio_out.c +++ b/src/audio_out/audio_coreaudio_out.c @@ -580,7 +580,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "coreaudio"; - this->driver_class.description = _("xine output plugin for Coreaudio/Mac OS X"); + this->driver_class.description = N_("xine output plugin for Coreaudio/Mac OS X"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index d35fb310c..961f93a68 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.c @@ -1005,7 +1005,7 @@ static void *init_class(xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "directx2"; - this->driver_class.description = _("second xine audio output plugin using directx"); + this->driver_class.description = N_("second xine audio output plugin using directx"); this->driver_class.dispose = dispose_class; this->xine = xine; diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index 496ef545a..d2dc3628f 100644 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -839,7 +839,7 @@ static void *init_class (xine_t *xine, void *data) { audiox->driver_class.open_plugin = open_plugin; audiox->driver_class.identifier = "DirectX"; - audiox->driver_class.description = _("xine audio output plugin for win32 using directx"); + audiox->driver_class.description = N_("xine audio output plugin for win32 using directx"); audiox->driver_class.dispose = dispose_class; audiox->xine = xine; diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c index b7b6a2baa..6c770dd08 100644 --- a/src/audio_out/audio_esd_out.c +++ b/src/audio_out/audio_esd_out.c @@ -581,7 +581,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "esd"; - this->driver_class.description = _("xine audio output plugin using esound"); + this->driver_class.description = N_("xine audio output plugin using esound"); this->driver_class.dispose = dispose_class; this->xine = xine; diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c index 5473dcaa8..6e85e5754 100644 --- a/src/audio_out/audio_file_out.c +++ b/src/audio_out/audio_file_out.c @@ -373,7 +373,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "file"; - this->driver_class.description = _("xine file audio output plugin"); + this->driver_class.description = N_("xine file audio output plugin"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c index 2af4a963b..75eac7906 100644 --- a/src/audio_out/audio_fusionsound_out.c +++ b/src/audio_out/audio_fusionsound_out.c @@ -461,7 +461,7 @@ static void* init_class(xine_t *xine, void *data) { class->ao_class.open_plugin = open_plugin; class->ao_class.identifier = "FunsionSound"; - class->ao_class.description = _("xine FusionSound audio output plugin"); + class->ao_class.description = N_("xine FusionSound audio output plugin"); class->ao_class.dispose = dispose_class; class->xine = xine; diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c index 214e8d4fa..38b5cf25c 100644 --- a/src/audio_out/audio_jack_out.c +++ b/src/audio_out/audio_jack_out.c @@ -412,7 +412,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_jack_plugin; this->driver_class.identifier = "jack"; - this->driver_class.description = _("xine output plugin for JACK Audio Connection Kit"); + this->driver_class.description = N_("xine output plugin for JACK Audio Connection Kit"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index 3de1c708b..52ab01a08 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.c @@ -1163,7 +1163,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "oss"; - this->driver_class.description = _("xine audio output plugin using oss-compliant audio devices/drivers"); + this->driver_class.description = N_("xine audio output plugin using oss-compliant audio devices/drivers"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c index a853ee58a..b5a58f7ca 100644 --- a/src/audio_out/audio_pulse_out.c +++ b/src/audio_out/audio_pulse_out.c @@ -600,7 +600,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.dispose = dispose_class; this->driver_class.identifier = "pulseaudio"; - this->driver_class.description = _("xine audio output plugin using pulseaudio sound server"); + this->driver_class.description = N_("xine audio output plugin using pulseaudio sound server"); this->xine = xine; diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c index d2ca3bf6f..f605854ac 100644 --- a/src/audio_out/audio_sun_out.c +++ b/src/audio_out/audio_sun_out.c @@ -1028,7 +1028,7 @@ static void *ao_sun_init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = ao_sun_open_plugin; this->driver_class.identifier = "sun"; - this->driver_class.description = _("xine audio output plugin using sun-compliant audio devices/drivers"); + this->driver_class.description = N_("xine audio output plugin using sun-compliant audio devices/drivers"); this->driver_class.dispose = ao_sun_dispose_class; this->xine = xine; diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c index 80d16903f..8d168fc12 100644 --- a/src/combined/flac_decoder.c +++ b/src/combined/flac_decoder.c @@ -392,7 +392,7 @@ init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "flacdec"; - this->decoder_class.description = _("flac audio decoder plugin"); + this->decoder_class.description = N_("flac audio decoder plugin"); this->decoder_class.dispose = dispose_class; diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c index e4ac98258..df52c770b 100644 --- a/src/combined/flac_demuxer.c +++ b/src/combined/flac_demuxer.c @@ -744,7 +744,7 @@ demux_flac_init_class (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("FLAC demux plugin"); + this->demux_class.description = N_("FLAC demux plugin"); this->demux_class.identifier = "FLAC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c index ea03138c1..861d25bf4 100644 --- a/src/combined/nsf_decoder.c +++ b/src/combined/nsf_decoder.c @@ -249,7 +249,7 @@ void *decoder_nsf_init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "NSF"; - this->decoder_class.description = _("NES Music audio decoder plugin"); + this->decoder_class.description = N_("NES Music audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c index 63658eeef..002e8f90c 100644 --- a/src/combined/nsf_demuxer.c +++ b/src/combined/nsf_demuxer.c @@ -369,7 +369,7 @@ void *demux_nsf_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_nsf_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("NES Music file demux plugin"); + this->demux_class.description = N_("NES Music file demux plugin"); this->demux_class.identifier = "NSF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c index f1201bbcd..6e450050d 100644 --- a/src/combined/wavpack_decoder.c +++ b/src/combined/wavpack_decoder.c @@ -322,7 +322,7 @@ void *decoder_wavpack_init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "wavpackdec"; - this->decoder_class.description = _("wavpack audio decoder plugin"); + this->decoder_class.description = N_("wavpack audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c index a3f217703..010b22245 100644 --- a/src/combined/wavpack_demuxer.c +++ b/src/combined/wavpack_demuxer.c @@ -396,7 +396,7 @@ void *demux_wv_init_plugin (xine_t *const xine, void *const data) { demux_wv_class_t *const this = xine_xmalloc (sizeof (demux_wv_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Wavpack demux plugin"); + this->demux_class.description = N_("Wavpack demux plugin"); this->demux_class.identifier = "Wavpack"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 5d10e3926..5cab808b9 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -2137,7 +2137,7 @@ static void *anx_init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_anx_class_t)); this->demux_class.open_plugin = anx_open_plugin; - this->demux_class.description = _("Annodex demux plugin"); + this->demux_class.description = N_("Annodex demux plugin"); this->demux_class.identifier = "Annodex"; this->demux_class.get_mimetypes = anx_get_mimetypes; this->demux_class.get_extensions = anx_get_extensions; @@ -2173,7 +2173,7 @@ static void *ogg_init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_ogg_class_t)); this->demux_class.open_plugin = ogg_open_plugin; - this->demux_class.description = _("OGG demux plugin"); + this->demux_class.description = N_("OGG demux plugin"); this->demux_class.identifier = "OGG"; this->demux_class.get_mimetypes = ogg_get_mimetypes; this->demux_class.get_extensions = ogg_get_extensions; diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c index ee93c520d..09ac901d4 100644 --- a/src/combined/xine_speex_decoder.c +++ b/src/combined/xine_speex_decoder.c @@ -388,7 +388,7 @@ void *speex_init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "speex"; - this->decoder_class.description = _("Speex audio decoder plugin"); + this->decoder_class.description = N_("Speex audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c index e7d59624a..2ce3299fd 100644 --- a/src/combined/xine_theora_decoder.c +++ b/src/combined/xine_theora_decoder.c @@ -358,7 +358,7 @@ void *theora_init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = theora_open_plugin; this->decoder_class.identifier = "theora video"; - this->decoder_class.description = _("theora video decoder plugin"); + this->decoder_class.description = N_("theora video decoder plugin"); this->decoder_class.dispose = theora_dispose_class; return this; diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c index 5409ba935..d76b1ff44 100644 --- a/src/combined/xine_vorbis_decoder.c +++ b/src/combined/xine_vorbis_decoder.c @@ -323,7 +323,7 @@ void *vorbis_init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "vorbis"; - this->decoder_class.description = _("vorbis audio decoder plugin"); + this->decoder_class.description = N_("vorbis audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 9e4197652..534686d47 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -541,7 +541,7 @@ void *demux_fourxm_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_fourxm_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("4X Technologies (4xm) demux plugin"); + this->demux_class.description = N_("4X Technologies (4xm) demux plugin"); this->demux_class.identifier = "4X Technologies"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index 8e65098bc..ff82f439e 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -328,7 +328,7 @@ void *demux_aac_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_aac_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("ADIF/ADTS AAC demux plugin"); + this->demux_class.description = N_("ADIF/ADTS AAC demux plugin"); this->demux_class.identifier = "AAC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 86e3082a0..1cb2ec62b 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -486,7 +486,7 @@ void *demux_ac3_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_ac3_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Raw AC3 demux plugin"); + this->demux_class.description = N_("Raw AC3 demux plugin"); this->demux_class.identifier = "AC3"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 27f04bf89..7287db0bc 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -408,7 +408,7 @@ void *demux_aiff_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_aiff_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("AIFF file demux plugin"); + this->demux_class.description = N_("AIFF file demux plugin"); this->demux_class.identifier = "AIFF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 35c126044..2fc747802 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -2129,7 +2129,7 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("ASF demux plugin"); + this->demux_class.description = N_("ASF demux plugin"); this->demux_class.identifier = "ASF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 44378d9dc..8df886fdb 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -338,7 +338,7 @@ void *demux_aud_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_aud_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Westwood Studios AUD file demux plugin"); + this->demux_class.description = N_("Westwood Studios AUD file demux plugin"); this->demux_class.identifier = "Westwood Studios AUD"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 5e8e44168..0f8e19266 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -2331,7 +2331,7 @@ static void *init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_avi_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("AVI/RIFF demux plugin"); + this->demux_class.description = N_("AVI/RIFF demux plugin"); this->demux_class.identifier = "AVI"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index 8946bdb44..26fe6bbfb 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -245,7 +245,7 @@ void *demux_cdda_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_cdda_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("CD Digital Audio demux plugin"); + this->demux_class.description = N_("CD Digital Audio demux plugin"); this->demux_class.identifier = "CDDA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index d39d8a234..b89ec3cc0 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -413,7 +413,7 @@ void *demux_dts_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_dts_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Raw DTS demux plugin"); + this->demux_class.description = N_("Raw DTS demux plugin"); this->demux_class.identifier = "DTS"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index 7dd8757b3..08e6f82b5 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -416,7 +416,7 @@ void *demux_eawve_init_plugin(xine_t *xine, void *data) { this = xine_xmalloc(sizeof(demux_eawve_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Electronics Arts WVE format demux plugin"); + this->demux_class.description = N_("Electronics Arts WVE format demux plugin"); this->demux_class.identifier = "EA WVE"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 49e802daa..4517604f7 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -279,7 +279,7 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_mpeg_elem_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Elementary MPEG stream demux plugin"); + this->demux_class.description = N_("Elementary MPEG stream demux plugin"); this->demux_class.identifier = "MPEG_ELEM"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 585bd5ccb..78c596af6 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -922,7 +922,7 @@ void *demux_film_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_film_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("FILM (CPK) demux plugin"); + this->demux_class.description = N_("FILM (CPK) demux plugin"); this->demux_class.identifier = "FILM (CPK)"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c index 3698bfcf0..eee8dbd73 100644 --- a/src/demuxers/demux_flac.c +++ b/src/demuxers/demux_flac.c @@ -550,7 +550,7 @@ void *demux_flac_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_flac_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Free Lossless Audio Codec (flac) demux plugin"); + this->demux_class.description = N_("Free Lossless Audio Codec (flac) demux plugin"); this->demux_class.identifier = "FLAC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index dd82bf12e..0b7173955 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -372,7 +372,7 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_fli_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Autodesk Animator FLI/FLC demux plugin"); + this->demux_class.description = N_("Autodesk Animator FLI/FLC demux plugin"); this->demux_class.identifier = "FLI/FLC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index a8317f0be..5d0c8f9ab 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -899,7 +899,7 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_flv_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Flash Video file demux plugin"); + this->demux_class.description = N_("Flash Video file demux plugin"); this->demux_class.identifier = "FLV"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index a295fc39c..ebdcf6e77 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -543,7 +543,7 @@ void *demux_idcin_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_idcin_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Id Quake II Cinematic file demux plugin"); + this->demux_class.description = N_("Id Quake II Cinematic file demux plugin"); this->demux_class.identifier = "Id CIN"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index 30d8ed5b7..51708276a 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -1310,7 +1310,7 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_iff_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("IFF demux plugin"); + this->demux_class.description = N_("IFF demux plugin"); this->demux_class.identifier = "IFF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index 741a4c17c..c1ae2b28f 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -244,7 +244,7 @@ static void *init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_image_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("image demux plugin"); + this->demux_class.description = N_("image demux plugin"); this->demux_class.identifier = "imagedmx"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index d78877b62..be8ecf084 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -741,7 +741,7 @@ void *demux_ipmovie_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_ipmovie_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Interplay MVE Movie demux plugin"); + this->demux_class.description = N_("Interplay MVE Movie demux plugin"); this->demux_class.identifier = "Interplay MVE"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index e00efb426..2b4f63d9c 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -2886,7 +2886,7 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("matroska demux plugin"); + this->demux_class.description = N_("matroska demux plugin"); this->demux_class.identifier = "matroska"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index ca1fc0108..64dcb71d3 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -355,7 +355,7 @@ static void *init_plugin(xine_t *xine, void *data){ this = xine_xmalloc (sizeof (demux_mng_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Multiple-image Network Graphics demux plugin"); + this->demux_class.description = N_("Multiple-image Network Graphics demux plugin"); this->demux_class.identifier = "MNG"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index 4c15c7c6d..991e93cb8 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -372,7 +372,7 @@ static void *demux_mod_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_mod_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("ModPlug Amiga MOD Music file demux plugin"); + this->demux_class.description = N_("ModPlug Amiga MOD Music file demux plugin"); this->demux_class.identifier = "mod"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index a8fb500e3..1e39d7d4d 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.c @@ -392,7 +392,7 @@ void *demux_mpc_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_mpc_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Musepack demux plugin"); + this->demux_class.description = N_("Musepack demux plugin"); this->demux_class.identifier = "Musepack"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 72fe97473..ded69e73a 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -1241,7 +1241,7 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_mpeg_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("MPEG program stream demux plugin"); + this->demux_class.description = N_("MPEG program stream demux plugin"); this->demux_class.identifier = "MPEG"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index e9f7226ee..e92b19b3d 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -1537,7 +1537,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("DVD/VOB demux plugin"); + this->demux_class.description = N_("DVD/VOB demux plugin"); this->demux_class.identifier = "MPEG_BLOCK"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 85a8fa14d..2a3b14f5c 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -1783,7 +1783,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("mpeg pes demux plugin"); + this->demux_class.description = N_("mpeg pes demux plugin"); this->demux_class.identifier = "MPEG_PES"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 6bfa0d770..79886f7e6 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -1073,7 +1073,7 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("MPEG audio demux plugin"); + this->demux_class.description = N_("MPEG audio demux plugin"); this->demux_class.identifier = "MPEGAUDIO"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 88d4c6ea5..3f931b1c6 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -663,7 +663,7 @@ static void *demux_nsv_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_nsv_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Nullsoft Video demux plugin"); + this->demux_class.description = N_("Nullsoft Video demux plugin"); this->demux_class.identifier = "Nullsoft NSV"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c index 138c0491d..da8e526ce 100644 --- a/src/demuxers/demux_playlist.c +++ b/src/demuxers/demux_playlist.c @@ -715,7 +715,7 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof(demux_playlist_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Playlist demux plugin"); + this->demux_class.description = N_("Playlist demux plugin"); this->demux_class.identifier = "playlist"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 0100c19b8..8b162b0a7 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -498,7 +498,7 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_pva_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("TechnoTrend PVA demux plugin"); + this->demux_class.description = N_("TechnoTrend PVA demux plugin"); this->demux_class.identifier = "TechnoTrend PVA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 4bc9eb890..83d72a349 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -3149,7 +3149,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.description = ("Apple Quicktime (MOV) and MPEG-4 demux plugin"); + this->demux_class.description = N_("Apple Quicktime (MOV) and MPEG-4 demux plugin"); this->demux_class.identifier = "MOV/MPEG-4"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index db59e831e..07b438032 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -431,7 +431,7 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_raw_dv_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Raw DV Video stream"); + this->demux_class.description = N_("Raw DV Video stream"); this->demux_class.identifier = "raw_dv"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 4a5b2cae7..4d7222506 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -1639,7 +1639,7 @@ static void *init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_real_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("RealMedia file demux plugin"); + this->demux_class.description = N_("RealMedia file demux plugin"); this->demux_class.identifier = "Real"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index c24a8c247..76d9de003 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -397,7 +397,7 @@ void *demux_realaudio_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_ra_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("RealAudio file demux plugin"); + this->demux_class.description = N_("RealAudio file demux plugin"); this->demux_class.identifier = "RA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 0c89d9b5a..920e19fdf 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -480,7 +480,7 @@ void *demux_roq_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_roq_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Id RoQ file demux plugin"); + this->demux_class.description = N_("Id RoQ file demux plugin"); this->demux_class.identifier = "RoQ"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c index 19b55cd20..f2d5dc7dd 100644 --- a/src/demuxers/demux_shn.c +++ b/src/demuxers/demux_shn.c @@ -248,7 +248,7 @@ void *demux_shn_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_shn_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Shorten demux plugin"); + this->demux_class.description = N_("Shorten demux plugin"); this->demux_class.identifier = "Shorten"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index a715f2309..d1a1c2f58 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -469,7 +469,7 @@ void *demux_smjpeg_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_smjpeg_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("SMJPEG file demux plugin"); + this->demux_class.description = N_("SMJPEG file demux plugin"); this->demux_class.identifier = "SMJPEG"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index 79b7412e7..b15a99266 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -390,7 +390,7 @@ void *demux_snd_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_snd_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("SND/AU file demux plugin"); + this->demux_class.description = N_("SND/AU file demux plugin"); this->demux_class.identifier = "SND/AU"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index 51a2b324d..65d7d2368 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -623,7 +623,7 @@ void *demux_str_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_str_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Sony Playstation STR file demux plugin"); + this->demux_class.description = N_("Sony Playstation STR file demux plugin"); this->demux_class.identifier = "PSX STR"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index f4a0a1b10..3c11d0a39 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -2287,7 +2287,7 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("MPEG Transport Stream demuxer"); + this->demux_class.description = N_("MPEG Transport Stream demuxer"); this->demux_class.identifier = "MPEG_TS"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index 0d8efd10d..ebb201f1d 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.c @@ -301,7 +301,7 @@ void *demux_tta_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_tta_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("True Audio demux plugin"); + this->demux_class.description = N_("True Audio demux plugin"); this->demux_class.identifier = "True Audio"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c index f83e1976d..fd67385a9 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.c @@ -490,7 +490,7 @@ void *demux_vmd_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_vmd_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Sierra VMD file demux plugin"); + this->demux_class.description = N_("Sierra VMD file demux plugin"); this->demux_class.identifier = "VMD"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index 1b38e2116..0c641c522 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -365,7 +365,7 @@ void *demux_voc_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_voc_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("VOC file demux plugin"); + this->demux_class.description = N_("VOC file demux plugin"); this->demux_class.identifier = "VOC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index d68bcc0d6..8ee555046 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -242,7 +242,7 @@ void *demux_vox_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_vox_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Dialogic VOX file demux plugin"); + this->demux_class.description = N_("Dialogic VOX file demux plugin"); this->demux_class.identifier = "VOX"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index f06a936af..a980745da 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -403,7 +403,7 @@ void *demux_vqa_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_vqa_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Westwood Studios VQA file demux plugin"); + this->demux_class.description = N_("Westwood Studios VQA file demux plugin"); this->demux_class.identifier = "VQA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index 8647d12ae..f30fec555 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -414,7 +414,7 @@ void *demux_wav_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_wav_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("WAV file demux plugin"); + this->demux_class.description = N_("WAV file demux plugin"); this->demux_class.identifier = "WAV"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index 34f0b6a8b..24032da2d 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -734,7 +734,7 @@ void *demux_wc3movie_init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_mve_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("Wing Commander III Movie (MVE) demux plugin"); + this->demux_class.description = N_("Wing Commander III Movie (MVE) demux plugin"); this->demux_class.identifier = "WC3 Movie"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index b44e9719d..02165b016 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -472,7 +472,7 @@ static void *init_plugin (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_yuv4mpeg2_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("YUV4MPEG2 file demux plugin"); + this->demux_class.description = N_("YUV4MPEG2 file demux plugin"); this->demux_class.identifier = "YUV4MPEG2"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 661f10342..7f011f5c8 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -248,7 +248,7 @@ static void *init_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_yuv_frames_class_t)); this->demux_class.open_plugin = open_plugin; - this->demux_class.description = _("YUV frames dummy demux plugin"); + this->demux_class.description = N_("YUV frames dummy demux plugin"); this->demux_class.identifier = "YUV_FRAMES"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index ac0908266..b83f94782 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -201,7 +201,7 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void* data) this->spu_decoder_class.open_plugin = dxr3_spudec_open_plugin; this->spu_decoder_class.identifier = "dxr3-spudec"; - this->spu_decoder_class.description = _("subtitle decoder plugin using the hardware decoding capabilities of a DXR3 decoder card"); + this->spu_decoder_class.description = N_("subtitle decoder plugin using the hardware decoding capabilities of a DXR3 decoder card"); this->spu_decoder_class.dispose = dxr3_spudec_class_dispose; this->instance = 0; diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 71c7fe8d7..87ea1900c 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -196,7 +196,7 @@ static void *dxr3_init_plugin(xine_t *xine, void *data) this->video_decoder_class.open_plugin = dxr3_open_plugin; this->video_decoder_class.identifier = "dxr3-mpeg2"; - this->video_decoder_class.description = _("MPEGI/II decoder plugin using the hardware decoding capabilities of a DXR3 decoder card."); + this->video_decoder_class.description = N_("MPEGI/II decoder plugin using the hardware decoding capabilities of a DXR3 decoder card."); this->video_decoder_class.dispose = dxr3_class_dispose; this->instance = 0; diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index c8b95febd..68a5eb0af 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -175,7 +175,7 @@ static dxr3_driver_class_t *dxr3_vo_init_plugin(xine_t *xine, void *visual_gen) this->video_driver_class.open_plugin = dxr3_vo_open_plugin; this->video_driver_class.identifier = DXR3_VO_ID; - this->video_driver_class.description = _("video output plugin displaying images through your DXR3 decoder card"); + this->video_driver_class.description = N_("video output plugin displaying images through your DXR3 decoder card"); this->video_driver_class.dispose = dxr3_vo_class_dispose; this->xine = xine; diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 0cd8982e1..83f89b08f 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -2715,7 +2715,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->input_class.get_instance = cdda_class_get_instance; this->input_class.identifier = "cdda"; - this->input_class.description = _("CD Digital Audio (aka. CDDA)"); + this->input_class.description = N_("CD Digital Audio (aka. CDDA)"); /* this->input_class.get_dir = cdda_class_get_dir; */ this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = cdda_class_get_autoplay_list; diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 1409e9c05..d84877e39 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -3244,7 +3244,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.get_instance = dvb_class_get_instance; this->input_class.identifier = "dvb"; - this->input_class.description = _("DVB (Digital TV) input plugin"); + this->input_class.description = N_("DVB (Digital TV) input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = dvb_class_get_autoplay_list; this->input_class.dispose = dvb_class_dispose; diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index e2c0277c9..5f3676748 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -1759,7 +1759,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.get_instance = dvd_class_get_instance; this->input_class.identifier = "DVD"; - this->input_class.description = _("DVD Navigator"); + this->input_class.description = N_("DVD Navigator"); /* this->input_class.get_dir = dvd_class_get_dir; */ diff --git a/src/input/input_file.c b/src/input/input_file.c index d29a1270b..a2259ec1a 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -980,7 +980,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->input_class.get_instance = file_class_get_instance; this->input_class.identifier = "file"; - this->input_class.description = _("file input plugin"); + this->input_class.description = N_("file input plugin"); this->input_class.get_dir = file_class_get_dir; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = file_class_dispose; diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c index 24ef652c7..3f8c4a745 100644 --- a/src/input/input_gnome_vfs.c +++ b/src/input/input_gnome_vfs.c @@ -364,7 +364,7 @@ static void this->input_class.get_instance = gnomevfs_klass_get_instance; this->input_class.identifier = "gnomevfs"; - this->input_class.description = _("gnome-vfs input plugin as shipped with xine"); + this->input_class.description = N_("gnome-vfs input plugin as shipped with xine"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = gnomevfs_klass_dispose; diff --git a/src/input/input_http.c b/src/input/input_http.c index ffeb79bd7..02a54e6d8 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -1087,7 +1087,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.get_instance = http_class_get_instance; this->input_class.identifier = "http"; - this->input_class.description = _("http input plugin"); + this->input_class.description = N_("http input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = http_class_dispose; diff --git a/src/input/input_mms.c b/src/input/input_mms.c index 7adf929b4..48944dbfb 100644 --- a/src/input/input_mms.c +++ b/src/input/input_mms.c @@ -459,7 +459,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.get_instance = mms_class_get_instance; this->input_class.identifier = "mms"; - this->input_class.description = _("mms streaming input plugin"); + this->input_class.description = N_("mms streaming input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = mms_class_dispose; diff --git a/src/input/input_net.c b/src/input/input_net.c index 68cf5ab97..30e88757d 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -520,7 +520,7 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->input_class.get_instance = net_class_get_instance; - this->input_class.description = _("net input plugin as shipped with xine"); + this->input_class.description = N_("net input plugin as shipped with xine"); this->input_class.identifier = "TCP"; this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c index c90fadd31..b11e1d6b3 100644 --- a/src/input/input_pnm.c +++ b/src/input/input_pnm.c @@ -275,7 +275,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.get_instance = pnm_class_get_instance; this->input_class.identifier = "pnm"; - this->input_class.description = _("pnm streaming input plugin"); + this->input_class.description = N_("pnm streaming input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = pnm_class_dispose; diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index f6f7d51c9..eaac6afb8 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -1547,7 +1547,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->input_class.get_instance = pvr_class_get_instance; this->input_class.identifier = "pvr"; - this->input_class.description = _("WinTV-PVR 250/350 input plugin"); + this->input_class.description = N_("WinTV-PVR 250/350 input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = pvr_class_dispose; diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index 12e97bd02..5ef5184cc 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -781,7 +781,7 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->input_class.get_instance = rtp_class_get_instance; - this->input_class.description = _("RTP and UDP input plugin as shipped with xine"); + this->input_class.description = N_("RTP and UDP input plugin as shipped with xine"); this->input_class.identifier = "RTP/UDP"; this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c index 266ff6f6e..eb79586ad 100644 --- a/src/input/input_rtsp.c +++ b/src/input/input_rtsp.c @@ -296,7 +296,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.get_instance = rtsp_class_get_instance; this->input_class.identifier = "rtsp"; - this->input_class.description = _("rtsp streaming input plugin"); + this->input_class.description = N_("rtsp streaming input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = rtsp_class_dispose; diff --git a/src/input/input_smb.c b/src/input/input_smb.c index d0e81ae32..d6f9a78da 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.c @@ -508,7 +508,7 @@ static void this->input_class.get_instance = smb_class_get_instance; this->input_class.identifier = "smb"; - this->input_class.description = _("CIFS/SMB input plugin based on libsmbclient"); + this->input_class.description = N_("CIFS/SMB input plugin based on libsmbclient"); this->input_class.get_dir = smb_class_get_dir; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = smb_class_dispose; diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index 4640cbf31..7708ee40d 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.c @@ -360,7 +360,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.get_instance = stdin_class_get_instance; this->input_class.identifier = "stdin_fifo"; - this->input_class.description = _("stdin streaming input plugin"); + this->input_class.description = N_("stdin streaming input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = stdin_class_dispose; diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index f698f8772..7ed5c172b 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -1918,7 +1918,7 @@ static void *init_video_class (xine_t *xine, void *data) this->input_class.get_instance = v4l_class_get_video_instance; this->input_class.identifier = "v4l"; - this->input_class.description = _("v4l tv input plugin"); + this->input_class.description = N_("v4l tv input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = v4l_class_dispose; @@ -1950,7 +1950,7 @@ static void *init_radio_class (xine_t *xine, void *data) this->input_class.get_instance = v4l_class_get_radio_instance; this->input_class.identifier = "v4l"; - this->input_class.description = _("v4l radio input plugin"); + this->input_class.description = N_("v4l radio input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = v4l_class_dispose; diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 71c828eea..014f20258 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -1079,7 +1079,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.get_instance = vcd_class_get_instance; this->input_class.identifier = "vcdo"; - this->input_class.description = _("Video CD input plugin"); + this->input_class.description = N_("Video CD input plugin"); this->input_class.get_dir = vcd_class_get_dir; this->input_class.get_autoplay_list = vcd_class_get_autoplay_list; this->input_class.dispose = vcd_class_dispose; diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index 4b11096c0..c33f73e40 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1752,7 +1752,7 @@ vcd_init (xine_t *xine, void *data) class->input_class.get_instance = vcd_class_get_instance; class->input_class.identifier = SHORT_PLUGIN_NAME; - class->input_class.description = _("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "); + class->input_class.description = N_("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "); class->input_class.get_dir = vcd_class_get_dir; class->input_class.get_autoplay_list = vcd_class_get_autoplay_list; class->input_class.dispose = vcd_class_dispose; diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c index bbfb07c6e..ce2d531cf 100644 --- a/src/libffmpeg/ff_audio_decoder.c +++ b/src/libffmpeg/ff_audio_decoder.c @@ -427,7 +427,7 @@ void *init_audio_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = ff_audio_open_plugin; this->decoder_class.identifier = "ffmpeg audio"; - this->decoder_class.description = _("ffmpeg based audio decoder plugin"); + this->decoder_class.description = N_("ffmpeg based audio decoder plugin"); this->decoder_class.dispose = ff_audio_dispose_class; pthread_once( &once_control, init_once_routine ); diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index 0eb0d2732..60e46ea62 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -389,7 +389,7 @@ static void *init_dvaudio_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = dvaudio_open_plugin; this->decoder_class.identifier = "dv audio"; - this->decoder_class.description = _("dv audio decoder plugin"); + this->decoder_class.description = N_("dv audio decoder plugin"); this->decoder_class.dispose = dvaudio_dispose_class; return this; diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index 9b55db919..9e9f4f129 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -1537,7 +1537,7 @@ void *init_video_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = ff_video_open_plugin; this->decoder_class.identifier = "ffmpeg video"; - this->decoder_class.description = _("ffmpeg based video decoder plugin"); + this->decoder_class.description = N_("ffmpeg based video decoder plugin"); this->decoder_class.dispose = ff_video_dispose_class; this->xine = xine; diff --git a/src/libmpeg2/xine_mpeg2_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c index ea3af9762..4e67661dc 100644 --- a/src/libmpeg2/xine_mpeg2_decoder.c +++ b/src/libmpeg2/xine_mpeg2_decoder.c @@ -151,7 +151,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mpeg2dec"; - this->decoder_class.description = _("mpeg2 based video decoder plugin"); + this->decoder_class.description = N_("mpeg2 based video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libmpeg2new/xine_mpeg2new_decoder.c b/src/libmpeg2new/xine_mpeg2new_decoder.c index 8443eca79..1bed00954 100644 --- a/src/libmpeg2new/xine_mpeg2new_decoder.c +++ b/src/libmpeg2new/xine_mpeg2new_decoder.c @@ -486,7 +486,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mpeg2new"; - this->decoder_class.description = _("mpeg2 based video decoder plugin"); + this->decoder_class.description = N_("mpeg2 based video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c index ddf399b54..60cb47801 100644 --- a/src/libreal/xine_real_audio_decoder.c +++ b/src/libreal/xine_real_audio_decoder.c @@ -596,7 +596,7 @@ void *init_realadec (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "realadec"; - this->decoder_class.description = _("real binary-only codec based audio decoder plugin"); + this->decoder_class.description = N_("real binary-only codec based audio decoder plugin"); this->decoder_class.dispose = dispose_class; _x_real_codecs_init(xine); diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c index 7763cf680..7f8de97bf 100644 --- a/src/libreal/xine_real_video_decoder.c +++ b/src/libreal/xine_real_video_decoder.c @@ -524,7 +524,7 @@ void *init_realvdec (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "realvdec"; - this->decoder_class.description = _("real binary-only codec based video decoder plugin"); + this->decoder_class.description = N_("real binary-only codec based video decoder plugin"); this->decoder_class.dispose = dispose_class; _x_real_codecs_init(xine); diff --git a/src/libspucc/xine_cc_decoder.c b/src/libspucc/xine_cc_decoder.c index 3891fb76a..ffb1d17d0 100644 --- a/src/libspucc/xine_cc_decoder.c +++ b/src/libspucc/xine_cc_decoder.c @@ -334,7 +334,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this->spu_class.open_plugin = spudec_open_plugin; this->spu_class.identifier = "spucc"; - this->spu_class.description = _("closed caption decoder plugin"); + this->spu_class.description = N_("closed caption decoder plugin"); this->spu_class.dispose = spudec_class_dispose; spucc_register_cfg_vars(this, xine->config); diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c index 5daf5e7fc..31e6e9302 100644 --- a/src/libspucmml/xine_cmml_decoder.c +++ b/src/libspucmml/xine_cmml_decoder.c @@ -510,7 +510,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this->class.open_plugin = spucmml_class_open_plugin; this->class.identifier = "spucmml"; - this->class.description = _("CMML subtitle decoder plugin"); + this->class.description = N_("CMML subtitle decoder plugin"); this->class.dispose = spucmml_class_dispose; this->xine = xine; diff --git a/src/libspudec/xine_spu_decoder.c b/src/libspudec/xine_spu_decoder.c index cac5a8d09..d5c5d8c04 100644 --- a/src/libspudec/xine_spu_decoder.c +++ b/src/libspudec/xine_spu_decoder.c @@ -366,7 +366,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "spudec"; - this->decoder_class.description = _("DVD/VOB SPU decoder plugin"); + this->decoder_class.description = N_("DVD/VOB SPU decoder plugin"); this->decoder_class.dispose = dispose_class; lprintf ("libspudec:init_plugin called\n"); diff --git a/src/libspudvb/xine_spudvb_decoder.c b/src/libspudvb/xine_spudvb_decoder.c index 29554699a..fcd8f9aab 100644 --- a/src/libspudvb/xine_spudvb_decoder.c +++ b/src/libspudvb/xine_spudvb_decoder.c @@ -979,7 +979,7 @@ static void *init_spu_decoder_plugin (xine_t * xine, void *data) this->class.open_plugin = dvb_spu_class_open_plugin; this->class.identifier = "spudvb"; - this->class.description = _("DVB subtitle decoder plugin"); + this->class.description = N_("DVB subtitle decoder plugin"); this->class.dispose = dvb_spu_class_dispose; this->xine = xine; diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index a1b1d93a2..68f436729 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.c @@ -1480,7 +1480,7 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { this = xine_xmalloc (sizeof (demux_sputext_class_t)); this->demux_class.open_plugin = open_demux_plugin; - this->demux_class.description = _("sputext demuxer plugin"); + this->demux_class.description = N_("sputext demuxer plugin"); this->demux_class.identifier = "sputext"; this->demux_class.get_mimetypes = get_demux_mimetypes; this->demux_class.get_extensions = get_demux_extensions; diff --git a/src/libsputext/xine_sputext_decoder.c b/src/libsputext/xine_sputext_decoder.c index d21e8dd6f..88977496e 100644 --- a/src/libsputext/xine_sputext_decoder.c +++ b/src/libsputext/xine_sputext_decoder.c @@ -908,7 +908,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this->class.open_plugin = sputext_class_open_plugin; this->class.identifier = "sputext"; - this->class.description = _("external subtitle decoder plugin"); + this->class.description = N_("external subtitle decoder plugin"); this->class.dispose = sputext_class_dispose; this->xine = xine; diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index 2bb5286b2..9954d63de 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.c @@ -588,7 +588,7 @@ static void *qta_init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = qta_open_plugin; this->decoder_class.identifier = "qta"; - this->decoder_class.description = _("quicktime audio decoder plugin"); + this->decoder_class.description = N_("quicktime audio decoder plugin"); this->decoder_class.dispose = qta_dispose_class; return this; @@ -1104,7 +1104,7 @@ static void *qtv_init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = qtv_open_plugin; this->decoder_class.identifier = "qtvdec"; - this->decoder_class.description = _("quicktime binary-only codec based video decoder plugin"); + this->decoder_class.description = N_("quicktime binary-only codec based video decoder plugin"); this->decoder_class.dispose = qtv_dispose_class; return this; diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 48556f4ad..e7f13c375 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -1589,7 +1589,7 @@ static void *init_video_decoder_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_video_decoder_plugin; this->decoder_class.identifier = "w32v"; - this->decoder_class.description = _("win32 binary video codec plugin"); + this->decoder_class.description = N_("win32 binary video codec plugin"); this->decoder_class.dispose = dispose_video_class; pthread_once (&once_control, init_routine); @@ -1643,7 +1643,7 @@ static void *init_audio_decoder_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_audio_decoder_plugin; this->decoder_class.identifier = "win32 audio"; - this->decoder_class.description = _("win32 binary audio codec plugin"); + this->decoder_class.description = N_("win32 binary audio codec plugin"); this->decoder_class.dispose = dispose_class; pthread_once (&once_control, init_routine); diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c index cfcaabc50..198be2968 100644 --- a/src/libxineadec/fooaudio.c +++ b/src/libxineadec/fooaudio.c @@ -302,7 +302,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "fooaudio"; - this->decoder_class.description = _("fooaudio: reference xine audio decoder plugin"); + this->decoder_class.description = N_("fooaudio: reference xine audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c index 8cd0a7042..e56ccf8b4 100644 --- a/src/libxineadec/gsm610.c +++ b/src/libxineadec/gsm610.c @@ -261,7 +261,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "GSM 6.10"; - this->decoder_class.description = _("GSM 6.10 audio decoder plugin"); + this->decoder_class.description = N_("GSM 6.10 audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c index 25a315abb..1d99c0ce0 100644 --- a/src/libxineadec/xine_a52_decoder.c +++ b/src/libxineadec/xine_a52_decoder.c @@ -783,7 +783,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "a/52dec"; - this->decoder_class.description = _("liba52 based a52 audio decoder plugin"); + this->decoder_class.description = N_("liba52 based a52 audio decoder plugin"); this->decoder_class.dispose = dispose_class; cfg = this->config = xine->config; diff --git a/src/libxineadec/xine_dts_decoder.c b/src/libxineadec/xine_dts_decoder.c index 3f34b68c2..b8ba460d7 100644 --- a/src/libxineadec/xine_dts_decoder.c +++ b/src/libxineadec/xine_dts_decoder.c @@ -562,7 +562,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "DTS"; - this->decoder_class.description = _("DTS passthru audio format decoder plugin"); + this->decoder_class.description = N_("DTS passthru audio format decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c index 61fbfc1de..b7f6b7630 100644 --- a/src/libxineadec/xine_faad_decoder.c +++ b/src/libxineadec/xine_faad_decoder.c @@ -457,7 +457,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "FAAD"; - this->decoder_class.description = _("Freeware Advanced Audio Decoder"); + this->decoder_class.description = N_("Freeware Advanced Audio Decoder"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c index c3d450d51..53ca81c6c 100644 --- a/src/libxineadec/xine_lpcm_decoder.c +++ b/src/libxineadec/xine_lpcm_decoder.c @@ -260,7 +260,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "Linear PCM"; - this->decoder_class.description = _("Linear PCM audio decoder plugin"); + this->decoder_class.description = N_("Linear PCM audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c index db74f655c..f7850cd54 100644 --- a/src/libxineadec/xine_mad_decoder.c +++ b/src/libxineadec/xine_mad_decoder.c @@ -348,7 +348,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mad"; - this->decoder_class.description = _("libmad based mpeg audio layer 1/2/3 decoder plugin"); + this->decoder_class.description = N_("libmad based mpeg audio layer 1/2/3 decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxineadec/xine_musepack_decoder.c b/src/libxineadec/xine_musepack_decoder.c index d2db57806..cb7d98c66 100644 --- a/src/libxineadec/xine_musepack_decoder.c +++ b/src/libxineadec/xine_musepack_decoder.c @@ -445,7 +445,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mpc"; - this->decoder_class.description = _("mpc: musepack audio decoder plugin"); + this->decoder_class.description = N_("mpc: musepack audio decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index 1c7f387c6..a3c314b0b 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.c @@ -1554,7 +1554,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "bitplane"; - this->decoder_class.description = _("Raw bitplane video decoder plugin"); + this->decoder_class.description = N_("Raw bitplane video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c index dfcb8630d..29ad2e11e 100644 --- a/src/libxinevdec/foovideo.c +++ b/src/libxinevdec/foovideo.c @@ -244,7 +244,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "foovideo"; - this->decoder_class.description = _("foovideo: reference xine video decoder plugin"); + this->decoder_class.description = N_("foovideo: reference xine video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c index bbd66f42f..1b30489f5 100644 --- a/src/libxinevdec/gdkpixbuf.c +++ b/src/libxinevdec/gdkpixbuf.c @@ -273,7 +273,7 @@ static void *init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "gdkpixbuf"; - this->decoder_class.description = _("gdk-pixbuf image video decoder plugin"); + this->decoder_class.description = N_("gdk-pixbuf image video decoder plugin"); this->decoder_class.dispose = dispose_class; /* diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index 2807fc5d6..7fbafe70e 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -251,7 +251,7 @@ static void *init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "imagevdec"; - this->decoder_class.description = _("image video decoder plugin"); + this->decoder_class.description = N_("image video decoder plugin"); this->decoder_class.dispose = dispose_class; /* diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index 54adeeec1..490069643 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -428,7 +428,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "RGB"; - this->decoder_class.description = _("Raw RGB video decoder plugin"); + this->decoder_class.description = N_("Raw RGB video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index bcbb4bbe7..56f97be5d 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -351,7 +351,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "YUV"; - this->decoder_class.description = _("Raw YUV video decoder plugin"); + this->decoder_class.description = N_("Raw YUV video decoder plugin"); this->decoder_class.dispose = dispose_class; return this; diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c index 455001deb..688900972 100644 --- a/src/post/audio/stretch.c +++ b/src/post/audio/stretch.c @@ -674,7 +674,7 @@ void *stretch_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = stretch_open_plugin; class->post_class.identifier = "stretch"; - class->post_class.description = _("Time stretch by a given factor, optionally preserving pitch"); + class->post_class.description = N_("Time stretch by a given factor, optionally preserving pitch"); class->post_class.dispose = stretch_class_dispose; class->xine = xine; diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index e2c9f84a3..72f42527c 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -429,7 +429,7 @@ void *upmix_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = upmix_open_plugin; class->post_class.identifier = "upmix"; - class->post_class.description = _("upmix"); + class->post_class.description = N_("upmix"); class->post_class.dispose = upmix_class_dispose; class->xine = xine; diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c index dad9e5274..dda518277 100644 --- a/src/post/audio/upmix_mono.c +++ b/src/post/audio/upmix_mono.c @@ -344,7 +344,7 @@ void *upmix_mono_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = upmix_mono_open_plugin; class->post_class.identifier = "upmix_mono"; - class->post_class.description = _("converts Mono into Stereo"); + class->post_class.description = N_("converts Mono into Stereo"); class->post_class.dispose = upmix_mono_class_dispose; class->xine = xine; diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c index 47cd400be..b09139cd3 100644 --- a/src/post/audio/volnorm.c +++ b/src/post/audio/volnorm.c @@ -462,7 +462,7 @@ void *volnorm_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = volnorm_open_plugin; class->post_class.identifier = "volnorm"; - class->post_class.description = _("Normalize volume"); + class->post_class.description = N_("Normalize volume"); class->post_class.dispose = volnorm_class_dispose; class->xine = xine; diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index cbe024d19..6b6f99be6 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.c @@ -298,7 +298,7 @@ static void *deinterlace_init_plugin(xine_t *xine, void *data) class->class.open_plugin = deinterlace_open_plugin; class->class.identifier = "tvtime"; - class->class.description = _("advanced deinterlacer plugin with pulldown detection"); + class->class.description = N_("advanced deinterlacer plugin with pulldown detection"); class->class.dispose = deinterlace_class_dispose; diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c index 4371785f5..0b540694d 100644 --- a/src/post/goom/xine_goom.c +++ b/src/post/goom/xine_goom.c @@ -193,7 +193,7 @@ static void *goom_init_plugin(xine_t *xine, void *data) this->class.open_plugin = goom_open_plugin; this->class.identifier = "goom"; - this->class.description = _("What a GOOM"); + this->class.description = N_("What a GOOM"); this->class.dispose = goom_class_dispose; this->ip = NULL; this->xine = xine; diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c index af84dca8f..ccfd641aa 100644 --- a/src/post/mosaico/mosaico.c +++ b/src/post/mosaico/mosaico.c @@ -127,7 +127,7 @@ static void *mosaico_init_plugin(xine_t *xine, void *data) this->class.open_plugin = mosaico_open_plugin; this->class.identifier = "mosaico"; - this->class.description = _("Mosaico is a picture in picture (pip) post plugin"); + this->class.description = N_("Mosaico is a picture in picture (pip) post plugin"); this->class.dispose = mosaico_class_dispose; this->xine = xine; diff --git a/src/post/mosaico/switch.c b/src/post/mosaico/switch.c index 3561226b1..19e563680 100644 --- a/src/post/mosaico/switch.c +++ b/src/post/mosaico/switch.c @@ -106,7 +106,7 @@ static void *switch_init_plugin(xine_t *xine, void *data) this->class.open_plugin = switch_open_plugin; this->class.identifier = "switch"; - this->class.description = _("Switch is a post plugin able to switch at any time between different streams"); + this->class.description = N_("Switch is a post plugin able to switch at any time between different streams"); this->class.dispose = switch_class_dispose; this->xine = xine; diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c index dd22bef44..66af08e5c 100644 --- a/src/post/planar/boxblur.c +++ b/src/post/planar/boxblur.c @@ -141,7 +141,7 @@ void *boxblur_init_plugin(xine_t *xine, void *data) class->open_plugin = boxblur_open_plugin; class->identifier = "boxblur"; - class->description = _("box blur filter from mplayer"); + class->description = N_("box blur filter from mplayer"); class->dispose = boxblur_class_dispose; return class; diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c index 5bac53e52..647ab075e 100644 --- a/src/post/planar/denoise3d.c +++ b/src/post/planar/denoise3d.c @@ -181,7 +181,7 @@ void *denoise3d_init_plugin(xine_t *xine, void *data) class->open_plugin = denoise3d_open_plugin; class->identifier = "denoise3d"; - class->description = _("3D Denoiser (variable lowpass filter)"); + class->description = N_("3D Denoiser (variable lowpass filter)"); class->dispose = denoise3d_class_dispose; return class; diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c index bd1571603..cb28cafa2 100644 --- a/src/post/planar/eq.c +++ b/src/post/planar/eq.c @@ -233,7 +233,7 @@ void *eq_init_plugin(xine_t *xine, void *data) class->open_plugin = eq_open_plugin; class->identifier = "eq"; - class->description = _("soft video equalizer"); + class->description = N_("soft video equalizer"); class->dispose = eq_class_dispose; return class; diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c index e33f6075b..277aca00e 100644 --- a/src/post/planar/eq2.c +++ b/src/post/planar/eq2.c @@ -414,7 +414,7 @@ void *eq2_init_plugin(xine_t *xine, void *data) class->open_plugin = eq2_open_plugin; class->identifier = "eq2"; - class->description = _("Software video equalizer"); + class->description = N_("Software video equalizer"); class->dispose = eq2_class_dispose; return class; diff --git a/src/post/planar/expand.c b/src/post/planar/expand.c index d654190f5..df5fa874e 100644 --- a/src/post/planar/expand.c +++ b/src/post/planar/expand.c @@ -135,7 +135,7 @@ void *expand_init_plugin(xine_t *xine, void *data) class->open_plugin = expand_open_plugin; class->identifier = "expand"; - class->description = _("add black borders to top and bottom of video to expand it to 4:3 aspect ratio"); + class->description = N_("add black borders to top and bottom of video to expand it to 4:3 aspect ratio"); class->dispose = expand_class_dispose; return class; diff --git a/src/post/planar/fill.c b/src/post/planar/fill.c index 3406a57b1..14bd55102 100644 --- a/src/post/planar/fill.c +++ b/src/post/planar/fill.c @@ -53,7 +53,7 @@ void *fill_init_plugin(xine_t *xine, void *data) class->open_plugin = fill_open_plugin; class->identifier = "fill"; - class->description = _("crops left and right of video to fill 4:3 aspect ratio"); + class->description = N_("crops left and right of video to fill 4:3 aspect ratio"); class->dispose = fill_class_dispose; return class; diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c index d8a83ee28..dd1d7ac07 100644 --- a/src/post/planar/invert.c +++ b/src/post/planar/invert.c @@ -54,7 +54,7 @@ void *invert_init_plugin(xine_t *xine, void *data) class->open_plugin = invert_open_plugin; class->identifier = "invert"; - class->description = _("inverts the colours of every video frame"); + class->description = N_("inverts the colours of every video frame"); class->dispose = invert_class_dispose; return class; diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c index 31d61c62b..53dc3065d 100644 --- a/src/post/planar/noise.c +++ b/src/post/planar/noise.c @@ -450,7 +450,7 @@ void *noise_init_plugin(xine_t *xine, void *data) class->open_plugin = noise_open_plugin; class->identifier = "noise"; - class->description = _("Adds noise"); + class->description = N_("Adds noise"); class->dispose = noise_class_dispose; #ifdef ARCH_X86 diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index dead0e543..22a25fc90 100644 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.c @@ -156,7 +156,7 @@ void *pp_init_plugin(xine_t *xine, void *data) class->open_plugin = pp_open_plugin; class->identifier = "pp"; - class->description = _("plugin for ffmpeg libpostprocess"); + class->description = N_("plugin for ffmpeg libpostprocess"); class->dispose = pp_class_dispose; return class; diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c index ffce45a91..b850b05b7 100644 --- a/src/post/planar/unsharp.c +++ b/src/post/planar/unsharp.c @@ -274,7 +274,7 @@ void *unsharp_init_plugin(xine_t *xine, void *data) class->open_plugin = unsharp_open_plugin; class->identifier = "unsharp"; - class->description = _("unsharp mask & gaussian blur"); + class->description = N_("unsharp mask & gaussian blur"); class->dispose = unsharp_class_dispose; return class; diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c index 1194c956f..cb6c26015 100644 --- a/src/post/visualizations/fftgraph.c +++ b/src/post/visualizations/fftgraph.c @@ -467,7 +467,7 @@ void *fftgraph_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = fftgraph_open_plugin; class->post_class.identifier = "fftgraph"; - class->post_class.description = _("fftgraph Visualization Post Plugin"); + class->post_class.description = N_("fftgraph Visualization Post Plugin"); class->post_class.dispose = fftgraph_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c index 6f152f15c..c2756b5f1 100644 --- a/src/post/visualizations/fftscope.c +++ b/src/post/visualizations/fftscope.c @@ -488,7 +488,7 @@ void *fftscope_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = fftscope_open_plugin; class->post_class.identifier = "FFT Scope"; - class->post_class.description = _("FFT Scope"); + class->post_class.description = N_("FFT Scope"); class->post_class.dispose = fftscope_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c index 6b0a583be..509e3676f 100644 --- a/src/post/visualizations/fooviz.c +++ b/src/post/visualizations/fooviz.c @@ -299,7 +299,7 @@ static void *fooviz_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = fooviz_open_plugin; class->post_class.identifier = "fooviz"; - class->post_class.description = _("fooviz"); + class->post_class.description = N_("fooviz"); class->post_class.dispose = fooviz_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c index 5c91472fa..402963331 100644 --- a/src/post/visualizations/oscope.c +++ b/src/post/visualizations/oscope.c @@ -370,7 +370,7 @@ void *oscope_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = oscope_open_plugin; class->post_class.identifier = "Oscilloscope"; - class->post_class.description = _("Oscilloscope"); + class->post_class.description = N_("Oscilloscope"); class->post_class.dispose = oscope_class_dispose; class->xine = xine; diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c index 9a1ec0f8e..6a49eafce 100644 --- a/src/vdr/input_vdr.c +++ b/src/vdr/input_vdr.c @@ -2659,7 +2659,7 @@ static void *init_class(xine_t *xine, void *data) this->input_class.get_instance = vdr_class_get_instance; this->input_class.identifier = "VDR"; - this->input_class.description = _("VDR display device plugin"); + this->input_class.description = N_("VDR display device plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = vdr_class_get_autoplay_list; this->input_class.dispose = vdr_class_dispose; diff --git a/src/vdr/post_vdr_audio.c b/src/vdr/post_vdr_audio.c index 6ebefd70e..398f86f46 100644 --- a/src/vdr/post_vdr_audio.c +++ b/src/vdr/post_vdr_audio.c @@ -79,7 +79,7 @@ void *vdr_audio_init_plugin(xine_t *xine, void *data) class->open_plugin = vdr_audio_open_plugin; class->identifier = "vdr_audio"; - class->description = _("modifies every audio frame as requested by VDR"); + class->description = N_("modifies every audio frame as requested by VDR"); class->dispose = vdr_audio_class_dispose; return class; diff --git a/src/vdr/post_vdr_video.c b/src/vdr/post_vdr_video.c index ae02c31e0..0b1544ae4 100644 --- a/src/vdr/post_vdr_video.c +++ b/src/vdr/post_vdr_video.c @@ -102,7 +102,7 @@ void *vdr_video_init_plugin(xine_t *xine, void *data) class->open_plugin = vdr_video_open_plugin; class->identifier = "vdr"; - class->description = _("modifies every video frame as requested by VDR"); + class->description = N_("modifies every video frame as requested by VDR"); class->dispose = vdr_video_class_dispose; return class; diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index 74d19b6f6..38fb9f646 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -312,7 +312,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "AA"; - this->driver_class.description = _("xine video output plugin using the ascii-art library"); + this->driver_class.description = N_("xine video output plugin using the ascii-art library"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index b7ea21ba1..6384ed1aa 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -318,7 +318,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "CACA"; - this->driver_class.description = _("xine video output plugin using the Color AsCii Art library"); + this->driver_class.description = N_("xine video output plugin using the Color AsCii Art library"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index fc4757680..f75c6ae94 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -1903,7 +1903,7 @@ static void *init_class_fb (xine_t *xine, void *visual_gen) { this = (directfb_class_t *) xine_xmalloc (sizeof (directfb_class_t)); this->driver_class.open_plugin = open_plugin_fb; this->driver_class.identifier = "DirectFB"; - this->driver_class.description = _("xine video output plugin using DirectFB."); + this->driver_class.description = N_("xine video output plugin using DirectFB."); this->driver_class.dispose = dispose_class_fb; this->xine = xine; @@ -2114,7 +2114,7 @@ static void *init_class_x11 (xine_t *xine, void *visual_gen) { this = (directfb_class_t *) xine_xmalloc (sizeof (directfb_class_t)); this->driver_class.open_plugin = open_plugin_x11; this->driver_class.identifier = "XDirectFB"; - this->driver_class.description = _("xine video output plugin using DirectFB under XDirectFB."); + this->driver_class.description = N_("xine video output plugin using DirectFB under XDirectFB."); this->driver_class.dispose = dispose_class_x11; this->visual_type = XINE_VISUAL_TYPE_X11; diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 9494a2194..e39acd435 100644 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -1245,7 +1245,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { directx->driver_class.open_plugin = open_plugin; directx->driver_class.identifier = "DirectX"; - directx->driver_class.description = _("xine video output plugin for win32 using directx"); + directx->driver_class.description = N_("xine video output plugin for win32 using directx"); directx->driver_class.dispose = dispose_class; directx->xine = xine; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index e061ab781..e08661fa2 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -1058,7 +1058,7 @@ static void *fb_init_class(xine_t *xine, void *visual_gen) this->driver_class.open_plugin = fb_open_plugin; this->driver_class.identifier = "fb"; - this->driver_class.description = _("Xine video output plugin using the Linux frame buffer device"); + this->driver_class.description = N_("Xine video output plugin using the Linux frame buffer device"); this->driver_class.dispose = fb_dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m index 27e9814a2..316d0b2ee 100644 --- a/src/video_out/video_out_macosx.m +++ b/src/video_out/video_out_macosx.m @@ -363,7 +363,7 @@ static void *init_class (xine_t *xine, void *visual) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "MacOSX"; - this->driver_class.description = _("xine video output plugin for Mac OS X"); + this->driver_class.description = N_("xine video output plugin for Mac OS X"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index f97c5abab..d339f280d 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -282,7 +282,7 @@ static void *init_class (xine_t *xine, void *visual) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "none"; - this->driver_class.description = _("xine video output plugin which displays nothing"); + this->driver_class.description = N_("xine video output plugin which displays nothing"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index d86ef80f3..1bb582636 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -1966,7 +1966,7 @@ static void *opengl_init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = opengl_open_plugin; this->driver_class.identifier = "opengl"; - this->driver_class.description = _("xine video output plugin using the OpenGL 3D graphics API"); + this->driver_class.description = N_("xine video output plugin using the OpenGL 3D graphics API"); this->driver_class.dispose = opengl_dispose_class; this->xine = xine; diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index d8504e711..ae4be4431 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.c @@ -868,7 +868,7 @@ static void *pgx32_init_class(xine_t *xine, void *visual_gen) class->vo_driver_class.open_plugin = pgx32_init_driver; class->vo_driver_class.identifier = "pgx32"; - class->vo_driver_class.description = _("xine video output plugin for Sun PGX32 framebuffers"); + class->vo_driver_class.description = N_("xine video output plugin for Sun PGX32 framebuffers"); class->vo_driver_class.dispose = pgx32_dispose_class; class->xine = xine; diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index a706872cd..84a8af85c 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -1492,7 +1492,7 @@ static void *pgx64_init_class(xine_t *xine, void *visual_gen) class->vo_driver_class.open_plugin = pgx64_init_driver; class->vo_driver_class.identifier = "pgx64"; - class->vo_driver_class.description = _("xine video output plugin for Sun XVR100/PGX64/PGX24 framebuffers"); + class->vo_driver_class.description = N_("xine video output plugin for Sun XVR100/PGX64/PGX24 framebuffers"); class->vo_driver_class.dispose = pgx64_dispose_class; class->xine = xine; diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 95c937326..c04d54138 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -584,7 +584,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "SDL"; - this->driver_class.description = _("xine video output plugin using the Simple Direct Media Layer"); + this->driver_class.description = N_("xine video output plugin using the Simple Direct Media Layer"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index ba357cd73..ad4769dcd 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.c @@ -457,7 +457,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "stk"; - this->driver_class.description = _("xine video output plugin using the Libstk Surface Set-top Toolkit"); + this->driver_class.description = N_("xine video output plugin using the Libstk Surface Set-top Toolkit"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index f133d52d7..a73aca39f 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -1089,7 +1089,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "SyncFB"; - this->driver_class.description = _("xine video output plugin using the SyncFB module for Matrox G200/G400 cards"); + this->driver_class.description = N_("xine video output plugin using the SyncFB module for Matrox G200/G400 cards"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index f8e004583..772b779fa 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -1200,7 +1200,7 @@ static void *vidix_init_class (xine_t *xine, void *visual_gen) { if(this) { this->driver_class.open_plugin = vidix_open_plugin; this->driver_class.identifier = "vidix"; - this->driver_class.description = _("xine video output plugin using libvidix for x11"); + this->driver_class.description = N_("xine video output plugin using libvidix for x11"); this->driver_class.dispose = dispose_class; } @@ -1274,7 +1274,7 @@ static void *vidixfb_init_class (xine_t *xine, void *visual_gen) { if(this) { this->driver_class.open_plugin = vidixfb_open_plugin; this->driver_class.identifier = "vidixfb"; - this->driver_class.description = _("xine video output plugin using libvidix for linux frame buffer"); + this->driver_class.description = N_("xine video output plugin using libvidix for linux frame buffer"); this->driver_class.dispose = dispose_class; } diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 87b5a9b92..645a23c97 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -1241,7 +1241,7 @@ static void *xshm_init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = xshm_open_plugin; this->driver_class.identifier = "XShm"; - this->driver_class.description = _("xine video output plugin using the MIT X shared memory extension"); + this->driver_class.description = N_("xine video output plugin using the MIT X shared memory extension"); this->driver_class.dispose = xshm_dispose_class; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index 67890bd6d..cc5eb602d 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -1381,7 +1381,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "Xv"; - this->driver_class.description = _("xine video output plugin using the MIT X video extension"); + this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 775211098..528435b37 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -1302,7 +1302,7 @@ static void *xshm_init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = xshm_open_plugin_old; this->driver_class.identifier = "XShm"; - this->driver_class.description = _("xine video output plugin using the MIT X shared memory extension"); + this->driver_class.description = N_("xine video output plugin using the MIT X shared memory extension"); this->driver_class.dispose = xshm_dispose_class; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 21d4aa0c4..4949fe843 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -1464,7 +1464,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin_old; this->driver_class.identifier = "Xv"; - this->driver_class.description = _("xine video output plugin using the MIT X video extension"); + this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 8dab2fb83..cd667fe51 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.c @@ -1667,7 +1667,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "XvMC"; - this->driver_class.description = _("xine video output plugin using the XvMC X video extension"); + this->driver_class.description = N_("xine video output plugin using the XvMC X video extension"); this->driver_class.dispose = dispose_class; this->display = display; diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index 89c8f58ed..e77a4b6b7 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -2761,7 +2761,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "XxMC"; - this->driver_class.description = _("xine video output plugin using the MIT X video extension"); + this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; -- cgit v1.2.3 From 448923a2d401f3e21eb586f50c1ca9e2dd6259d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 14:26:34 +0100 Subject: Define free() as the default dispose function for plugin classes. Most plugin classes in xine define a dispose function simply to call free(), but free() is ABI-compatible with our dispose functions, so add a macro that allows to pass free() directly as dispose function. It's an opt-in so that no extra conditional is needed, and plugin authors won't forget about providing a dispose function (if they need to). --- src/demuxers/demux.h | 1 + src/input/input_plugin.h | 2 ++ src/xine-engine/audio_decoder.h | 1 + src/xine-engine/audio_out.h | 2 ++ src/xine-engine/post.h | 2 ++ src/xine-engine/spu_decoder.h | 3 ++- src/xine-engine/video_decoder.h | 1 + src/xine-engine/video_out.h | 1 + 8 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index 0e57a535a..9416b43c3 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -91,6 +91,7 @@ struct demux_class_s { void (*dispose) (demux_class_t *this); }; +#define default_demux_class_dispose (void (*) (demux_class_t *this))free /* * any demux plugin must implement these functions diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index 95df4be97..2917721c9 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -90,6 +90,8 @@ struct input_class_s { int (*eject_media) (input_class_t *this); }; +#define default_input_class_dispose (void (*) (input_class_t *this))free + struct input_plugin_s { /* diff --git a/src/xine-engine/audio_decoder.h b/src/xine-engine/audio_decoder.h index df8556902..f5a9f506e 100644 --- a/src/xine-engine/audio_decoder.h +++ b/src/xine-engine/audio_decoder.h @@ -71,6 +71,7 @@ struct audio_decoder_class_s { void (*dispose) (audio_decoder_class_t *this); }; +#define default_audio_decoder_class_dispose (void (*) (audio_decoder_class_t *this))free struct audio_decoder_s { diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h index 32d9d5813..0dffa6620 100644 --- a/src/xine-engine/audio_out.h +++ b/src/xine-engine/audio_out.h @@ -261,6 +261,8 @@ struct audio_driver_class_s { void (*dispose) (audio_driver_class_t *); }; +#define default_audio_driver_class_dispose (void (*) (audio_driver_class_t *this))free + /** * @brief Initialise the audio_out sync routines * diff --git a/src/xine-engine/post.h b/src/xine-engine/post.h index 940f269e1..1995ca82f 100644 --- a/src/xine-engine/post.h +++ b/src/xine-engine/post.h @@ -78,6 +78,8 @@ struct post_class_s { void (*dispose) (post_class_t *this); }; +#define default_post_class_dispose (void (*) (post_class_t *this))free + struct post_plugin_s { /* public part of the plugin */ diff --git a/src/xine-engine/spu_decoder.h b/src/xine-engine/spu_decoder.h index badf15e41..2a7337c71 100644 --- a/src/xine-engine/spu_decoder.h +++ b/src/xine-engine/spu_decoder.h @@ -70,7 +70,8 @@ struct spu_decoder_class_s { */ void (*dispose) (spu_decoder_class_t *this); }; - + +#define default_spu_decoder_class_dispose (void (*) (spu_decoder_class_t *this))free struct spu_decoder_s { diff --git a/src/xine-engine/video_decoder.h b/src/xine-engine/video_decoder.h index 249b86b4c..ed3386717 100644 --- a/src/xine-engine/video_decoder.h +++ b/src/xine-engine/video_decoder.h @@ -71,6 +71,7 @@ struct video_decoder_class_s { void (*dispose) (video_decoder_class_t *this); }; +#define default_video_decoder_class_dispose (void (*) (video_decoder_class_t *this))free struct video_decoder_s { diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index e81947276..39dbe0caa 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -392,6 +392,7 @@ struct video_driver_class_s { void (*dispose) (video_driver_class_t *self); }; +#define default_video_driver_class_dispose (void (*) (video_driver_class_t *this))free typedef struct rle_elem_s { uint16_t len; -- cgit v1.2.3 From 32a70cef7fdce1648d6850dafbe78bee04830429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 15:40:37 +0100 Subject: Use default_*_class_dispose macro whenever the class dispose function only called free(). --- src/audio_out/audio_alsa_out.c | 10 +--------- src/audio_out/audio_coreaudio_out.c | 10 +--------- src/audio_out/audio_directx2_out.c | 8 +------- src/audio_out/audio_directx_out.c | 8 +------- src/audio_out/audio_esd_out.c | 10 +--------- src/audio_out/audio_file_out.c | 10 +--------- src/audio_out/audio_fusionsound_out.c | 6 +----- src/audio_out/audio_jack_out.c | 9 +-------- src/audio_out/audio_none_out.c | 10 +--------- src/audio_out/audio_oss_out.c | 10 +--------- src/audio_out/audio_sun_out.c | 10 +--------- src/combined/flac_decoder.c | 7 +------ src/combined/flac_demuxer.c | 11 +---------- src/combined/nsf_decoder.c | 11 +---------- src/combined/nsf_demuxer.c | 8 +------- src/combined/wavpack_decoder.c | 6 +----- src/combined/wavpack_demuxer.c | 8 +------- src/combined/xine_ogg_demuxer.c | 16 ++-------------- src/combined/xine_speex_decoder.c | 6 +----- src/combined/xine_theora_decoder.c | 9 +-------- src/combined/xine_vorbis_decoder.c | 7 +------ src/demuxers/demux_4xm.c | 8 +------- src/demuxers/demux_aac.c | 8 +------- src/demuxers/demux_ac3.c | 8 +------- src/demuxers/demux_aiff.c | 8 +------- src/demuxers/demux_asf.c | 9 +-------- src/demuxers/demux_aud.c | 8 +------- src/demuxers/demux_avi.c | 8 +------- src/demuxers/demux_cdda.c | 8 +------- src/demuxers/demux_dts.c | 8 +------- src/demuxers/demux_eawve.c | 6 +----- src/demuxers/demux_elem.c | 8 +------- src/demuxers/demux_film.c | 8 +------- src/demuxers/demux_flac.c | 8 +------- src/demuxers/demux_fli.c | 8 +------- src/demuxers/demux_flv.c | 8 +------- src/demuxers/demux_idcin.c | 8 +------- src/demuxers/demux_iff.c | 8 +------- src/demuxers/demux_image.c | 9 +-------- src/demuxers/demux_ipmovie.c | 8 +------- src/demuxers/demux_matroska.c | 9 +-------- src/demuxers/demux_mng.c | 6 +----- src/demuxers/demux_mod.c | 8 +------- src/demuxers/demux_mpc.c | 8 +------- src/demuxers/demux_mpeg.c | 8 +------- src/demuxers/demux_mpeg_block.c | 9 +-------- src/demuxers/demux_mpeg_pes.c | 9 +-------- src/demuxers/demux_mpgaudio.c | 9 +-------- src/demuxers/demux_nsv.c | 8 +------- src/demuxers/demux_playlist.c | 8 +------- src/demuxers/demux_pva.c | 8 +------- src/demuxers/demux_qt.c | 9 +-------- src/demuxers/demux_rawdv.c | 8 +------- src/demuxers/demux_real.c | 8 +------- src/demuxers/demux_realaudio.c | 8 +------- src/demuxers/demux_roq.c | 8 +------- src/demuxers/demux_shn.c | 8 +------- src/demuxers/demux_slave.c | 8 +------- src/demuxers/demux_smjpeg.c | 8 +------- src/demuxers/demux_snd.c | 8 +------- src/demuxers/demux_str.c | 7 +------ src/demuxers/demux_ts.c | 9 +-------- src/demuxers/demux_tta.c | 8 +------- src/demuxers/demux_vmd.c | 8 +------- src/demuxers/demux_voc.c | 8 +------- src/demuxers/demux_vox.c | 8 +------- src/demuxers/demux_vqa.c | 8 +------- src/demuxers/demux_wav.c | 8 +------- src/demuxers/demux_wc3movie.c | 8 +------- src/demuxers/demux_yuv4mpeg2.c | 8 +------- src/demuxers/demux_yuv_frames.c | 8 +------- src/dxr3/dxr3_decode_spu.c | 9 +-------- src/dxr3/dxr3_decode_video.c | 9 +-------- src/input/input_net.c | 8 +------- src/input/input_pnm.c | 8 +------- src/input/input_pvr.c | 8 +------- src/input/input_rtp.c | 8 +------- src/input/input_rtsp.c | 9 +-------- src/input/input_smb.c | 10 +--------- src/input/input_stdin_fifo.c | 8 +------- src/input/input_v4l.c | 11 ++--------- src/libffmpeg/ff_audio_decoder.c | 6 +----- src/libffmpeg/ff_dvaudio_decoder.c | 6 +----- src/libffmpeg/ff_video_decoder.c | 6 +----- src/libmpeg2/xine_mpeg2_decoder.c | 7 +------ src/libmpeg2new/xine_mpeg2new_decoder.c | 7 +------ src/libreal/xine_real_audio_decoder.c | 7 +------ src/libreal/xine_real_video_decoder.c | 7 +------ src/libspucc/xine_cc_decoder.c | 7 +------ src/libspucmml/xine_cmml_decoder.c | 6 +----- src/libspudec/xine_spu_decoder.c | 10 +--------- src/libspudvb/xine_spudvb_decoder.c | 7 +------ src/libsputext/demux_sputext.c | 8 +------- src/libw32dll/qt_decoder.c | 13 ++----------- src/libw32dll/w32codec.c | 13 ++----------- src/libxineadec/gsm610.c | 6 +----- src/libxineadec/xine_a52_decoder.c | 7 +------ src/libxineadec/xine_dts_decoder.c | 8 +------- src/libxineadec/xine_faad_decoder.c | 6 +----- src/libxineadec/xine_lpcm_decoder.c | 6 +----- src/libxineadec/xine_mad_decoder.c | 7 +------ src/libxineadec/xine_musepack_decoder.c | 9 +-------- src/libxinevdec/bitplane.c | 6 +----- src/libxinevdec/gdkpixbuf.c | 11 +---------- src/libxinevdec/image.c | 11 +---------- src/libxinevdec/rgb.c | 6 +----- src/libxinevdec/yuv.c | 6 +----- src/post/audio/stretch.c | 7 +------ src/post/audio/upmix.c | 7 +------ src/post/audio/upmix_mono.c | 7 +------ src/post/audio/volnorm.c | 7 +------ src/post/visualizations/fftgraph.c | 7 +------ src/post/visualizations/fftscope.c | 7 +------ src/post/visualizations/fooviz.c | 7 +------ src/post/visualizations/oscope.c | 7 +------ src/vdr/input_vdr.c | 10 +--------- src/vdr/post_vdr_audio.c | 9 +-------- src/vdr/post_vdr_video.c | 9 +-------- src/video_out/video_out_aa.c | 6 +----- src/video_out/video_out_caca.c | 6 +----- src/video_out/video_out_directfb.c | 15 ++------------- src/video_out/video_out_directx.c | 9 +-------- src/video_out/video_out_fb.c | 8 +------- src/video_out/video_out_macosx.m | 8 +------- src/video_out/video_out_none.c | 8 +------- src/video_out/video_out_opengl.c | 9 +-------- src/video_out/video_out_pgx32.c | 9 +-------- src/video_out/video_out_pgx64.c | 10 +--------- src/video_out/video_out_sdl.c | 7 +------ src/video_out/video_out_stk.c | 8 +------- src/video_out/video_out_syncfb.c | 10 +--------- src/video_out/video_out_vidix.c | 12 ++---------- src/video_out/video_out_xcbshm.c | 9 +-------- src/video_out/video_out_xcbxv.c | 9 +-------- src/video_out/video_out_xshm.c | 9 +-------- src/video_out/video_out_xv.c | 9 +-------- src/video_out/video_out_xxmc.c | 9 +-------- 137 files changed, 143 insertions(+), 991 deletions(-) diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 5ee467317..04137fb44 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -1662,14 +1662,6 @@ static void alsa_speaker_arrangement_cb (void *user_data, /* * class functions */ - -static void dispose_class (audio_driver_class_t *this_gen) { - - alsa_class_t *this = (alsa_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { alsa_class_t *this; @@ -1681,7 +1673,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "alsa"; this->driver_class.description = N_("xine audio output plugin using alsa-compliant audio devices/drivers"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_audio_driver_class_dispose; /* this->config = xine->config; */ this->xine = xine; diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c index 805996166..f0beac579 100644 --- a/src/audio_out/audio_coreaudio_out.c +++ b/src/audio_out/audio_coreaudio_out.c @@ -560,14 +560,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, /* * class functions */ - -static void dispose_class (audio_driver_class_t *this_gen) { - - coreaudio_class_t *this = (coreaudio_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { coreaudio_class_t *this; @@ -581,7 +573,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "coreaudio"; this->driver_class.description = N_("xine output plugin for Coreaudio/Mac OS X"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_audio_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index 961f93a68..97f28b9dd 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.c @@ -988,12 +988,6 @@ static ao_driver_t *open_plugin(audio_driver_class_t *class_gen, const void *dat return (ao_driver_t *)this; } - -static void dispose_class(audio_driver_class_t *this_gen) { - free(this_gen); -} - - static void *init_class(xine_t *xine, void *data) { dx2_class_t *this; @@ -1006,7 +1000,7 @@ static void *init_class(xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "directx2"; this->driver_class.description = N_("second xine audio output plugin using directx"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_audio_driver_class_dispose; this->xine = xine; diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index d2dc3628f..340f93af9 100644 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -819,12 +819,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da return ( ao_driver_t * ) ao_directx; } -static void dispose_class (audio_driver_class_t *this_gen) { - audiox_class_t *audiox = (audiox_class_t *) this_gen; - - free (audiox); -} - static void *init_class (xine_t *xine, void *data) { audiox_class_t *audiox; @@ -840,7 +834,7 @@ static void *init_class (xine_t *xine, void *data) { audiox->driver_class.open_plugin = open_plugin; audiox->driver_class.identifier = "DirectX"; audiox->driver_class.description = N_("xine audio output plugin for win32 using directx"); - audiox->driver_class.dispose = dispose_class; + audiox->driver_class.dispose = default_audio_driver_class_dispose; audiox->xine = xine; audiox->config = xine->config; diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c index 6c770dd08..f94345194 100644 --- a/src/audio_out/audio_esd_out.c +++ b/src/audio_out/audio_esd_out.c @@ -563,14 +563,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, /* * class functions */ - -static void dispose_class (audio_driver_class_t *this_gen) { - - esd_class_t *this = (esd_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { esd_class_t *this; @@ -582,7 +574,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "esd"; this->driver_class.description = N_("xine audio output plugin using esound"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_audio_driver_class_dispose; this->xine = xine; diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c index 6e85e5754..c2382cf21 100644 --- a/src/audio_out/audio_file_out.c +++ b/src/audio_out/audio_file_out.c @@ -353,14 +353,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, /* * class functions */ - -static void dispose_class (audio_driver_class_t *this_gen) { - - file_class_t *this = (file_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { file_class_t *this; @@ -374,7 +366,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "file"; this->driver_class.description = N_("xine file audio output plugin"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_audio_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c index 75eac7906..3863c4e7c 100644 --- a/src/audio_out/audio_fusionsound_out.c +++ b/src/audio_out/audio_fusionsound_out.c @@ -434,10 +434,6 @@ static ao_driver_t* open_plugin(audio_driver_class_t *ao_class, * class functions */ -static void dispose_class(audio_driver_class_t *ao_class) { - free (ao_class); -} - static void* init_class(xine_t *xine, void *data) { fusionsound_class_t *class; const char *error; @@ -462,7 +458,7 @@ static void* init_class(xine_t *xine, void *data) { class->ao_class.open_plugin = open_plugin; class->ao_class.identifier = "FunsionSound"; class->ao_class.description = N_("xine FusionSound audio output plugin"); - class->ao_class.dispose = dispose_class; + class->ao_class.dispose = default_audio_driver_class_dispose; class->xine = xine; return class; diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c index 38b5cf25c..267c7f85f 100644 --- a/src/audio_out/audio_jack_out.c +++ b/src/audio_out/audio_jack_out.c @@ -397,13 +397,6 @@ static ao_driver_t *open_jack_plugin (audio_driver_class_t *class_gen, /* * class functions */ - -static void dispose_class (audio_driver_class_t *this_gen) { - - jack_class_t *this = (jack_class_t *) this_gen; - free (this); -} - static void *init_class (xine_t *xine, void *data) { jack_class_t *this; @@ -413,7 +406,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_jack_plugin; this->driver_class.identifier = "jack"; this->driver_class.description = N_("xine output plugin for JACK Audio Connection Kit"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_audio_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c index f4c9d83c1..f5fb22126 100644 --- a/src/audio_out/audio_none_out.c +++ b/src/audio_out/audio_none_out.c @@ -214,14 +214,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, /* * class functions */ - -static void dispose_class (audio_driver_class_t *this_gen) { - - none_class_t *this = (none_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { none_class_t *this; @@ -235,7 +227,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "none"; this->driver_class.description = N_("xine dummy audio output plugin"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_audio_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index 52ab01a08..a50296b23 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.c @@ -1145,14 +1145,6 @@ static void oss_speaker_arrangement_cb (void *user_data, /* * class functions */ - -static void dispose_class (audio_driver_class_t *this_gen) { - - oss_class_t *this = (oss_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { oss_class_t *this; @@ -1164,7 +1156,7 @@ static void *init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "oss"; this->driver_class.description = N_("xine audio output plugin using oss-compliant audio devices/drivers"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_audio_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c index f605854ac..794c3786c 100644 --- a/src/audio_out/audio_sun_out.c +++ b/src/audio_out/audio_sun_out.c @@ -1011,14 +1011,6 @@ static ao_driver_t *ao_sun_open_plugin (audio_driver_class_t *class_gen, const v /* * class functions */ - -static void ao_sun_dispose_class (audio_driver_class_t *this_gen) { - - sun_class_t *this = (sun_class_t *) this_gen; - - free (this); -} - static void *ao_sun_init_class (xine_t *xine, void *data) { sun_class_t *this; @@ -1029,7 +1021,7 @@ static void *ao_sun_init_class (xine_t *xine, void *data) { this->driver_class.open_plugin = ao_sun_open_plugin; this->driver_class.identifier = "sun"; this->driver_class.description = N_("xine audio output plugin using sun-compliant audio devices/drivers"); - this->driver_class.dispose = ao_sun_dispose_class; + this->driver_class.dispose = default_audio_driver_class_dispose; this->xine = xine; diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c index 8d168fc12..0dc6823aa 100644 --- a/src/combined/flac_decoder.c +++ b/src/combined/flac_decoder.c @@ -379,11 +379,6 @@ open_plugin (audio_decoder_class_t *class_gen, xine_stream_t *stream) { /* * flac plugin class */ - -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void * init_plugin (xine_t *xine, void *data) { flac_class_t *this; @@ -393,7 +388,7 @@ init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "flacdec"; this->decoder_class.description = N_("flac audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_dispose; return this; diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c index df52c770b..b16c56106 100644 --- a/src/combined/flac_demuxer.c +++ b/src/combined/flac_demuxer.c @@ -723,15 +723,6 @@ get_mimetypes (demux_class_t *this_gen) { return "application/x-flac: flac: FLAC Audio;"; } -static void -class_dispose (demux_class_t *this_gen) { - demux_flac_class_t *this = (demux_flac_class_t *) this_gen; - - lprintf("class_dispose\n"); - - free (this); -} - void * demux_flac_init_class (xine_t *xine, void *data) { @@ -748,7 +739,7 @@ demux_flac_init_class (xine_t *xine, void *data) { this->demux_class.identifier = "FLAC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c index 861d25bf4..b2694e789 100644 --- a/src/combined/nsf_decoder.c +++ b/src/combined/nsf_decoder.c @@ -230,15 +230,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -/* This function frees the audio decoder class and any other memory that was - * allocated. */ -static void dispose_class (audio_decoder_class_t *this_gen) { - - nsf_class_t *this = (nsf_class_t *)this_gen; - - free (this); -} - /* This function allocates a private audio decoder class and initializes * the class's member functions. */ void *decoder_nsf_init_plugin (xine_t *xine, void *data) { @@ -250,7 +241,7 @@ void *decoder_nsf_init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "NSF"; this->decoder_class.description = N_("NES Music audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c index 002e8f90c..f6e5f8eff 100644 --- a/src/combined/nsf_demuxer.c +++ b/src/combined/nsf_demuxer.c @@ -357,12 +357,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_nsf_class_t *this = (demux_nsf_class_t *) this_gen; - - free (this); -} - void *demux_nsf_init_plugin (xine_t *xine, void *data) { demux_nsf_class_t *this; @@ -373,7 +367,7 @@ void *demux_nsf_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "NSF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c index 6e450050d..8eb041664 100644 --- a/src/combined/wavpack_decoder.c +++ b/src/combined/wavpack_decoder.c @@ -311,10 +311,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre * wavpack plugin class */ -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - void *decoder_wavpack_init_plugin (xine_t *xine, void *data) { wavpack_class_t *this; @@ -323,7 +319,7 @@ void *decoder_wavpack_init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "wavpackdec"; this->decoder_class.description = N_("wavpack audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c index 010b22245..6ab5013e8 100644 --- a/src/combined/wavpack_demuxer.c +++ b/src/combined/wavpack_demuxer.c @@ -386,12 +386,6 @@ static const char *get_mimetypes (demux_class_t *const this_gen) { return NULL; } -static void class_dispose (demux_class_t *const this_gen) { - demux_wv_class_t *const this = (demux_wv_class_t *) this_gen; - - free (this); -} - void *demux_wv_init_plugin (xine_t *const xine, void *const data) { demux_wv_class_t *const this = xine_xmalloc (sizeof (demux_wv_class_t)); @@ -400,7 +394,7 @@ void *demux_wv_init_plugin (xine_t *const xine, void *const data) { this->demux_class.identifier = "Wavpack"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 5cab808b9..6f8dbe658 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -2125,12 +2125,6 @@ static const char *anx_get_mimetypes (demux_class_t *this_gen) { return "application/x-annodex: ogg: Annodex media;"; } -static void anx_class_dispose (demux_class_t *this_gen) { - demux_anx_class_t *this = (demux_anx_class_t *) this_gen; - - free (this); -} - static void *anx_init_class (xine_t *xine, void *data) { demux_anx_class_t *this; @@ -2141,7 +2135,7 @@ static void *anx_init_class (xine_t *xine, void *data) { this->demux_class.identifier = "Annodex"; this->demux_class.get_mimetypes = anx_get_mimetypes; this->demux_class.get_extensions = anx_get_extensions; - this->demux_class.dispose = anx_class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } @@ -2161,12 +2155,6 @@ static const char *ogg_get_mimetypes (demux_class_t *this_gen) { "application/ogg: ogg: Ogg Stream;"; } -static void ogg_class_dispose (demux_class_t *this_gen) { - demux_ogg_class_t *this = (demux_ogg_class_t *) this_gen; - - free (this); -} - static void *ogg_init_class (xine_t *xine, void *data) { demux_ogg_class_t *this; @@ -2177,7 +2165,7 @@ static void *ogg_init_class (xine_t *xine, void *data) { this->demux_class.identifier = "OGG"; this->demux_class.get_mimetypes = ogg_get_mimetypes; this->demux_class.get_extensions = ogg_get_extensions; - this->demux_class.dispose = ogg_class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c index 09ac901d4..e4fc44eec 100644 --- a/src/combined/xine_speex_decoder.c +++ b/src/combined/xine_speex_decoder.c @@ -376,10 +376,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, * speex plugin class */ -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - void *speex_init_plugin (xine_t *xine, void *data) { speex_class_t *this; @@ -389,7 +385,7 @@ void *speex_init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "speex"; this->decoder_class.description = N_("Speex audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c index 2ce3299fd..8d06a5510 100644 --- a/src/combined/xine_theora_decoder.c +++ b/src/combined/xine_theora_decoder.c @@ -343,13 +343,6 @@ static video_decoder_t *theora_open_plugin (video_decoder_class_t *class_gen, xi /* * theora plugin class */ -static void theora_dispose_class (video_decoder_class_t *this) { - /* - * free all class-related resources - */ - free (this); -} - void *theora_init_plugin (xine_t *xine, void *data) { /*initialize our plugin*/ theora_class_t *this; @@ -359,7 +352,7 @@ void *theora_init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = theora_open_plugin; this->decoder_class.identifier = "theora video"; this->decoder_class.description = N_("theora video decoder plugin"); - this->decoder_class.dispose = theora_dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c index d76b1ff44..aa3546e2e 100644 --- a/src/combined/xine_vorbis_decoder.c +++ b/src/combined/xine_vorbis_decoder.c @@ -310,11 +310,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, /* * vorbis plugin class */ - -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - void *vorbis_init_plugin (xine_t *xine, void *data) { vorbis_class_t *this; @@ -324,7 +319,7 @@ void *vorbis_init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "vorbis"; this->decoder_class.description = N_("vorbis audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 534686d47..8df2dec02 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -529,12 +529,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_fourxm_class_t *this = (demux_fourxm_class_t *) this_gen; - - free (this); -} - void *demux_fourxm_init_plugin (xine_t *xine, void *data) { demux_fourxm_class_t *this; @@ -545,7 +539,7 @@ void *demux_fourxm_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "4X Technologies"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index ff82f439e..415521852 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -316,12 +316,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_aac_class_t *this = (demux_aac_class_t *) this_gen; - - free (this); -} - void *demux_aac_init_plugin (xine_t *xine, void *data) { demux_aac_class_t *this; @@ -332,7 +326,7 @@ void *demux_aac_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "AAC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 1cb2ec62b..d3a938909 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -474,12 +474,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_ac3_class_t *this = (demux_ac3_class_t *) this_gen; - - free (this); -} - void *demux_ac3_init_plugin (xine_t *xine, void *data) { demux_ac3_class_t *this; @@ -490,7 +484,7 @@ void *demux_ac3_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "AC3"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 7287db0bc..4cb693c39 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -396,12 +396,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "audio/x-pn-aiff: aif, aiff: AIFF audio;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_aiff_class_t *this = (demux_aiff_class_t *) this_gen; - - free (this); -} - void *demux_aiff_init_plugin (xine_t *xine, void *data) { demux_aiff_class_t *this; @@ -412,7 +406,7 @@ void *demux_aiff_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "AIFF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 2fc747802..b557abdfe 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -2113,13 +2113,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "video/x-ms-wax: wva: wma metafile;"; } -static void class_dispose (demux_class_t *this_gen) { - - demux_asf_class_t *this = (demux_asf_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_asf_class_t *this; @@ -2133,7 +2126,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "ASF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 8df886fdb..6b72d44eb 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -326,12 +326,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_aud_class_t *this = (demux_aud_class_t *) this_gen; - - free (this); -} - void *demux_aud_init_plugin (xine_t *xine, void *data) { demux_aud_class_t *this; @@ -342,7 +336,7 @@ void *demux_aud_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Westwood Studios AUD"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 0f8e19266..51fb488e4 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -2319,12 +2319,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "video/x-msvideo: avi: AVI video;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_avi_class_t *this = (demux_avi_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_avi_class_t *this; @@ -2335,7 +2329,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "AVI"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index 26fe6bbfb..a8e59796a 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -233,12 +233,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_cdda_class_t *this = (demux_cdda_class_t *) this_gen; - - free (this); -} - void *demux_cdda_init_plugin (xine_t *xine, void *data) { demux_cdda_class_t *this; @@ -249,7 +243,7 @@ void *demux_cdda_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "CDDA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index b89ec3cc0..c64b7dc17 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -401,12 +401,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_dts_class_t *this = (demux_dts_class_t *) this_gen; - - free (this); -} - void *demux_dts_init_plugin (xine_t *xine, void *data) { demux_dts_class_t *this; @@ -417,7 +411,7 @@ void *demux_dts_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "DTS"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index 08e6f82b5..49086678d 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -406,10 +406,6 @@ static const char *get_mimetypes(demux_class_t *this_gen){ return NULL; } -static void class_dispose(demux_class_t *this){ - free(this); -} - void *demux_eawve_init_plugin(xine_t *xine, void *data) { demux_eawve_class_t *this; @@ -420,7 +416,7 @@ void *demux_eawve_init_plugin(xine_t *xine, void *data) { this->demux_class.identifier = "EA WVE"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 4517604f7..2cf50dcc2 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -267,12 +267,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_mpeg_elem_class_t *this = (demux_mpeg_elem_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_elem_class_t *this; @@ -283,7 +277,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "MPEG_ELEM"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 78c596af6..261aaac89 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -910,12 +910,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_film_class_t *this = (demux_film_class_t *) this_gen; - - free (this); -} - void *demux_film_init_plugin (xine_t *xine, void *data) { demux_film_class_t *this; @@ -926,7 +920,7 @@ void *demux_film_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "FILM (CPK)"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c index eee8dbd73..accfbcb4e 100644 --- a/src/demuxers/demux_flac.c +++ b/src/demuxers/demux_flac.c @@ -538,12 +538,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_flac_class_t *this = (demux_flac_class_t *) this_gen; - - free (this); -} - void *demux_flac_init_plugin (xine_t *xine, void *data) { demux_flac_class_t *this; @@ -554,7 +548,7 @@ void *demux_flac_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "FLAC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index 0b7173955..c56d55e75 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -360,12 +360,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return "video/x-flic: fli,flc: Autodesk FLIC files;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_fli_class_t *this = (demux_fli_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_fli_class_t *this; @@ -376,7 +370,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "FLI/FLC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index 5d0c8f9ab..10f9c9afe 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -887,12 +887,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return "video/x-flv: flv: Flash video;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_flv_class_t *this = (demux_flv_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_flv_class_t *this; @@ -903,7 +897,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "FLV"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index ebdcf6e77..76d460476 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -531,12 +531,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_idcin_class_t *this = (demux_idcin_class_t *) this_gen; - - free (this); -} - void *demux_idcin_init_plugin (xine_t *xine, void *data) { demux_idcin_class_t *this; @@ -547,7 +541,7 @@ void *demux_idcin_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Id CIN"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index 51708276a..97d9c7a62 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -1298,12 +1298,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "video/anim: anim: IFF-ANIM Video;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_iff_class_t *this = (demux_iff_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_iff_class_t *this; @@ -1314,7 +1308,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "IFF"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index c1ae2b28f..2a1e56230 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -231,13 +231,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_image_class_t *this = (demux_image_class_t *) this_gen; - - lprintf("class closed\n"); - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_image_class_t *this; @@ -248,7 +241,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "imagedmx"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; lprintf("class opened\n"); return this; diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index be8ecf084..22656acca 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -729,12 +729,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_ipmovie_class_t *this = (demux_ipmovie_class_t *) this_gen; - - free (this); -} - void *demux_ipmovie_init_plugin (xine_t *xine, void *data) { demux_ipmovie_class_t *this; @@ -745,7 +739,7 @@ void *demux_ipmovie_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Interplay MVE"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 2b4f63d9c..b4c79afd7 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -2871,13 +2871,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { } -static void class_dispose (demux_class_t *this_gen) { - - demux_matroska_class_t *this = (demux_matroska_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_matroska_class_t *this; @@ -2890,7 +2883,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "matroska"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index 64dcb71d3..67e9e175e 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -345,10 +345,6 @@ static const char *get_mimetypes(demux_class_t *this_gen){ "video/x-mng: mng: MNG animation;"; } -static void class_dispose(demux_class_t *this){ - free (this); -} - static void *init_plugin(xine_t *xine, void *data){ demux_mng_class_t *this; @@ -359,7 +355,7 @@ static void *init_plugin(xine_t *xine, void *data){ this->demux_class.identifier = "MNG"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index 991e93cb8..ff68fdd42 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -360,12 +360,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_mod_class_t *this = (demux_mod_class_t *) this_gen; - - free (this); -} - static void *demux_mod_init_plugin (xine_t *xine, void *data) { demux_mod_class_t *this; @@ -376,7 +370,7 @@ static void *demux_mod_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "mod"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index 1e39d7d4d..2192ccf45 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.c @@ -380,12 +380,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_mpc_class_t *this = (demux_mpc_class_t *) this_gen; - - free (this); -} - void *demux_mpc_init_plugin (xine_t *xine, void *data) { demux_mpc_class_t *this; @@ -396,7 +390,7 @@ void *demux_mpc_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Musepack"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index ded69e73a..48bf31737 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -1229,12 +1229,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "video/x-mpeg: mpeg, mpg, mpe: MPEG animation;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_mpeg_class_t *this = (demux_mpeg_class_t *) this_gen; - - free (this); - } - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_class_t *this; @@ -1245,7 +1239,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "MPEG"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index e92b19b3d..390043b4d 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -1521,13 +1521,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - - demux_mpeg_block_class_t *this = (demux_mpeg_block_class_t *) this_gen; - - free (this); - } - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_block_class_t *this; @@ -1541,7 +1534,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "MPEG_BLOCK"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 2a3b14f5c..c24919867 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -1768,13 +1768,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - - demux_mpeg_pes_class_t *this = (demux_mpeg_pes_class_t *) this_gen; - - free (this); - } - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_pes_class_t *this; @@ -1787,7 +1780,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "MPEG_PES"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 79886f7e6..bbb95e893 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -1058,13 +1058,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return ""; } -static void class_dispose (demux_class_t *this_gen) { - - demux_mpgaudio_class_t *this = (demux_mpgaudio_class_t *) this_gen; - - free (this); -} - void *demux_mpgaudio_init_class (xine_t *xine, void *data) { demux_mpgaudio_class_t *this; @@ -1077,7 +1070,7 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) { this->demux_class.identifier = "MPEGAUDIO"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 3f931b1c6..ee87a2f34 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -651,12 +651,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_nsv_class_t *this = (demux_nsv_class_t *) this_gen; - - free (this); -} - static void *demux_nsv_init_plugin (xine_t *xine, void *data) { demux_nsv_class_t *this; @@ -667,7 +661,7 @@ static void *demux_nsv_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Nullsoft NSV"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c index da8e526ce..d9402479d 100644 --- a/src/demuxers/demux_playlist.c +++ b/src/demuxers/demux_playlist.c @@ -703,12 +703,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "application/xspf+xml: xspf: XSPF playlist;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_playlist_class_t *this = (demux_playlist_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_playlist_class_t *this; @@ -719,7 +713,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "playlist"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 8b162b0a7..027029885 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -486,12 +486,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_pva_class_t *this = (demux_pva_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_pva_class_t *this; @@ -502,7 +496,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "TechnoTrend PVA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 83d72a349..03903e472 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -3133,13 +3133,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "application/x-quicktimeplayer: qtl: Quicktime list;"; } -static void class_dispose (demux_class_t *this_gen) { - - demux_qt_class_t *this = (demux_qt_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_qt_class_t *this; @@ -3153,7 +3146,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "MOV/MPEG-4"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index 07b438032..067f88d1c 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -419,12 +419,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_raw_dv_class_t *this = (demux_raw_dv_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_raw_dv_class_t *this; @@ -435,7 +429,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "raw_dv"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 4d7222506..9f6a693ee 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -1627,12 +1627,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "application/vnd.rn-realmedia: ra, rm, ram: Real Media file;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_real_class_t *this = (demux_real_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_real_class_t *this; @@ -1643,7 +1637,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "Real"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index 76d9de003..f17f12800 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -385,12 +385,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return "audio/x-realaudio: ra: RealAudio File;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_ra_class_t *this = (demux_ra_class_t *) this_gen; - - free (this); -} - void *demux_realaudio_init_plugin (xine_t *xine, void *data) { demux_ra_class_t *this; @@ -401,7 +395,7 @@ void *demux_realaudio_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "RA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 920e19fdf..146995ae9 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -468,12 +468,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_roq_class_t *this = (demux_roq_class_t *) this_gen; - - free (this); -} - void *demux_roq_init_plugin (xine_t *xine, void *data) { demux_roq_class_t *this; @@ -484,7 +478,7 @@ void *demux_roq_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "RoQ"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c index f2d5dc7dd..3654cc074 100644 --- a/src/demuxers/demux_shn.c +++ b/src/demuxers/demux_shn.c @@ -236,12 +236,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_shn_class_t *this = (demux_shn_class_t *) this_gen; - - free (this); -} - void *demux_shn_init_plugin (xine_t *xine, void *data) { demux_shn_class_t *this; @@ -252,7 +246,7 @@ void *demux_shn_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Shorten"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index 22eed6973..036c89dc4 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -397,12 +397,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_slave_class_t *this = (demux_slave_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_slave_class_t *this; @@ -413,7 +407,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "slave"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index d1a1c2f58..8c3b4663f 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -457,12 +457,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_smjpeg_class_t *this = (demux_smjpeg_class_t *) this_gen; - - free (this); -} - void *demux_smjpeg_init_plugin (xine_t *xine, void *data) { demux_smjpeg_class_t *this; @@ -473,7 +467,7 @@ void *demux_smjpeg_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "SMJPEG"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index b15a99266..f3d7458f8 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -378,12 +378,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { } -static void class_dispose (demux_class_t *this_gen) { - demux_snd_class_t *this = (demux_snd_class_t *) this_gen; - - free (this); -} - void *demux_snd_init_plugin (xine_t *xine, void *data) { demux_snd_class_t *this; @@ -394,7 +388,7 @@ void *demux_snd_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "SND/AU"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index 65d7d2368..b878be2e8 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -612,11 +612,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_str_class_t *this = (demux_str_class_t *) this_gen; - free (this); -} - void *demux_str_init_plugin (xine_t *xine, void *data) { demux_str_class_t *this; @@ -627,7 +622,7 @@ void *demux_str_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "PSX STR"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 3c11d0a39..2e1ab4ce6 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -2271,13 +2271,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - - demux_ts_class_t *this = (demux_ts_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_ts_class_t *this; @@ -2291,7 +2284,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "MPEG_TS"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index ebb201f1d..294ed81c8 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.c @@ -289,12 +289,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_tta_class_t *this = (demux_tta_class_t *) this_gen; - - free (this); -} - void *demux_tta_init_plugin (xine_t *xine, void *data) { demux_tta_class_t *this; @@ -305,7 +299,7 @@ void *demux_tta_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "True Audio"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c index fd67385a9..1f17ede1f 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.c @@ -478,12 +478,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_vmd_class_t *this = (demux_vmd_class_t *) this_gen; - - free (this); -} - void *demux_vmd_init_plugin (xine_t *xine, void *data) { demux_vmd_class_t *this; @@ -494,7 +488,7 @@ void *demux_vmd_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "VMD"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index 0c641c522..7ab909c2d 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -353,12 +353,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_voc_class_t *this = (demux_voc_class_t *) this_gen; - - free (this); -} - void *demux_voc_init_plugin (xine_t *xine, void *data) { demux_voc_class_t *this; @@ -369,7 +363,7 @@ void *demux_voc_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "VOC"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index 8ee555046..32fe83373 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -230,12 +230,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_vox_class_t *this = (demux_vox_class_t *) this_gen; - - free (this); -} - void *demux_vox_init_plugin (xine_t *xine, void *data) { demux_vox_class_t *this; @@ -246,7 +240,7 @@ void *demux_vox_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "VOX"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index a980745da..3dbe058da 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -391,12 +391,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_vqa_class_t *this = (demux_vqa_class_t *) this_gen; - - free (this); -} - void *demux_vqa_init_plugin (xine_t *xine, void *data) { demux_vqa_class_t *this; @@ -407,7 +401,7 @@ void *demux_vqa_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "VQA"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index f30fec555..f0480d1bc 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -402,12 +402,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "audio/x-pn-windows-acm: wav: WAV audio;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_wav_class_t *this = (demux_wav_class_t *) this_gen; - - free (this); -} - void *demux_wav_init_plugin (xine_t *xine, void *data) { demux_wav_class_t *this; @@ -418,7 +412,7 @@ void *demux_wav_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "WAV"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index 24032da2d..33958cb2c 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -722,12 +722,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_mve_class_t *this = (demux_mve_class_t *) this_gen; - - free (this); -} - void *demux_wc3movie_init_plugin (xine_t *xine, void *data) { demux_mve_class_t *this; @@ -738,7 +732,7 @@ void *demux_wc3movie_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "WC3 Movie"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 02165b016..eaed4c274 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -460,12 +460,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_yuv4mpeg2_class_t *this = (demux_yuv4mpeg2_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_yuv4mpeg2_class_t *this; @@ -476,7 +470,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "YUV4MPEG2"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 7f011f5c8..71915cb9a 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -236,12 +236,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_yuv_frames_class_t *this = (demux_yuv_frames_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_yuv_frames_class_t *this; @@ -252,7 +246,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "YUV_FRAMES"; this->demux_class.get_mimetypes = get_mimetypes; this->demux_class.get_extensions = get_extensions; - this->demux_class.dispose = class_dispose; + this->demux_class.dispose = default_demux_class_dispose; return this; } diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index b83f94782..c921c06f0 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -80,7 +80,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { /* plugin class functions */ static spu_decoder_t *dxr3_spudec_open_plugin(spu_decoder_class_t *class_gen, xine_stream_t *stream); -static void dxr3_spudec_class_dispose(spu_decoder_class_t *class_gen); /* plugin instance functions */ static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf); @@ -202,7 +201,7 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void* data) this->spu_decoder_class.open_plugin = dxr3_spudec_open_plugin; this->spu_decoder_class.identifier = "dxr3-spudec"; this->spu_decoder_class.description = N_("subtitle decoder plugin using the hardware decoding capabilities of a DXR3 decoder card"); - this->spu_decoder_class.dispose = dxr3_spudec_class_dispose; + this->spu_decoder_class.dispose = default_spu_decoder_class_dispose; this->instance = 0; @@ -273,12 +272,6 @@ static spu_decoder_t *dxr3_spudec_open_plugin(spu_decoder_class_t *class_gen, xi return &this->spu_decoder; } -static void dxr3_spudec_class_dispose(spu_decoder_class_t *class_gen) -{ - free(class_gen); -} - - static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf) { dxr3_spudec_t *this = (dxr3_spudec_t *)this_gen; diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 87ea1900c..345627d8f 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -81,7 +81,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { /* plugin class functions */ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_stream_t *stream); -static void dxr3_class_dispose(video_decoder_class_t *class_gen); /* plugin instance functions */ static void dxr3_decode_data(video_decoder_t *this_gen, buf_element_t *buf); @@ -197,7 +196,7 @@ static void *dxr3_init_plugin(xine_t *xine, void *data) this->video_decoder_class.open_plugin = dxr3_open_plugin; this->video_decoder_class.identifier = "dxr3-mpeg2"; this->video_decoder_class.description = N_("MPEGI/II decoder plugin using the hardware decoding capabilities of a DXR3 decoder card."); - this->video_decoder_class.dispose = dxr3_class_dispose; + this->video_decoder_class.dispose = default_video_decoder_class_dispose; this->instance = 0; @@ -297,12 +296,6 @@ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_ return &this->video_decoder; } -static void dxr3_class_dispose(video_decoder_class_t *class_gen) -{ - free(class_gen); -} - - static void dxr3_decode_data(video_decoder_t *this_gen, buf_element_t *buf) { dxr3_decoder_t *this = (dxr3_decoder_t *)this_gen; diff --git a/src/input/input_net.c b/src/input/input_net.c index 30e88757d..85b0b2fe8 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -505,12 +505,6 @@ static input_plugin_t *net_class_get_instance (input_class_t *cls_gen, xine_stre * net plugin class */ -static void net_class_dispose (input_class_t *this_gen) { - net_input_class_t *this = (net_input_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { net_input_class_t *this; @@ -524,7 +518,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.identifier = "TCP"; this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; - this->input_class.dispose = net_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; return this; diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c index b11e1d6b3..aadef9681 100644 --- a/src/input/input_pnm.c +++ b/src/input/input_pnm.c @@ -259,12 +259,6 @@ static input_plugin_t *pnm_class_get_instance (input_class_t *cls_gen, xine_stre * pnm input plugin class stuff */ -static void pnm_class_dispose (input_class_t *this_gen) { - pnm_input_class_t *this = (pnm_input_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { pnm_input_class_t *this; @@ -278,7 +272,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.description = N_("pnm streaming input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; - this->input_class.dispose = pnm_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; return this; diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index eaac6afb8..d340aebc3 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -1522,12 +1522,6 @@ static input_plugin_t *pvr_class_get_instance (input_class_t *cls_gen, xine_stre /* * plugin class functions */ -static void pvr_class_dispose (input_class_t *this_gen) { - pvr_input_class_t *this = (pvr_input_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { pvr_input_class_t *this; @@ -1550,7 +1544,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->input_class.description = N_("WinTV-PVR 250/350 input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; - this->input_class.dispose = pvr_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; return this; diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index 5ef5184cc..1914935e1 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -765,12 +765,6 @@ static input_plugin_t *rtp_class_get_instance (input_class_t *cls_gen, /* * net plugin class */ -static void rtp_class_dispose (input_class_t *this_gen) { - rtp_input_class_t *this = (rtp_input_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { rtp_input_class_t *this; @@ -785,7 +779,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.identifier = "RTP/UDP"; this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; - this->input_class.dispose = rtp_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; return this; diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c index eb79586ad..1d8b1fa84 100644 --- a/src/input/input_rtsp.c +++ b/src/input/input_rtsp.c @@ -279,13 +279,6 @@ static input_plugin_t *rtsp_class_get_instance (input_class_t *cls_gen, xine_str /* * rtsp input plugin class stuff */ - -static void rtsp_class_dispose (input_class_t *this_gen) { - rtsp_input_class_t *this = (rtsp_input_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { rtsp_input_class_t *this; @@ -299,7 +292,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.description = N_("rtsp streaming input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; - this->input_class.dispose = rtsp_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; return this; diff --git a/src/input/input_smb.c b/src/input/input_smb.c index d6f9a78da..cd76ab2ca 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.c @@ -445,14 +445,6 @@ smb_plugin_open (input_plugin_t *this_gen ) return 1; } -static void -smb_class_dispose (input_class_t *this_gen) -{ - smb_input_class_t *this = (smb_input_class_t *) this_gen; - - free (this); -} - static input_plugin_t * smb_class_get_instance (input_class_t *class_gen, xine_stream_t *stream, const char *mrl) @@ -511,7 +503,7 @@ static void this->input_class.description = N_("CIFS/SMB input plugin based on libsmbclient"); this->input_class.get_dir = smb_class_get_dir; this->input_class.get_autoplay_list = NULL; - this->input_class.dispose = smb_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; _exit_error: diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index 7708ee40d..ad0f8400f 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.c @@ -344,12 +344,6 @@ static input_plugin_t *stdin_class_get_instance (input_class_t *class_gen, /* * stdin input plugin class stuff */ -static void stdin_class_dispose (input_class_t *this_gen) { - stdin_input_class_t *this = (stdin_input_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { stdin_input_class_t *this; @@ -363,7 +357,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.description = N_("stdin streaming input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; - this->input_class.dispose = stdin_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; return this; diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 7ed5c172b..6b2349dd2 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -1900,13 +1900,6 @@ static input_plugin_t *v4l_class_get_radio_instance (input_class_t *cls_gen, /* * v4l input plugin class stuff */ - -static void v4l_class_dispose (input_class_t *this_gen) { - v4l_input_class_t *this = (v4l_input_class_t *) this_gen; - - free (this); -} - static void *init_video_class (xine_t *xine, void *data) { v4l_input_class_t *this; @@ -1921,7 +1914,7 @@ static void *init_video_class (xine_t *xine, void *data) this->input_class.description = N_("v4l tv input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; - this->input_class.dispose = v4l_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; config->register_filename (config, "media.video4linux.video_device", @@ -1953,7 +1946,7 @@ static void *init_radio_class (xine_t *xine, void *data) this->input_class.description = N_("v4l radio input plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; - this->input_class.dispose = v4l_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; config->register_filename (config, "media.video4linux.radio_device", diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c index ce2d531cf..6dd9205ea 100644 --- a/src/libffmpeg/ff_audio_decoder.c +++ b/src/libffmpeg/ff_audio_decoder.c @@ -415,10 +415,6 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen, return &this->audio_decoder; } -static void ff_audio_dispose_class (audio_decoder_class_t *this) { - free (this); -} - void *init_audio_plugin (xine_t *xine, void *data) { ff_audio_class_t *this ; @@ -428,7 +424,7 @@ void *init_audio_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = ff_audio_open_plugin; this->decoder_class.identifier = "ffmpeg audio"; this->decoder_class.description = N_("ffmpeg based audio decoder plugin"); - this->decoder_class.dispose = ff_audio_dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; pthread_once( &once_control, init_once_routine ); diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index 60e46ea62..0db76c9b2 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -377,10 +377,6 @@ static audio_decoder_t *dvaudio_open_plugin (audio_decoder_class_t *class_gen, x return &this->audio_decoder; } -static void dvaudio_dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_dvaudio_plugin (xine_t *xine, void *data) { dvaudio_class_t *this ; @@ -390,7 +386,7 @@ static void *init_dvaudio_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = dvaudio_open_plugin; this->decoder_class.identifier = "dv audio"; this->decoder_class.description = N_("dv audio decoder plugin"); - this->decoder_class.dispose = dvaudio_dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index 9e9f4f129..0b8728f06 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -1524,10 +1524,6 @@ static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen, return &this->video_decoder; } -static void ff_video_dispose_class (video_decoder_class_t *this) { - free (this); -} - void *init_video_plugin (xine_t *xine, void *data) { ff_video_class_t *this; @@ -1538,7 +1534,7 @@ void *init_video_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = ff_video_open_plugin; this->decoder_class.identifier = "ffmpeg video"; this->decoder_class.description = N_("ffmpeg based video decoder plugin"); - this->decoder_class.dispose = ff_video_dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; this->xine = xine; pthread_once( &once_control, init_once_routine ); diff --git a/src/libmpeg2/xine_mpeg2_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c index 4e67661dc..788f6bb2f 100644 --- a/src/libmpeg2/xine_mpeg2_decoder.c +++ b/src/libmpeg2/xine_mpeg2_decoder.c @@ -138,11 +138,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre /* * mpeg2 plugin class */ - -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { mpeg2_class_t *this; @@ -152,7 +147,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mpeg2dec"; this->decoder_class.description = N_("mpeg2 based video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/libmpeg2new/xine_mpeg2new_decoder.c b/src/libmpeg2new/xine_mpeg2new_decoder.c index 1bed00954..d0c01a0d4 100644 --- a/src/libmpeg2new/xine_mpeg2new_decoder.c +++ b/src/libmpeg2new/xine_mpeg2new_decoder.c @@ -473,11 +473,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre /* * mpeg2 plugin class */ - -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { mpeg2_class_t *this; @@ -487,7 +482,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mpeg2new"; this->decoder_class.description = N_("mpeg2 based video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c index 60cb47801..5c43f8480 100644 --- a/src/libreal/xine_real_audio_decoder.c +++ b/src/libreal/xine_real_audio_decoder.c @@ -582,11 +582,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, /* * real plugin class */ - -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - void *init_realadec (xine_t *xine, void *data) { real_class_t *this; @@ -597,7 +592,7 @@ void *init_realadec (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "realadec"; this->decoder_class.description = N_("real binary-only codec based audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; _x_real_codecs_init(xine); diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c index 7f8de97bf..617c9f6b5 100644 --- a/src/libreal/xine_real_video_decoder.c +++ b/src/libreal/xine_real_video_decoder.c @@ -510,11 +510,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, /* * real plugin class */ - -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - void *init_realvdec (xine_t *xine, void *data) { real_class_t *this; @@ -525,7 +520,7 @@ void *init_realvdec (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "realvdec"; this->decoder_class.description = N_("real binary-only codec based video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; _x_real_codecs_init(xine); diff --git a/src/libspucc/xine_cc_decoder.c b/src/libspucc/xine_cc_decoder.c index ffb1d17d0..f55b20872 100644 --- a/src/libspucc/xine_cc_decoder.c +++ b/src/libspucc/xine_cc_decoder.c @@ -321,11 +321,6 @@ static spu_decoder_t *spudec_open_plugin (spu_decoder_class_t *class, xine_strea return &this->spu_decoder; } -static void spudec_class_dispose(spu_decoder_class_t *class) { - free(class); -} - - static void *init_spu_decoder_plugin (xine_t *xine, void *data) { spucc_class_t *this ; @@ -335,7 +330,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this->spu_class.open_plugin = spudec_open_plugin; this->spu_class.identifier = "spucc"; this->spu_class.description = N_("closed caption decoder plugin"); - this->spu_class.dispose = spudec_class_dispose; + this->spu_class.dispose = default_spu_decoder_class_dispose; spucc_register_cfg_vars(this, xine->config); this->cc_cfg.config_version = 0; diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c index 31e6e9302..1223769ff 100644 --- a/src/libspucmml/xine_cmml_decoder.c +++ b/src/libspucmml/xine_cmml_decoder.c @@ -490,10 +490,6 @@ static spu_decoder_t *spucmml_class_open_plugin (spu_decoder_class_t *class_gen, return (spu_decoder_t *) this; } -static void spucmml_class_dispose (spu_decoder_class_t *this) { - free (this); -} - static void update_src_encoding(void *this_gen, xine_cfg_entry_t *entry) { spucmml_class_t *this = (spucmml_class_t *)this_gen; @@ -511,7 +507,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this->class.open_plugin = spucmml_class_open_plugin; this->class.identifier = "spucmml"; this->class.description = N_("CMML subtitle decoder plugin"); - this->class.dispose = spucmml_class_dispose; + this->class.dispose = default_spu_decoder_class_dispose; this->xine = xine; diff --git a/src/libspudec/xine_spu_decoder.c b/src/libspudec/xine_spu_decoder.c index d5c5d8c04..05567b68d 100644 --- a/src/libspudec/xine_spu_decoder.c +++ b/src/libspudec/xine_spu_decoder.c @@ -350,14 +350,6 @@ static spu_decoder_t *open_plugin (spu_decoder_class_t *class_gen, xine_stream_t return &this->spu_decoder; } -static void dispose_class (spu_decoder_class_t *this) { -#ifdef LOG_DEBUG - printf ("libspudec:dispose_class called\n"); -#endif - free (this); -} - - static void *init_plugin (xine_t *xine, void *data) { spudec_class_t *this; @@ -367,7 +359,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "spudec"; this->decoder_class.description = N_("DVD/VOB SPU decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_spu_decoder_class_dispose; lprintf ("libspudec:init_plugin called\n"); return this; diff --git a/src/libspudvb/xine_spudvb_decoder.c b/src/libspudvb/xine_spudvb_decoder.c index fcd8f9aab..79e8932a6 100644 --- a/src/libspudvb/xine_spudvb_decoder.c +++ b/src/libspudvb/xine_spudvb_decoder.c @@ -966,11 +966,6 @@ static spu_decoder_t *dvb_spu_class_open_plugin (spu_decoder_class_t * class_gen return (spu_decoder_t *) this; } -static void dvb_spu_class_dispose (spu_decoder_class_t * this) -{ - free (this); -} - static void *init_spu_decoder_plugin (xine_t * xine, void *data) { @@ -980,7 +975,7 @@ static void *init_spu_decoder_plugin (xine_t * xine, void *data) this->class.open_plugin = dvb_spu_class_open_plugin; this->class.identifier = "spudvb"; this->class.description = N_("DVB subtitle decoder plugin"); - this->class.dispose = dvb_spu_class_dispose; + this->class.dispose = default_spu_decoder_class_dispose; this->xine = xine; diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index 68f436729..6e8b1a646 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.c @@ -1459,12 +1459,6 @@ static const char *get_demux_mimetypes (demux_class_t *this_gen) { /* "text/plain: asc txt sub srt: VIDEO subtitles;" */ } -static void demux_class_dispose (demux_class_t *this_gen) { - demux_sputext_class_t *this = (demux_sputext_class_t *) this_gen; - - free (this); -} - static void config_timeout_cb(void *this_gen, xine_cfg_entry_t *entry) { demux_sputext_class_t *this = (demux_sputext_class_t *)this_gen; @@ -1484,7 +1478,7 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { this->demux_class.identifier = "sputext"; this->demux_class.get_mimetypes = get_demux_mimetypes; this->demux_class.get_extensions = get_demux_extensions; - this->demux_class.dispose = demux_class_dispose; + this->demux_class.dispose = default_demux_class_dispose; /* * Some subtitling formats, namely AQT and Subrip09, define the end of a diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index 9954d63de..9967b8e70 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.c @@ -569,11 +569,6 @@ static audio_decoder_t *qta_open_plugin (audio_decoder_class_t *class_gen, /* * qta plugin class */ - -static void qta_dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *qta_init_class (xine_t *xine, void *data) { qta_class_t *this; @@ -589,7 +584,7 @@ static void *qta_init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = qta_open_plugin; this->decoder_class.identifier = "qta"; this->decoder_class.description = N_("quicktime audio decoder plugin"); - this->decoder_class.dispose = qta_dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } @@ -1073,10 +1068,6 @@ static video_decoder_t *qtv_open_plugin (video_decoder_class_t *class_gen, * qtv plugin class */ -static void qtv_dispose_class (video_decoder_class_t *this) { - free (this); -} - /* * some fake functions to make qt codecs happy */ @@ -1105,7 +1096,7 @@ static void *qtv_init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = qtv_open_plugin; this->decoder_class.identifier = "qtvdec"; this->decoder_class.description = N_("quicktime binary-only codec based video decoder plugin"); - this->decoder_class.dispose = qtv_dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index e7f13c375..efbf69f67 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -1568,10 +1568,6 @@ static video_decoder_t *open_video_decoder_plugin (video_decoder_class_t *class_ * video decoder class */ -static void dispose_video_class (video_decoder_class_t *this) { - free (this); -} - static void init_routine(void) { pthread_mutex_init (&win32_codec_mutex, NULL); w32v_init_rgb_ycc(); @@ -1590,7 +1586,7 @@ static void *init_video_decoder_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_video_decoder_plugin; this->decoder_class.identifier = "w32v"; this->decoder_class.description = N_("win32 binary video codec plugin"); - this->decoder_class.dispose = dispose_video_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; pthread_once (&once_control, init_routine); @@ -1626,11 +1622,6 @@ static audio_decoder_t *open_audio_decoder_plugin (audio_decoder_class_t *class_ /* * audio decoder plugin class */ - -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_audio_decoder_class (xine_t *xine, void *data) { w32a_class_t *this; @@ -1644,7 +1635,7 @@ static void *init_audio_decoder_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_audio_decoder_plugin; this->decoder_class.identifier = "win32 audio"; this->decoder_class.description = N_("win32 binary audio codec plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; pthread_once (&once_control, init_routine); diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c index e56ccf8b4..723f18614 100644 --- a/src/libxineadec/gsm610.c +++ b/src/libxineadec/gsm610.c @@ -249,10 +249,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { gsm610_class_t *this ; @@ -262,7 +258,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "GSM 6.10"; this->decoder_class.description = N_("GSM 6.10 audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxineadec/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c index 1d99c0ce0..e79958087 100644 --- a/src/libxineadec/xine_a52_decoder.c +++ b/src/libxineadec/xine_a52_decoder.c @@ -769,11 +769,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this) { - lprintf ("dispose_class called\n"); - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { a52dec_class_t *this; @@ -784,7 +779,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "a/52dec"; this->decoder_class.description = N_("liba52 based a52 audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; cfg = this->config = xine->config; diff --git a/src/libxineadec/xine_dts_decoder.c b/src/libxineadec/xine_dts_decoder.c index b8ba460d7..d12f51e36 100644 --- a/src/libxineadec/xine_dts_decoder.c +++ b/src/libxineadec/xine_dts_decoder.c @@ -547,12 +547,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this) { - lprintf("dispose_class\n"); - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { dts_class_t *this ; @@ -563,7 +557,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "DTS"; this->decoder_class.description = N_("DTS passthru audio format decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c index b7f6b7630..3eab9b959 100644 --- a/src/libxineadec/xine_faad_decoder.c +++ b/src/libxineadec/xine_faad_decoder.c @@ -445,10 +445,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { faad_class_t *this ; @@ -458,7 +454,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "FAAD"; this->decoder_class.description = N_("Freeware Advanced Audio Decoder"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c index 53ca81c6c..a1c5f1622 100644 --- a/src/libxineadec/xine_lpcm_decoder.c +++ b/src/libxineadec/xine_lpcm_decoder.c @@ -248,10 +248,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { lpcm_class_t *this ; @@ -261,7 +257,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "Linear PCM"; this->decoder_class.description = N_("Linear PCM audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxineadec/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c index f7850cd54..996daaff8 100644 --- a/src/libxineadec/xine_mad_decoder.c +++ b/src/libxineadec/xine_mad_decoder.c @@ -335,11 +335,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre /* * mad plugin class */ - -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { mad_class_t *this; @@ -349,7 +344,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mad"; this->decoder_class.description = N_("libmad based mpeg audio layer 1/2/3 decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxineadec/xine_musepack_decoder.c b/src/libxineadec/xine_musepack_decoder.c index cb7d98c66..52d9e0f0b 100644 --- a/src/libxineadec/xine_musepack_decoder.c +++ b/src/libxineadec/xine_musepack_decoder.c @@ -430,13 +430,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this_gen) { - - mpc_class_t *this = (mpc_class_t *)this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { mpc_class_t *this ; @@ -446,7 +439,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mpc"; this->decoder_class.description = N_("mpc: musepack audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index a3c314b0b..77cd47db3 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.c @@ -1544,10 +1544,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre return &this->video_decoder; } -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { bitplane_class_t *this = (bitplane_class_t *) xine_xmalloc (sizeof (bitplane_class_t)); @@ -1555,7 +1551,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "bitplane"; this->decoder_class.description = N_("Raw bitplane video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c index 1b30489f5..1ae0920bd 100644 --- a/src/libxinevdec/gdkpixbuf.c +++ b/src/libxinevdec/gdkpixbuf.c @@ -256,15 +256,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, /* * image plugin class */ - -static void dispose_class (video_decoder_class_t *this_gen) { - image_class_t *this = (image_class_t *) this_gen; - - lprintf("class closed\n"); - - free (this); -} - static void *init_class (xine_t *xine, void *data) { image_class_t *this; @@ -274,7 +265,7 @@ static void *init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "gdkpixbuf"; this->decoder_class.description = N_("gdk-pixbuf image video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; /* * initialisation of privates diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index 7fbafe70e..a73440f9c 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -234,15 +234,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, /* * image plugin class */ - -static void dispose_class (video_decoder_class_t *this_gen) { - image_class_t *this = (image_class_t *) this_gen; - - lprintf("class closed\n"); - - free (this); -} - static void *init_class (xine_t *xine, void *data) { image_class_t *this; @@ -252,7 +243,7 @@ static void *init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "imagevdec"; this->decoder_class.description = N_("image video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; /* * initialisation of privates diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index 490069643..85307b155 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -416,10 +416,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre return &this->video_decoder; } -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { rgb_class_t *this; @@ -429,7 +425,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "RGB"; this->decoder_class.description = N_("Raw RGB video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index 56f97be5d..fea2ca4af 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -339,10 +339,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre return &this->video_decoder; } -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { yuv_class_t *this; @@ -352,7 +348,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "YUV"; this->decoder_class.description = N_("Raw YUV video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c index 688900972..f02b1b899 100644 --- a/src/post/audio/stretch.c +++ b/src/post/audio/stretch.c @@ -659,11 +659,6 @@ static post_plugin_t *stretch_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void stretch_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *stretch_init_plugin(xine_t *xine, void *data) { @@ -675,7 +670,7 @@ void *stretch_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = stretch_open_plugin; class->post_class.identifier = "stretch"; class->post_class.description = N_("Time stretch by a given factor, optionally preserving pitch"); - class->post_class.dispose = stretch_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index 72f42527c..4d0e2c2a2 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -414,11 +414,6 @@ static post_plugin_t *upmix_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void upmix_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *upmix_init_plugin(xine_t *xine, void *data) { @@ -430,7 +425,7 @@ void *upmix_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = upmix_open_plugin; class->post_class.identifier = "upmix"; class->post_class.description = N_("upmix"); - class->post_class.dispose = upmix_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c index dda518277..b28b1f3f5 100644 --- a/src/post/audio/upmix_mono.c +++ b/src/post/audio/upmix_mono.c @@ -329,11 +329,6 @@ static post_plugin_t *upmix_mono_open_plugin(post_class_t *class_gen, int inputs return &this->post; } -static void upmix_mono_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *upmix_mono_init_plugin(xine_t *xine, void *data) { @@ -345,7 +340,7 @@ void *upmix_mono_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = upmix_mono_open_plugin; class->post_class.identifier = "upmix_mono"; class->post_class.description = N_("converts Mono into Stereo"); - class->post_class.dispose = upmix_mono_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c index b09139cd3..7533ba94a 100644 --- a/src/post/audio/volnorm.c +++ b/src/post/audio/volnorm.c @@ -447,11 +447,6 @@ static post_plugin_t *volnorm_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void volnorm_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *volnorm_init_plugin(xine_t *xine, void *data) { @@ -463,7 +458,7 @@ void *volnorm_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = volnorm_open_plugin; class->post_class.identifier = "volnorm"; class->post_class.description = N_("Normalize volume"); - class->post_class.dispose = volnorm_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c index cb6c26015..7e7f52fbf 100644 --- a/src/post/visualizations/fftgraph.c +++ b/src/post/visualizations/fftgraph.c @@ -452,11 +452,6 @@ static post_plugin_t *fftgraph_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void fftgraph_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *fftgraph_init_plugin(xine_t *xine, void *data) { @@ -468,7 +463,7 @@ void *fftgraph_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = fftgraph_open_plugin; class->post_class.identifier = "fftgraph"; class->post_class.description = N_("fftgraph Visualization Post Plugin"); - class->post_class.dispose = fftgraph_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c index c2756b5f1..917af508d 100644 --- a/src/post/visualizations/fftscope.c +++ b/src/post/visualizations/fftscope.c @@ -473,11 +473,6 @@ static post_plugin_t *fftscope_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void fftscope_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *fftscope_init_plugin(xine_t *xine, void *data) { @@ -489,7 +484,7 @@ void *fftscope_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = fftscope_open_plugin; class->post_class.identifier = "FFT Scope"; class->post_class.description = N_("FFT Scope"); - class->post_class.dispose = fftscope_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c index 509e3676f..78803f8d2 100644 --- a/src/post/visualizations/fooviz.c +++ b/src/post/visualizations/fooviz.c @@ -284,11 +284,6 @@ static post_plugin_t *fooviz_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void fooviz_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ static void *fooviz_init_plugin(xine_t *xine, void *data) { @@ -300,7 +295,7 @@ static void *fooviz_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = fooviz_open_plugin; class->post_class.identifier = "fooviz"; class->post_class.description = N_("fooviz"); - class->post_class.dispose = fooviz_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c index 402963331..86b8b2750 100644 --- a/src/post/visualizations/oscope.c +++ b/src/post/visualizations/oscope.c @@ -355,11 +355,6 @@ static post_plugin_t *oscope_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void oscope_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *oscope_init_plugin(xine_t *xine, void *data) { @@ -371,7 +366,7 @@ void *oscope_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = oscope_open_plugin; class->post_class.identifier = "Oscilloscope"; class->post_class.description = N_("Oscilloscope"); - class->post_class.dispose = oscope_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c index 6a49eafce..c07ae2d18 100644 --- a/src/vdr/input_vdr.c +++ b/src/vdr/input_vdr.c @@ -2627,14 +2627,6 @@ static input_plugin_t *vdr_class_get_instance(input_class_t *cls_gen, xine_strea /* * vdr input plugin class stuff */ - -static void vdr_class_dispose (input_class_t *this_gen) -{ - vdr_input_class_t *this = (vdr_input_class_t *)this_gen; - - free(this); -} - static char **vdr_class_get_autoplay_list(input_class_t *this_gen, int *num_files) { @@ -2662,7 +2654,7 @@ static void *init_class(xine_t *xine, void *data) this->input_class.description = N_("VDR display device plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = vdr_class_get_autoplay_list; - this->input_class.dispose = vdr_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; return this; diff --git a/src/vdr/post_vdr_audio.c b/src/vdr/post_vdr_audio.c index 398f86f46..96fa84fb5 100644 --- a/src/vdr/post_vdr_audio.c +++ b/src/vdr/post_vdr_audio.c @@ -58,7 +58,6 @@ static void vdr_audio_select_audio(vdr_audio_post_plugin_t *this, uint8_t channe static post_plugin_t *vdr_audio_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static void vdr_audio_class_dispose(post_class_t *class_gen); /* plugin instance functions */ static void vdr_audio_dispose(post_plugin_t *this_gen); @@ -80,7 +79,7 @@ void *vdr_audio_init_plugin(xine_t *xine, void *data) class->open_plugin = vdr_audio_open_plugin; class->identifier = "vdr_audio"; class->description = N_("modifies every audio frame as requested by VDR"); - class->dispose = vdr_audio_class_dispose; + class->dispose = default_post_class_dispose; return class; } @@ -118,12 +117,6 @@ fprintf(stderr, "~~~~~~~~~~ vdr open plugin\n"); return &this->post_plugin; } -static void vdr_audio_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - - static void vdr_audio_dispose(post_plugin_t *this_gen) { /* diff --git a/src/vdr/post_vdr_video.c b/src/vdr/post_vdr_video.c index 0b1544ae4..ed0eafc35 100644 --- a/src/vdr/post_vdr_video.c +++ b/src/vdr/post_vdr_video.c @@ -81,7 +81,6 @@ static void vdr_video_set_video_window(vdr_video_post_plugin_t *this, int32_t x, static post_plugin_t *vdr_video_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static void vdr_video_class_dispose(post_class_t *class_gen); /* plugin instance functions */ static void vdr_video_dispose(post_plugin_t *this_gen); @@ -103,7 +102,7 @@ void *vdr_video_init_plugin(xine_t *xine, void *data) class->open_plugin = vdr_video_open_plugin; class->identifier = "vdr"; class->description = N_("modifies every video frame as requested by VDR"); - class->dispose = vdr_video_class_dispose; + class->dispose = default_post_class_dispose; return class; } @@ -144,12 +143,6 @@ static post_plugin_t *vdr_video_open_plugin(post_class_t *class_gen, int inputs, return &this->post_plugin; } -static void vdr_video_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - - static void vdr_video_dispose(post_plugin_t *this_gen) { if (_x_post_dispose(this_gen)) diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index 38fb9f646..5323c3a5e 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -300,10 +300,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi return &this->vo_driver; } -static void dispose_class (video_driver_class_t *this_gen) { - aa_class_t *this = (aa_class_t *) this_gen; - free(this); -} static void *init_class (xine_t *xine, void *visual_gen) { /* aa_context *context = (aa_context*) visual_gen; */ aa_class_t *this; @@ -313,7 +309,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "AA"; this->driver_class.description = N_("xine video output plugin using the ascii-art library"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index 6384ed1aa..fe357cbd4 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -307,10 +307,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi return &this->vo_driver; } -static void dispose_class (video_driver_class_t *this_gen) { - caca_class_t *this = (caca_class_t *) this_gen; - free(this); -} static void *init_class (xine_t *xine, void *visual_gen) { caca_class_t *this; @@ -319,7 +315,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "CACA"; this->driver_class.description = N_("xine video output plugin using the Color AsCii Art library"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index f75c6ae94..3445be127 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -1880,11 +1880,6 @@ static vo_driver_t *open_plugin_fb (video_driver_class_t *class_gen, const void return &this->vo_driver; } -static void dispose_class_fb (video_driver_class_t *this_gen) { - directfb_class_t *this = (directfb_class_t *) this_gen; - free (this); -} - #ifndef DIRECTFB_X11 static void *init_class_fb (xine_t *xine, void *visual_gen) { directfb_class_t *this; @@ -1904,7 +1899,7 @@ static void *init_class_fb (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin_fb; this->driver_class.identifier = "DirectFB"; this->driver_class.description = N_("xine video output plugin using DirectFB."); - this->driver_class.dispose = dispose_class_fb; + this->driver_class.dispose = default_video_driver_class_dispose; this->xine = xine; @@ -2080,12 +2075,6 @@ static vo_driver_t *open_plugin_x11 (video_driver_class_t *class_gen, const void return &this->vo_driver; } -static void dispose_class_x11 (video_driver_class_t *this_gen) { - directfb_class_t *this = (directfb_class_t *) this_gen; - - free (this); -} - static void *init_class_x11 (xine_t *xine, void *visual_gen) { directfb_class_t *this; x11_visual_t *visual = (x11_visual_t *) visual_gen; @@ -2115,7 +2104,7 @@ static void *init_class_x11 (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin_x11; this->driver_class.identifier = "XDirectFB"; this->driver_class.description = N_("xine video output plugin using DirectFB under XDirectFB."); - this->driver_class.dispose = dispose_class_x11; + this->driver_class.dispose = default_video_driver_class_dispose; this->visual_type = XINE_VISUAL_TYPE_X11; this->xine = xine; diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index e39acd435..53a6d2b8a 100644 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -1227,13 +1227,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *wi return ( vo_driver_t * ) win32_driver; } - -static void dispose_class (video_driver_class_t *this_gen) { - directx_class_t *directx = (directx_class_t *) this_gen; - - free (directx); -} - static void *init_class (xine_t *xine, void *visual_gen) { directx_class_t *directx; @@ -1246,7 +1239,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { directx->driver_class.open_plugin = open_plugin; directx->driver_class.identifier = "DirectX"; directx->driver_class.description = N_("xine video output plugin for win32 using directx"); - directx->driver_class.dispose = dispose_class; + directx->driver_class.dispose = default_video_driver_class_dispose; directx->xine = xine; directx->config = xine->config; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index e08661fa2..b7864bc62 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -1046,12 +1046,6 @@ error: return 0; } -static void fb_dispose_class(video_driver_class_t *this_gen) -{ - fb_class_t *this = (fb_class_t *)this_gen; - free(this); -} - static void *fb_init_class(xine_t *xine, void *visual_gen) { fb_class_t *this = (fb_class_t *)xine_xmalloc(sizeof(fb_class_t)); @@ -1059,7 +1053,7 @@ static void *fb_init_class(xine_t *xine, void *visual_gen) this->driver_class.open_plugin = fb_open_plugin; this->driver_class.identifier = "fb"; this->driver_class.description = N_("Xine video output plugin using the Linux frame buffer device"); - this->driver_class.dispose = fb_dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m index 316d0b2ee..84d441aad 100644 --- a/src/video_out/video_out_macosx.m +++ b/src/video_out/video_out_macosx.m @@ -350,12 +350,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void * * Class related functions. */ -static void dispose_class (video_driver_class_t *driver_class) { - macosx_class_t *this = (macosx_class_t *) driver_class; - - free (this); -} - static void *init_class (xine_t *xine, void *visual) { macosx_class_t *this; @@ -364,7 +358,7 @@ static void *init_class (xine_t *xine, void *visual) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "MacOSX"; this->driver_class.description = N_("xine video output plugin for Mac OS X"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index d339f280d..569fa39ef 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -269,12 +269,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void * /* * Class related functions. */ -static void dispose_class (video_driver_class_t *driver_class) { - none_class_t *this = (none_class_t *) driver_class; - - free (this); -} - static void *init_class (xine_t *xine, void *visual) { none_class_t *this; @@ -283,7 +277,7 @@ static void *init_class (xine_t *xine, void *visual) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "none"; this->driver_class.description = N_("xine video output plugin which displays nothing"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 1bb582636..c121eef33 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -1954,20 +1954,13 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v /* * class functions */ - -static void opengl_dispose_class (video_driver_class_t *this_gen) { - opengl_class_t *this = (opengl_class_t *) this_gen; - - free (this); -} - static void *opengl_init_class (xine_t *xine, void *visual_gen) { opengl_class_t *this = (opengl_class_t *) xine_xmalloc (sizeof (opengl_class_t)); this->driver_class.open_plugin = opengl_open_plugin; this->driver_class.identifier = "opengl"; this->driver_class.description = N_("xine video output plugin using the OpenGL 3D graphics API"); - this->driver_class.dispose = opengl_dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->xine = xine; return this; diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index ae4be4431..0ea1592ba 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.c @@ -783,13 +783,6 @@ static void pgx32_dispose(vo_driver_t *this_gen) * XINE VIDEO DRIVER CLASS FUNCTIONS */ -static void pgx32_dispose_class(video_driver_class_t *class_gen) -{ - pgx32_driver_class_t *class = (pgx32_driver_class_t *)(void *)class_gen; - - free(class); -} - static const vo_info_t vo_info_pgx32 = { 10, XINE_VISUAL_TYPE_X11 @@ -869,7 +862,7 @@ static void *pgx32_init_class(xine_t *xine, void *visual_gen) class->vo_driver_class.open_plugin = pgx32_init_driver; class->vo_driver_class.identifier = "pgx32"; class->vo_driver_class.description = N_("xine video output plugin for Sun PGX32 framebuffers"); - class->vo_driver_class.dispose = pgx32_dispose_class; + class->vo_driver_class.dispose = default_video_driver_class_dispose; class->xine = xine; class->config = xine->config; diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index 84a8af85c..b6417a3b2 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -1332,14 +1332,6 @@ static void pgx64_config_changed(void *user_data, xine_cfg_entry_t *entry) /* * XINE VIDEO DRIVER CLASS FUNCTIONS */ - -static void pgx64_dispose_class(video_driver_class_t *class_gen) -{ - pgx64_driver_class_t *class = (pgx64_driver_class_t *)(void *)class_gen; - - free(class); -} - static const vo_info_t vo_info_pgx64 = { 10, XINE_VISUAL_TYPE_X11 @@ -1493,7 +1485,7 @@ static void *pgx64_init_class(xine_t *xine, void *visual_gen) class->vo_driver_class.open_plugin = pgx64_init_driver; class->vo_driver_class.identifier = "pgx64"; class->vo_driver_class.description = N_("xine video output plugin for Sun XVR100/PGX64/PGX24 framebuffers"); - class->vo_driver_class.dispose = pgx64_dispose_class; + class->vo_driver_class.dispose = default_video_driver_class_dispose; class->xine = xine; class->config = xine->config; diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index c04d54138..6353d6cc6 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -563,11 +563,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi /** * Class Functions */ -static void dispose_class (video_driver_class_t *this_gen) { - free(this_gen); -} - - static void *init_class (xine_t *xine, void *visual_gen) { /* x11_visual_t *visual = (x11_visual_t *) visual_gen; */ sdl_class_t *this; @@ -585,7 +580,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "SDL"; this->driver_class.description = N_("xine video output plugin using the Simple Direct Media Layer"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index ad4769dcd..c8a88e4f6 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.c @@ -442,12 +442,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis /** * Class Functions */ -static void dispose_class (video_driver_class_t *this_gen) { - //printf("video_out_stk: dispose_class()\n"); - free(this_gen); -} - - static void *init_class (xine_t *xine, void *visual_gen) { stk_class_t* this; @@ -458,7 +452,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "stk"; this->driver_class.description = N_("xine video output plugin using the Libstk Surface Set-top Toolkit"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index a73aca39f..20b515137 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -1049,14 +1049,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi /* * class functions */ - -static void dispose_class (video_driver_class_t *this_gen) { - - syncfb_class_t *this = (syncfb_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *visual_gen) { syncfb_class_t *this; @@ -1090,7 +1082,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "SyncFB"; this->driver_class.description = N_("xine video output plugin using the SyncFB module for Matrox G200/G400 cards"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 772b779fa..2b9205516 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -1113,14 +1113,6 @@ static void *init_class (xine_t *xine, void *visual_gen) { return this; } -static void dispose_class (video_driver_class_t *this_gen) { - vidix_class_t *this = (vidix_class_t *) this_gen; - - - - free (this); -} - #ifdef HAVE_X11 static vo_driver_t *vidix_open_plugin (video_driver_class_t *class_gen, const void *visual_gen) { vidix_driver_t *this = open_plugin(class_gen); @@ -1201,7 +1193,7 @@ static void *vidix_init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = vidix_open_plugin; this->driver_class.identifier = "vidix"; this->driver_class.description = N_("xine video output plugin using libvidix for x11"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; } return this; @@ -1275,7 +1267,7 @@ static void *vidixfb_init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = vidixfb_open_plugin; this->driver_class.identifier = "vidixfb"; this->driver_class.description = N_("xine video output plugin using libvidix for linux frame buffer"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; } return this; diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 645a23c97..61dac18f0 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -1229,20 +1229,13 @@ static vo_driver_t *xshm_open_plugin(video_driver_class_t *class_gen, const void /* * class functions */ - -static void xshm_dispose_class (video_driver_class_t *this_gen) { - xshm_class_t *this = (xshm_class_t *) this_gen; - - free (this); -} - static void *xshm_init_class (xine_t *xine, void *visual_gen) { xshm_class_t *this = (xshm_class_t *) xine_xmalloc (sizeof (xshm_class_t)); this->driver_class.open_plugin = xshm_open_plugin; this->driver_class.identifier = "XShm"; this->driver_class.description = N_("xine video output plugin using the MIT X shared memory extension"); - this->driver_class.dispose = xshm_dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index cc5eb602d..f964ae7af 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -1369,20 +1369,13 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis /* * class functions */ - -static void dispose_class (video_driver_class_t *this_gen) { - xv_class_t *this = (xv_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *visual_gen) { xv_class_t *this = (xv_class_t *) xine_xmalloc (sizeof (xv_class_t)); this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "Xv"; this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 528435b37..27a996a77 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -1290,20 +1290,13 @@ static vo_driver_t *xshm_open_plugin_old (video_driver_class_t *class_gen, const /* * class functions */ - -static void xshm_dispose_class (video_driver_class_t *this_gen) { - xshm_class_t *this = (xshm_class_t *) this_gen; - - free (this); -} - static void *xshm_init_class (xine_t *xine, void *visual_gen) { xshm_class_t *this = (xshm_class_t *) xine_xmalloc (sizeof (xshm_class_t)); this->driver_class.open_plugin = xshm_open_plugin_old; this->driver_class.identifier = "XShm"; this->driver_class.description = N_("xine video output plugin using the MIT X shared memory extension"); - this->driver_class.dispose = xshm_dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 4949fe843..82b51e4ec 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -1452,20 +1452,13 @@ static vo_driver_t *open_plugin_old (video_driver_class_t *class_gen, const void /* * class functions */ - -static void dispose_class (video_driver_class_t *this_gen) { - xv_class_t *this = (xv_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *visual_gen) { xv_class_t *this = (xv_class_t *) xine_xmalloc (sizeof (xv_class_t)); this->driver_class.open_plugin = open_plugin_old; this->driver_class.identifier = "Xv"; this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index e77a4b6b7..5fcb95003 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -2749,20 +2749,13 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi /* * class functions */ - -static void dispose_class (video_driver_class_t *this_gen) { - xxmc_class_t *this = (xxmc_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *visual_gen) { xxmc_class_t *this = (xxmc_class_t *) xine_xmalloc (sizeof (xxmc_class_t)); this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "XxMC"; this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; -- cgit v1.2.3 From 01bd55e4c0d1bf95421d489b9955cd895ccd85e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 15:54:21 +0100 Subject: Add a default_demux_plugin_dispose macro, and use it when the plugin dispose macro just calls free(). --- src/demuxers/demux.h | 2 ++ src/demuxers/demux_4xm.c | 8 +------- src/demuxers/demux_aac.c | 8 +------- src/demuxers/demux_ac3.c | 8 +------- src/demuxers/demux_aiff.c | 8 +------- src/demuxers/demux_aud.c | 7 +------ src/demuxers/demux_cdda.c | 8 +------- src/demuxers/demux_dts.c | 8 +------- src/demuxers/demux_eawve.c | 6 +----- src/demuxers/demux_elem.c | 7 +------ src/demuxers/demux_flac.c | 8 +------- src/demuxers/demux_fli.c | 7 +------ src/demuxers/demux_idcin.c | 7 +------ src/demuxers/demux_image.c | 9 +-------- src/demuxers/demux_mpc.c | 8 +------- src/demuxers/demux_mpeg.c | 7 +------ src/demuxers/demux_mpgaudio.c | 7 +------ src/demuxers/demux_nsv.c | 7 +------ src/demuxers/demux_playlist.c | 8 +------- src/demuxers/demux_pva.c | 7 +------ src/demuxers/demux_rawdv.c | 8 +------- src/demuxers/demux_roq.c | 7 +------ src/demuxers/demux_shn.c | 8 +------- src/demuxers/demux_smjpeg.c | 8 +------- src/demuxers/demux_snd.c | 8 +------- src/demuxers/demux_str.c | 7 +------ src/demuxers/demux_tta.c | 8 +------- src/demuxers/demux_vmd.c | 8 +------- src/demuxers/demux_voc.c | 8 +------- src/demuxers/demux_vox.c | 8 +------- src/demuxers/demux_vqa.c | 8 +------- src/demuxers/demux_yuv4mpeg2.c | 8 +------- src/demuxers/demux_yuv_frames.c | 8 +------- 33 files changed, 34 insertions(+), 213 deletions(-) diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index 9416b43c3..50c8e0985 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -180,6 +180,8 @@ struct demux_plugin_s { } ; +#define default_demux_plugin_dispose (void (*) (demux_plugin_t *this))free + /* * possible capabilites a demux plugin can have: */ diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 8df2dec02..3c28c1ad5 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -439,12 +439,6 @@ static int demux_fourxm_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_fourxm_dispose (demux_plugin_t *this_gen) { - demux_fourxm_t *this = (demux_fourxm_t *) this_gen; - - free(this->tracks); -} - static int demux_fourxm_get_status (demux_plugin_t *this_gen) { demux_fourxm_t *this = (demux_fourxm_t *) this_gen; @@ -479,7 +473,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_fourxm_send_headers; this->demux_plugin.send_chunk = demux_fourxm_send_chunk; this->demux_plugin.seek = demux_fourxm_seek; - this->demux_plugin.dispose = demux_fourxm_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_fourxm_get_status; this->demux_plugin.get_stream_length = demux_fourxm_get_stream_length; this->demux_plugin.get_capabilities = demux_fourxm_get_capabilities; diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index 415521852..64f94b46a 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -230,12 +230,6 @@ static int demux_aac_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_aac_dispose (demux_plugin_t *this_gen) { - demux_aac_t *this = (demux_aac_t *) this_gen; - - free(this); -} - static int demux_aac_get_status (demux_plugin_t *this_gen) { demux_aac_t *this = (demux_aac_t *) this_gen; @@ -269,7 +263,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_aac_send_headers; this->demux_plugin.send_chunk = demux_aac_send_chunk; this->demux_plugin.seek = demux_aac_seek; - this->demux_plugin.dispose = demux_aac_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_aac_get_status; this->demux_plugin.get_stream_length = demux_aac_get_stream_length; this->demux_plugin.get_capabilities = demux_aac_get_capabilities; diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index d3a938909..3f5b7a6aa 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -384,12 +384,6 @@ static int demux_ac3_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_ac3_dispose (demux_plugin_t *this_gen) { - demux_ac3_t *this = (demux_ac3_t *) this_gen; - - free(this); -} - static int demux_ac3_get_status (demux_plugin_t *this_gen) { demux_ac3_t *this = (demux_ac3_t *) this_gen; @@ -424,7 +418,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_ac3_send_headers; this->demux_plugin.send_chunk = demux_ac3_send_chunk; this->demux_plugin.seek = demux_ac3_seek; - this->demux_plugin.dispose = demux_ac3_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_ac3_get_status; this->demux_plugin.get_stream_length = demux_ac3_get_stream_length; this->demux_plugin.get_capabilities = demux_ac3_get_capabilities; diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 4cb693c39..c7b98d8ac 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -304,12 +304,6 @@ static int demux_aiff_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_aiff_dispose (demux_plugin_t *this_gen) { - demux_aiff_t *this = (demux_aiff_t *) this_gen; - - free(this); -} - static int demux_aiff_get_status (demux_plugin_t *this_gen) { demux_aiff_t *this = (demux_aiff_t *) this_gen; @@ -344,7 +338,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_aiff_send_headers; this->demux_plugin.send_chunk = demux_aiff_send_chunk; this->demux_plugin.seek = demux_aiff_seek; - this->demux_plugin.dispose = demux_aiff_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_aiff_get_status; this->demux_plugin.get_stream_length = demux_aiff_get_stream_length; this->demux_plugin.get_capabilities = demux_aiff_get_capabilities; diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 6b72d44eb..35df1856c 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -241,11 +241,6 @@ static int demux_aud_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_aud_dispose (demux_plugin_t *this) { - - free(this); -} - static int demux_aud_get_status (demux_plugin_t *this_gen) { demux_aud_t *this = (demux_aud_t *) this_gen; @@ -277,7 +272,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_aud_send_headers; this->demux_plugin.send_chunk = demux_aud_send_chunk; this->demux_plugin.seek = demux_aud_seek; - this->demux_plugin.dispose = demux_aud_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_aud_get_status; this->demux_plugin.get_stream_length = demux_aud_get_stream_length; this->demux_plugin.get_capabilities = demux_aud_get_capabilities; diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index a8e59796a..181e6a034 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -153,12 +153,6 @@ static int demux_cdda_seek (demux_plugin_t *this_gen, off_t start_pos, int start return this->status; } -static void demux_cdda_dispose (demux_plugin_t *this_gen) { - demux_cdda_t *this = (demux_cdda_t *) this_gen; - - free(this); -} - static int demux_cdda_get_status (demux_plugin_t *this_gen) { demux_cdda_t *this = (demux_cdda_t *) this_gen; @@ -194,7 +188,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_cdda_send_headers; this->demux_plugin.send_chunk = demux_cdda_send_chunk; this->demux_plugin.seek = demux_cdda_seek; - this->demux_plugin.dispose = demux_cdda_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_cdda_get_status; this->demux_plugin.get_stream_length = demux_cdda_get_stream_length; this->demux_plugin.get_capabilities = demux_cdda_get_capabilities; diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index c64b7dc17..998106a0d 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -320,12 +320,6 @@ static int demux_dts_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_dts_dispose (demux_plugin_t *this_gen) { - demux_dts_t *this = (demux_dts_t *) this_gen; - - free(this); -} - static int demux_dts_get_status (demux_plugin_t *this_gen) { demux_dts_t *this = (demux_dts_t *) this_gen; @@ -353,7 +347,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_dts_send_headers; this->demux_plugin.send_chunk = demux_dts_send_chunk; this->demux_plugin.seek = demux_dts_seek; - this->demux_plugin.dispose = demux_dts_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_dts_get_status; this->demux_plugin.get_stream_length = demux_dts_get_stream_length; this->demux_plugin.get_capabilities = demux_dts_get_capabilities; diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index 49086678d..bcaaf8543 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -322,10 +322,6 @@ static int demux_eawve_seek(demux_eawve_t *this, off_t start_pos, int start_time return this->status; } -static void demux_eawve_dispose(demux_eawve_t *this){ - free(this); -} - static int demux_eawve_get_status(demux_eawve_t *this){ return this->status; } @@ -356,7 +352,7 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre this->demux_plugin.send_headers = (void*)demux_eawve_send_headers; this->demux_plugin.send_chunk = (void*)demux_eawve_send_chunk; this->demux_plugin.seek = (void*)demux_eawve_seek; - this->demux_plugin.dispose = (void*)demux_eawve_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = (void*)demux_eawve_get_status; this->demux_plugin.get_stream_length = (void*)demux_eawve_get_stream_length; this->demux_plugin.get_capabilities = demux_eawve_get_capabilities; diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 2cf50dcc2..230242083 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -169,11 +169,6 @@ static int demux_mpeg_elem_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_mpeg_elem_dispose (demux_plugin_t *this) { - - free (this); -} - static int demux_mpeg_elem_get_stream_length(demux_plugin_t *this_gen) { return 0 ; /*FIXME: implement */ } @@ -247,7 +242,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_mpeg_elem_send_headers; this->demux_plugin.send_chunk = demux_mpeg_elem_send_chunk; this->demux_plugin.seek = demux_mpeg_elem_seek; - this->demux_plugin.dispose = demux_mpeg_elem_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_mpeg_elem_get_status; this->demux_plugin.get_stream_length = demux_mpeg_elem_get_stream_length; this->demux_plugin.get_capabilities = demux_mpeg_elem_get_capabilities; diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c index accfbcb4e..80b41bef5 100644 --- a/src/demuxers/demux_flac.c +++ b/src/demuxers/demux_flac.c @@ -439,12 +439,6 @@ static int demux_flac_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_flac_dispose (demux_plugin_t *this_gen) { - demux_flac_t *this = (demux_flac_t *) this_gen; - - free(this->seekpoints); -} - static int demux_flac_get_status (demux_plugin_t *this_gen) { demux_flac_t *this = (demux_flac_t *) this_gen; @@ -488,7 +482,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_flac_send_headers; this->demux_plugin.send_chunk = demux_flac_send_chunk; this->demux_plugin.seek = demux_flac_seek; - this->demux_plugin.dispose = demux_flac_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_flac_get_status; this->demux_plugin.get_stream_length = demux_flac_get_stream_length; this->demux_plugin.get_capabilities = demux_flac_get_capabilities; diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index c56d55e75..1f59c340b 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -266,11 +266,6 @@ static int demux_fli_seek (demux_plugin_t *this_gen, off_t start_pos, int start_ return this->status; } -static void demux_fli_dispose (demux_plugin_t *this) { - - free(this); -} - static int demux_fli_get_status (demux_plugin_t *this_gen) { demux_fli_t *this = (demux_fli_t *) this_gen; @@ -310,7 +305,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_fli_send_headers; this->demux_plugin.send_chunk = demux_fli_send_chunk; this->demux_plugin.seek = demux_fli_seek; - this->demux_plugin.dispose = demux_fli_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_fli_get_status; this->demux_plugin.get_stream_length = demux_fli_get_stream_length; this->demux_plugin.get_capabilities = demux_fli_get_capabilities; diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index 76d460476..cef8f48dc 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -444,11 +444,6 @@ static int demux_idcin_seek (demux_plugin_t *this_gen, off_t start_pos, int star return this->status; } -static void demux_idcin_dispose (demux_plugin_t *this) { - - free(this); -} - static int demux_idcin_get_status (demux_plugin_t *this_gen) { demux_idcin_t *this = (demux_idcin_t *) this_gen; @@ -480,7 +475,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_idcin_send_headers; this->demux_plugin.send_chunk = demux_idcin_send_chunk; this->demux_plugin.seek = demux_idcin_seek; - this->demux_plugin.dispose = demux_idcin_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_idcin_get_status; this->demux_plugin.get_stream_length = demux_idcin_get_stream_length; this->demux_plugin.get_capabilities = demux_idcin_get_capabilities; diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index 2a1e56230..c3352d7c8 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -143,13 +143,6 @@ static int demux_image_get_optional_data(demux_plugin_t *this_gen, return DEMUX_OPTIONAL_UNSUPPORTED; } -static void demux_image_dispose (demux_plugin_t *this_gen) { - demux_image_t *this = (demux_image_t *) this_gen; - - lprintf("closed\n"); - free (this); -} - static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *stream, input_plugin_t *input) { @@ -205,7 +198,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, this->demux_plugin.send_headers = demux_image_send_headers; this->demux_plugin.send_chunk = demux_image_send_chunk; this->demux_plugin.seek = demux_image_seek; - this->demux_plugin.dispose = demux_image_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_image_get_status; this->demux_plugin.get_stream_length = demux_image_get_stream_length; this->demux_plugin.get_capabilities = demux_image_get_capabilities; diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index 2192ccf45..7c2918bb2 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.c @@ -292,12 +292,6 @@ static int demux_mpc_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_mpc_dispose (demux_plugin_t *this_gen) { - demux_mpc_t *this = (demux_mpc_t *) this_gen; - - free(this); -} - static int demux_mpc_get_status (demux_plugin_t *this_gen) { demux_mpc_t *this = (demux_mpc_t *) this_gen; @@ -331,7 +325,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_mpc_send_headers; this->demux_plugin.send_chunk = demux_mpc_send_chunk; this->demux_plugin.seek = demux_mpc_seek; - this->demux_plugin.dispose = demux_mpc_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_mpc_get_status; this->demux_plugin.get_stream_length = demux_mpc_get_stream_length; this->demux_plugin.get_capabilities = demux_mpc_get_capabilities; diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 48bf31737..d3cf0ca3c 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -1038,11 +1038,6 @@ static int demux_mpeg_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_mpeg_dispose (demux_plugin_t *this_gen) { - - free (this_gen); -} - static int demux_mpeg_get_stream_length (demux_plugin_t *this_gen) { demux_mpeg_t *this = (demux_mpeg_t *) this_gen; @@ -1074,7 +1069,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_mpeg_send_headers; this->demux_plugin.send_chunk = demux_mpeg_send_chunk; this->demux_plugin.seek = demux_mpeg_seek; - this->demux_plugin.dispose = demux_mpeg_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_mpeg_get_status; this->demux_plugin.get_stream_length = demux_mpeg_get_stream_length; this->demux_plugin.get_capabilities = demux_mpeg_get_capabilities; diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index bbb95e893..6728c2129 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -950,11 +950,6 @@ static int demux_mpgaudio_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_mpgaudio_dispose (demux_plugin_t *this) { - - free (this); -} - static int demux_mpgaudio_get_stream_length (demux_plugin_t *this_gen) { demux_mpgaudio_t *this = (demux_mpgaudio_t *) this_gen; @@ -1012,7 +1007,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_mpgaudio_send_headers; this->demux_plugin.send_chunk = demux_mpgaudio_send_chunk; this->demux_plugin.seek = demux_mpgaudio_seek; - this->demux_plugin.dispose = demux_mpgaudio_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_mpgaudio_get_status; this->demux_plugin.get_stream_length = demux_mpgaudio_get_stream_length; this->demux_plugin.get_capabilities = demux_mpgaudio_get_capabilities; diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index ee87a2f34..7ece813a0 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -565,11 +565,6 @@ static int demux_nsv_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_nsv_dispose (demux_plugin_t *this) { - - free(this); -} - static int demux_nsv_get_status (demux_plugin_t *this_gen) { demux_nsv_t *this = (demux_nsv_t *) this_gen; @@ -601,7 +596,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_nsv_send_headers; this->demux_plugin.send_chunk = demux_nsv_send_chunk; this->demux_plugin.seek = demux_nsv_seek; - this->demux_plugin.dispose = demux_nsv_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_nsv_get_status; this->demux_plugin.get_stream_length = demux_nsv_get_stream_length; this->demux_plugin.get_capabilities = demux_nsv_get_capabilities; diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c index d9402479d..da90dbbcc 100644 --- a/src/demuxers/demux_playlist.c +++ b/src/demuxers/demux_playlist.c @@ -611,12 +611,6 @@ static int demux_playlist_seek (demux_plugin_t *this_gen, return DEMUX_OK; } -static void demux_playlist_dispose (demux_plugin_t *this_gen) { - demux_playlist_t *this = (demux_playlist_t *) this_gen; - - free (this); -} - static int demux_playlist_get_status (demux_plugin_t *this_gen) { demux_playlist_t *this = (demux_playlist_t *) this_gen; @@ -649,7 +643,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, this->demux_plugin.send_headers = demux_playlist_send_headers; this->demux_plugin.send_chunk = demux_playlist_send_chunk; this->demux_plugin.seek = demux_playlist_seek; - this->demux_plugin.dispose = demux_playlist_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_playlist_get_status; this->demux_plugin.get_stream_length = demux_playlist_get_stream_length; this->demux_plugin.get_capabilities = demux_playlist_get_capabilities; diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 027029885..d936f5ef1 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -396,11 +396,6 @@ static int demux_pva_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_pva_dispose (demux_plugin_t *this) { - - free(this); -} - static int demux_pva_get_status (demux_plugin_t *this_gen) { demux_pva_t *this = (demux_pva_t *) this_gen; @@ -437,7 +432,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_pva_send_headers; this->demux_plugin.send_chunk = demux_pva_send_chunk; this->demux_plugin.seek = demux_pva_seek; - this->demux_plugin.dispose = demux_pva_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_pva_get_status; this->demux_plugin.get_stream_length = demux_pva_get_stream_length; this->demux_plugin.get_capabilities = demux_pva_get_capabilities; diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index 067f88d1c..d41bef207 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -320,12 +320,6 @@ static int demux_raw_dv_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_raw_dv_dispose (demux_plugin_t *this_gen) { - demux_raw_dv_t *this = (demux_raw_dv_t *) this_gen; - - free (this); -} - static int demux_raw_dv_get_stream_length(demux_plugin_t *this_gen) { demux_raw_dv_t *this = (demux_raw_dv_t *) this_gen; @@ -354,7 +348,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_raw_dv_send_headers; this->demux_plugin.send_chunk = demux_raw_dv_send_chunk; this->demux_plugin.seek = demux_raw_dv_seek; - this->demux_plugin.dispose = demux_raw_dv_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_raw_dv_get_status; this->demux_plugin.get_stream_length = demux_raw_dv_get_stream_length; this->demux_plugin.get_capabilities = demux_raw_dv_get_capabilities; diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 146995ae9..50ff61553 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -377,11 +377,6 @@ static int demux_roq_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_roq_dispose (demux_plugin_t *this) { - - free(this); -} - static int demux_roq_get_status (demux_plugin_t *this_gen) { demux_roq_t *this = (demux_roq_t *) this_gen; @@ -418,7 +413,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_roq_send_headers; this->demux_plugin.send_chunk = demux_roq_send_chunk; this->demux_plugin.seek = demux_roq_seek; - this->demux_plugin.dispose = demux_roq_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_roq_get_status; this->demux_plugin.get_stream_length = demux_roq_get_stream_length; this->demux_plugin.get_capabilities = demux_roq_get_capabilities; diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c index 3654cc074..e16a58604 100644 --- a/src/demuxers/demux_shn.c +++ b/src/demuxers/demux_shn.c @@ -150,12 +150,6 @@ static int demux_shn_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_shn_dispose (demux_plugin_t *this_gen) { - demux_shn_t *this = (demux_shn_t *) this_gen; - - free(this); -} - static int demux_shn_get_status (demux_plugin_t *this_gen) { demux_shn_t *this = (demux_shn_t *) this_gen; @@ -189,7 +183,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_shn_send_headers; this->demux_plugin.send_chunk = demux_shn_send_chunk; this->demux_plugin.seek = demux_shn_seek; - this->demux_plugin.dispose = demux_shn_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_shn_get_status; this->demux_plugin.get_stream_length = demux_shn_get_stream_length; this->demux_plugin.get_capabilities = demux_shn_get_capabilities; diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index 8c3b4663f..0c9094ac1 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -362,12 +362,6 @@ static int demux_smjpeg_seek (demux_plugin_t *this_gen, off_t start_pos, int sta } -static void demux_smjpeg_dispose (demux_plugin_t *this_gen) { - demux_smjpeg_t *this = (demux_smjpeg_t *) this_gen; - - free(this); -} - static int demux_smjpeg_get_status (demux_plugin_t *this_gen) { demux_smjpeg_t *this = (demux_smjpeg_t *) this_gen; @@ -407,7 +401,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_smjpeg_send_headers; this->demux_plugin.send_chunk = demux_smjpeg_send_chunk; this->demux_plugin.seek = demux_smjpeg_seek; - this->demux_plugin.dispose = demux_smjpeg_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_smjpeg_get_status; this->demux_plugin.get_stream_length = demux_smjpeg_get_stream_length; this->demux_plugin.get_capabilities = demux_smjpeg_get_capabilities; diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index f3d7458f8..42c192d78 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -285,12 +285,6 @@ static int demux_snd_seek (demux_plugin_t *this_gen, off_t start_pos, int start_ return this->status; } -static void demux_snd_dispose (demux_plugin_t *this_gen) { - demux_snd_t *this = (demux_snd_t *) this_gen; - - free(this); -} - static int demux_snd_get_status (demux_plugin_t *this_gen) { demux_snd_t *this = (demux_snd_t *) this_gen; @@ -325,7 +319,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_snd_send_headers; this->demux_plugin.send_chunk = demux_snd_send_chunk; this->demux_plugin.seek = demux_snd_seek; - this->demux_plugin.dispose = demux_snd_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_snd_get_status; this->demux_plugin.get_stream_length = demux_snd_get_stream_length; this->demux_plugin.get_capabilities = demux_snd_get_capabilities; diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index b878be2e8..6ce23325d 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -518,11 +518,6 @@ static int demux_str_seek (demux_plugin_t *this_gen, off_t start_pos, int start_ return this->status; } -static void demux_str_dispose (demux_plugin_t *this) { - - free(this); -} - static int demux_str_get_status (demux_plugin_t *this_gen) { demux_str_t *this = (demux_str_t *) this_gen; @@ -562,7 +557,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_str_send_headers; this->demux_plugin.send_chunk = demux_str_send_chunk; this->demux_plugin.seek = demux_str_seek; - this->demux_plugin.dispose = demux_str_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_str_get_status; this->demux_plugin.get_stream_length = demux_str_get_stream_length; this->demux_plugin.get_capabilities = demux_str_get_capabilities; diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index 294ed81c8..a150bc533 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.c @@ -200,12 +200,6 @@ static int demux_tta_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_tta_dispose (demux_plugin_t *this_gen) { - demux_tta_t *this = (demux_tta_t *) this_gen; - - free(this); -} - static int demux_tta_get_status (demux_plugin_t *this_gen) { demux_tta_t *this = (demux_tta_t *) this_gen; @@ -239,7 +233,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_tta_send_headers; this->demux_plugin.send_chunk = demux_tta_send_chunk; this->demux_plugin.seek = demux_tta_seek; - this->demux_plugin.dispose = demux_tta_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_tta_get_status; this->demux_plugin.get_stream_length = demux_tta_get_stream_length; this->demux_plugin.get_capabilities = demux_tta_get_capabilities; diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c index 1f17ede1f..65a41d0d3 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.c @@ -389,12 +389,6 @@ static int demux_vmd_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_vmd_dispose (demux_plugin_t *this_gen) { - demux_vmd_t *this = (demux_vmd_t *) this_gen; - - free(this); -} - static int demux_vmd_get_status (demux_plugin_t *this_gen) { demux_vmd_t *this = (demux_vmd_t *) this_gen; @@ -428,7 +422,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_vmd_send_headers; this->demux_plugin.send_chunk = demux_vmd_send_chunk; this->demux_plugin.seek = demux_vmd_seek; - this->demux_plugin.dispose = demux_vmd_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_vmd_get_status; this->demux_plugin.get_stream_length = demux_vmd_get_stream_length; this->demux_plugin.get_capabilities = demux_vmd_get_capabilities; diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index 7ab909c2d..99c5a5cc5 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -263,12 +263,6 @@ static int demux_voc_seek (demux_plugin_t *this_gen, off_t start_pos, int start_ return this->status; } -static void demux_voc_dispose (demux_plugin_t *this_gen) { - demux_voc_t *this = (demux_voc_t *) this_gen; - - free(this); -} - static int demux_voc_get_status (demux_plugin_t *this_gen) { demux_voc_t *this = (demux_voc_t *) this_gen; @@ -303,7 +297,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_voc_send_headers; this->demux_plugin.send_chunk = demux_voc_send_chunk; this->demux_plugin.seek = demux_voc_seek; - this->demux_plugin.dispose = demux_voc_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_voc_get_status; this->demux_plugin.get_stream_length = demux_voc_get_stream_length; this->demux_plugin.get_capabilities = demux_voc_get_capabilities; diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index 32fe83373..8d5f9e174 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -150,12 +150,6 @@ static int demux_vox_seek (demux_plugin_t *this_gen, off_t start_pos, int start_ return this->status; } -static void demux_vox_dispose (demux_plugin_t *this_gen) { - demux_vox_t *this = (demux_vox_t *) this_gen; - - free(this); -} - static int demux_vox_get_status (demux_plugin_t *this_gen) { demux_vox_t *this = (demux_vox_t *) this_gen; @@ -210,7 +204,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_vox_send_headers; this->demux_plugin.send_chunk = demux_vox_send_chunk; this->demux_plugin.seek = demux_vox_seek; - this->demux_plugin.dispose = demux_vox_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_vox_get_status; this->demux_plugin.get_stream_length = demux_vox_get_stream_length; this->demux_plugin.get_capabilities = demux_vox_get_capabilities; diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index 3dbe058da..e3d78f88d 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -304,12 +304,6 @@ static int demux_vqa_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_vqa_dispose (demux_plugin_t *this_gen) { - demux_vqa_t *this = (demux_vqa_t *) this_gen; - - free(this); -} - static int demux_vqa_get_status (demux_plugin_t *this_gen) { demux_vqa_t *this = (demux_vqa_t *) this_gen; @@ -341,7 +335,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_vqa_send_headers; this->demux_plugin.send_chunk = demux_vqa_send_chunk; this->demux_plugin.seek = demux_vqa_seek; - this->demux_plugin.dispose = demux_vqa_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_vqa_get_status; this->demux_plugin.get_stream_length = demux_vqa_get_stream_length; this->demux_plugin.get_capabilities = demux_vqa_get_capabilities; diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index eaed4c274..33e7f8a56 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -370,12 +370,6 @@ static int demux_yuv4mpeg2_seek (demux_plugin_t *this_gen, return this->status; } -static void demux_yuv4mpeg2_dispose (demux_plugin_t *this_gen) { - demux_yuv4mpeg2_t *this = (demux_yuv4mpeg2_t *) this_gen; - - free(this); -} - static int demux_yuv4mpeg2_get_status (demux_plugin_t *this_gen) { demux_yuv4mpeg2_t *this = (demux_yuv4mpeg2_t *) this_gen; @@ -410,7 +404,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.send_headers = demux_yuv4mpeg2_send_headers; this->demux_plugin.send_chunk = demux_yuv4mpeg2_send_chunk; this->demux_plugin.seek = demux_yuv4mpeg2_seek; - this->demux_plugin.dispose = demux_yuv4mpeg2_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_yuv4mpeg2_get_status; this->demux_plugin.get_stream_length = demux_yuv4mpeg2_get_stream_length; this->demux_plugin.get_capabilities = demux_yuv4mpeg2_get_capabilities; diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 71915cb9a..1ffdc39d5 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -164,12 +164,6 @@ static int demux_yuv_frames_get_optional_data(demux_plugin_t *this_gen, return DEMUX_OPTIONAL_UNSUPPORTED; } -static void demux_yuv_frames_dispose (demux_plugin_t *this_gen) { - demux_yuv_frames_t *this = (demux_yuv_frames_t *) this_gen; - - free (this); -} - static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *stream, input_plugin_t *input) { @@ -210,7 +204,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, this->demux_plugin.send_headers = demux_yuv_frames_send_headers; this->demux_plugin.send_chunk = demux_yuv_frames_send_chunk; this->demux_plugin.seek = demux_yuv_frames_seek; - this->demux_plugin.dispose = demux_yuv_frames_dispose; + this->demux_plugin.dispose = default_demux_plugin_dispose; this->demux_plugin.get_status = demux_yuv_frames_get_status; this->demux_plugin.get_stream_length = demux_yuv_frames_get_stream_length; this->demux_plugin.get_capabilities = demux_yuv_frames_get_capabilities; -- cgit v1.2.3 From b803c2268c144475f4037677b2eea20f364e35b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 18:07:02 +0100 Subject: Bump the input plugins interface version to 18 as they got updated. --- src/input/input_cdda.c | 2 +- src/input/input_dvb.c | 2 +- src/input/input_dvd.c | 2 +- src/input/input_file.c | 2 +- src/input/input_gnome_vfs.c | 2 +- src/input/input_http.c | 2 +- src/input/input_mms.c | 2 +- src/input/input_net.c | 2 +- src/input/input_pnm.c | 2 +- src/input/input_pvr.c | 2 +- src/input/input_rtp.c | 2 +- src/input/input_rtsp.c | 2 +- src/input/input_smb.c | 2 +- src/input/input_stdin_fifo.c | 2 +- src/input/input_v4l.c | 4 ++-- src/input/input_vcd.c | 2 +- src/vdr/input_vdr.c | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 9cb762dbc..df4617e22 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -2763,7 +2763,7 @@ static void *init_plugin (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "CD", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "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 d84877e39..a998d274b 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -3307,6 +3307,6 @@ static void *init_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "DVB", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "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 5f3676748..446b7c778 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -1894,6 +1894,6 @@ static void *init_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "DVD", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "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 a2259ec1a..1916a71e4 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -1019,6 +1019,6 @@ static void *init_plugin (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "FILE", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "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 3f8c4a745..71a4ada85 100644 --- a/src/input/input_gnome_vfs.c +++ b/src/input/input_gnome_vfs.c @@ -377,7 +377,7 @@ static input_info_t input_info_gnomevfs = { }; const plugin_info_t xine_plugin_info[] EXPORTED = { - { PLUGIN_INPUT | PLUGIN_NO_UNLOAD, 17, "gnomevfs", XINE_VERSION_CODE, + { PLUGIN_INPUT | PLUGIN_NO_UNLOAD, 18, "gnomevfs", XINE_VERSION_CODE, &input_info_gnomevfs, init_input_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_http.c b/src/input/input_http.c index 90dfba17c..38658b161 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -1158,6 +1158,6 @@ static void *init_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "http", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "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 62652a746..0b9e6c7f2 100644 --- a/src/input/input_mms.c +++ b/src/input/input_mms.c @@ -489,6 +489,6 @@ static void *init_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "mms", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "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 85b0b2fe8..7a52f670d 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -530,7 +530,7 @@ static void *init_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 17, "tcp", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 18, "tcp", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c index aadef9681..3bc026b69 100644 --- a/src/input/input_pnm.c +++ b/src/input/input_pnm.c @@ -284,7 +284,7 @@ static void *init_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 17, "pnm", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 18, "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 d340aebc3..ac7c5f2f0 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -1556,7 +1556,7 @@ static void *init_plugin (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "pvr", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "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 1914935e1..c3abf4bf5 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -791,7 +791,7 @@ static void *init_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 17, "rtp", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 18, "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 1d8b1fa84..690507d88 100644 --- a/src/input/input_rtsp.c +++ b/src/input/input_rtsp.c @@ -304,7 +304,7 @@ static void *init_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 17, "rtsp", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 18, "rtsp", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_smb.c b/src/input/input_smb.c index cd76ab2ca..8bbbfdfe5 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.c @@ -521,7 +521,7 @@ static const input_info_t input_info_smb = { }; const plugin_info_t xine_plugin_info[] EXPORTED = { - { PLUGIN_INPUT, 17, "smb", XINE_VERSION_CODE, &input_info_smb, + { PLUGIN_INPUT, 18, "smb", XINE_VERSION_CODE, &input_info_smb, init_input_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index ad0f8400f..e28a8d0c3 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.c @@ -369,6 +369,6 @@ static void *init_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 17, "stdin", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 18, "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 6b2349dd2..ff9ea87d0 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -1964,8 +1964,8 @@ static void *init_radio_class (xine_t *xine, void *data) const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "v4l_radio", XINE_VERSION_CODE, NULL, init_radio_class }, - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "v4l_tv", XINE_VERSION_CODE, NULL, init_video_class }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "v4l_radio", XINE_VERSION_CODE, NULL, init_radio_class }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "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 014f20258..14a924a2a 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -1107,6 +1107,6 @@ static void *init_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "VCDO", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "VCDO", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c index c07ae2d18..946e963a3 100644 --- a/src/vdr/input_vdr.c +++ b/src/vdr/input_vdr.c @@ -2667,7 +2667,7 @@ static void *init_class(xine_t *xine, void *data) const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 17, "VDR", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 18, "VDR", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; -- cgit v1.2.3 From b9dffdcf551ccd23b31618cf86716082e9f50f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 18:08:49 +0100 Subject: Bump the interface version for SPU decoders. --- src/dxr3/dxr3_decode_spu.c | 2 +- src/libspucc/xine_cc_decoder.c | 2 +- src/libspucmml/xine_cmml_decoder.c | 2 +- src/libspudec/xine_spu_decoder.c | 2 +- src/libspudvb/xine_spudvb_decoder.c | 2 +- src/libsputext/xine_sputext_decoder.c | 2 +- src/xine-engine/spu_decoder.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index b56469c6f..7c501e9d8 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -73,7 +73,7 @@ static const decoder_info_t dxr3_spudec_info = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_SPU_DECODER, 16, "dxr3-spudec", XINE_VERSION_CODE, &dxr3_spudec_info, &dxr3_spudec_init_plugin }, + { PLUGIN_SPU_DECODER, 17, "dxr3-spudec", XINE_VERSION_CODE, &dxr3_spudec_info, &dxr3_spudec_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libspucc/xine_cc_decoder.c b/src/libspucc/xine_cc_decoder.c index f55b20872..1e31b6d4a 100644 --- a/src/libspucc/xine_cc_decoder.c +++ b/src/libspucc/xine_cc_decoder.c @@ -348,6 +348,6 @@ static const decoder_info_t spudec_info = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_SPU_DECODER, 16, "spucc", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, + { PLUGIN_SPU_DECODER, 17, "spucc", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c index 1223769ff..6c045ee04 100644 --- a/src/libspucmml/xine_cmml_decoder.c +++ b/src/libspucmml/xine_cmml_decoder.c @@ -531,7 +531,7 @@ static const decoder_info_t spudec_info = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_SPU_DECODER, 16, "spucmml", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, + { PLUGIN_SPU_DECODER, 17, "spucmml", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libspudec/xine_spu_decoder.c b/src/libspudec/xine_spu_decoder.c index 05567b68d..93ea3c3a2 100644 --- a/src/libspudec/xine_spu_decoder.c +++ b/src/libspudec/xine_spu_decoder.c @@ -375,6 +375,6 @@ static const decoder_info_t dec_info_data = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_SPU_DECODER, 16, "spudec", XINE_VERSION_CODE, &dec_info_data, &init_plugin }, + { PLUGIN_SPU_DECODER, 17, "spudec", XINE_VERSION_CODE, &dec_info_data, &init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libspudvb/xine_spudvb_decoder.c b/src/libspudvb/xine_spudvb_decoder.c index 79e8932a6..59790227c 100644 --- a/src/libspudvb/xine_spudvb_decoder.c +++ b/src/libspudvb/xine_spudvb_decoder.c @@ -993,7 +993,7 @@ static const decoder_info_t spudec_info = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - {PLUGIN_SPU_DECODER, 16, "spudvb", XINE_VERSION_CODE, &spudec_info, + {PLUGIN_SPU_DECODER, 17, "spudvb", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin}, {PLUGIN_NONE, 0, "", 0, NULL, NULL} }; diff --git a/src/libsputext/xine_sputext_decoder.c b/src/libsputext/xine_sputext_decoder.c index 88977496e..f67fd7a7e 100644 --- a/src/libsputext/xine_sputext_decoder.c +++ b/src/libsputext/xine_sputext_decoder.c @@ -986,6 +986,6 @@ static const decoder_info_t spudec_info = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_SPU_DECODER | PLUGIN_MUST_PRELOAD, 16, "sputext", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, + { PLUGIN_SPU_DECODER | PLUGIN_MUST_PRELOAD, 17, "sputext", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/xine-engine/spu_decoder.h b/src/xine-engine/spu_decoder.h index 2a7337c71..dcf9107f7 100644 --- a/src/xine-engine/spu_decoder.h +++ b/src/xine-engine/spu_decoder.h @@ -32,7 +32,7 @@ # include #endif -#define SPU_DECODER_IFACE_VERSION 16 +#define SPU_DECODER_IFACE_VERSION 17 /* * generic xine spu decoder plugin interface -- cgit v1.2.3 From 0c1d668e424582f9d748ca3dae96c845aca4c65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 18:13:54 +0100 Subject: Bump the interface version for audio output plugins. --- src/audio_out/audio_alsa_out.c | 2 +- src/audio_out/audio_coreaudio_out.c | 2 +- src/audio_out/audio_directx2_out.c | 2 +- src/audio_out/audio_directx_out.c | 2 +- src/audio_out/audio_esd_out.c | 2 +- src/audio_out/audio_file_out.c | 2 +- src/audio_out/audio_fusionsound_out.c | 2 +- src/audio_out/audio_jack_out.c | 2 +- src/audio_out/audio_none_out.c | 2 +- src/audio_out/audio_oss_out.c | 2 +- src/audio_out/audio_pulse_out.c | 2 +- src/audio_out/audio_sun_out.c | 2 +- src/xine-engine/audio_out.h | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 04137fb44..1a26b01e9 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -63,7 +63,7 @@ #define LOG_DEBUG */ -#define AO_OUT_ALSA_IFACE_VERSION 8 +#define AO_OUT_ALSA_IFACE_VERSION 9 #define BUFFER_TIME 1000*1000 #define GAP_TOLERANCE 5000 diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c index f0beac579..551810e3e 100644 --- a/src/audio_out/audio_coreaudio_out.c +++ b/src/audio_out/audio_coreaudio_out.c @@ -52,7 +52,7 @@ #include #include -#define AO_OUT_COREAUDIO_IFACE_VERSION 8 +#define AO_OUT_COREAUDIO_IFACE_VERSION 9 #define GAP_TOLERANCE AO_MAX_GAP #define BUFSIZE 30720 diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index 97f28b9dd..9bcc52233 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.c @@ -62,7 +62,7 @@ #include "audio_out.h" -#define AO_OUT_DIRECTX2_IFACE_VERSION 8 +#define AO_OUT_DIRECTX2_IFACE_VERSION 9 /* * buffer size in miliseconds diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index 340f93af9..c7dea4e04 100644 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -52,7 +52,7 @@ typedef unsigned char boolean; #define DSBUFF_LEFT 1 #define DSBUFF_RIGHT 2 -#define AO_DIRECTX_IFACE_VERSION 8 +#define AO_DIRECTX_IFACE_VERSION 9 /***************************************************************************** * DirectDraw GUIDs. diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c index f94345194..9aec15c7a 100644 --- a/src/audio_out/audio_esd_out.c +++ b/src/audio_out/audio_esd_out.c @@ -38,7 +38,7 @@ #include "audio_out.h" #include "metronom.h" -#define AO_OUT_ESD_IFACE_VERSION 8 +#define AO_OUT_ESD_IFACE_VERSION 9 #define REBLOCK 1 /* reblock output to ESD_BUF_SIZE blks */ #define GAP_TOLERANCE 5000 diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c index c2382cf21..fda5ec7df 100644 --- a/src/audio_out/audio_file_out.c +++ b/src/audio_out/audio_file_out.c @@ -36,7 +36,7 @@ #include "audio_out.h" #include "bswap.h" -#define AO_OUT_FILE_IFACE_VERSION 8 +#define AO_OUT_FILE_IFACE_VERSION 9 #define GAP_TOLERANCE INT_MAX diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c index 3863c4e7c..ceda0a293 100644 --- a/src/audio_out/audio_fusionsound_out.c +++ b/src/audio_out/audio_fusionsound_out.c @@ -49,7 +49,7 @@ FUSIONSOUND_MICRO_VERSION ) -#define AO_OUT_FS_IFACE_VERSION 8 +#define AO_OUT_FS_IFACE_VERSION 9 #define GAP_TOLERANCE 5000 diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c index 267c7f85f..b3b2d4a19 100644 --- a/src/audio_out/audio_jack_out.c +++ b/src/audio_out/audio_jack_out.c @@ -14,7 +14,7 @@ #include -#define AO_OUT_JACK_IFACE_VERSION 8 +#define AO_OUT_JACK_IFACE_VERSION 9 #define GAP_TOLERANCE AO_MAX_GAP #define BUFSIZE 81920 diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c index f5fb22126..0e5cf1864 100644 --- a/src/audio_out/audio_none_out.c +++ b/src/audio_out/audio_none_out.c @@ -35,7 +35,7 @@ #include "xineutils.h" #include "audio_out.h" -#define AO_OUT_NONE_IFACE_VERSION 8 +#define AO_OUT_NONE_IFACE_VERSION 9 #define AUDIO_NUM_FRAGMENTS 15 #define AUDIO_FRAGMENT_SIZE 8192 diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index a50296b23..5576b1d5f 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.c @@ -93,7 +93,7 @@ # define AFMT_AC3 0x00000400 #endif -#define AO_OUT_OSS_IFACE_VERSION 8 +#define AO_OUT_OSS_IFACE_VERSION 9 #define AUDIO_NUM_FRAGMENTS 15 #define AUDIO_FRAGMENT_SIZE 8192 diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c index b5a58f7ca..6054e137e 100644 --- a/src/audio_out/audio_pulse_out.c +++ b/src/audio_out/audio_pulse_out.c @@ -624,7 +624,7 @@ static const ao_info_t ao_info_pulse = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_AUDIO_OUT, 8, "pulseaudio", XINE_VERSION_CODE, &ao_info_pulse, init_class }, + { PLUGIN_AUDIO_OUT, 9, "pulseaudio", XINE_VERSION_CODE, &ao_info_pulse, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c index 794c3786c..c37397639 100644 --- a/src/audio_out/audio_sun_out.c +++ b/src/audio_out/audio_sun_out.c @@ -64,7 +64,7 @@ typedef unsigned uint_t; #define AUDIO_PRECISION_16 16 #endif -#define AO_SUN_IFACE_VERSION 8 +#define AO_SUN_IFACE_VERSION 9 #define GAP_TOLERANCE 5000 #define GAP_NONRT_TOLERANCE AO_MAX_GAP diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h index 0dffa6620..bd1b910df 100644 --- a/src/xine-engine/audio_out.h +++ b/src/xine-engine/audio_out.h @@ -37,7 +37,7 @@ extern "C" { #endif -#define AUDIO_OUT_IFACE_VERSION 8 +#define AUDIO_OUT_IFACE_VERSION 9 /* * ao_driver_s contains the driver every audio output -- cgit v1.2.3 From 158ced5414ebb912f1d5111d2303097c7206f656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 18:15:14 +0100 Subject: Bump the interface version for video output plugins. --- src/dxr3/video_out_dxr3.c | 4 ++-- src/video_out/video_out_aa.c | 2 +- src/video_out/video_out_caca.c | 2 +- src/video_out/video_out_directx.c | 2 +- src/video_out/video_out_fb.c | 2 +- src/video_out/video_out_macosx.m | 2 +- src/video_out/video_out_none.c | 2 +- src/video_out/video_out_opengl.c | 2 +- src/video_out/video_out_pgx32.c | 2 +- src/video_out/video_out_pgx64.c | 2 +- src/video_out/video_out_sdl.c | 2 +- src/video_out/video_out_stk.c | 2 +- src/video_out/video_out_syncfb.c | 2 +- src/video_out/video_out_vidix.c | 4 ++-- src/video_out/video_out_xcbshm.c | 2 +- src/video_out/video_out_xcbxv.c | 2 +- src/video_out/video_out_xshm.c | 4 ++-- src/video_out/video_out_xv.c | 4 ++-- src/video_out/video_out_xvmc.c | 2 +- src/video_out/video_out_xxmc.c | 2 +- src/xine-engine/video_out.h | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 68a5eb0af..b073e6f63 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -92,9 +92,9 @@ static const vo_info_t vo_info_dxr3_aa = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ #ifdef HAVE_X11 - { PLUGIN_VIDEO_OUT, 21, "dxr3", XINE_VERSION_CODE, &vo_info_dxr3_x11, &dxr3_x11_init_plugin }, + { PLUGIN_VIDEO_OUT, 22, "dxr3", XINE_VERSION_CODE, &vo_info_dxr3_x11, &dxr3_x11_init_plugin }, #endif - { PLUGIN_VIDEO_OUT, 21, "aadxr3", XINE_VERSION_CODE, &vo_info_dxr3_aa, &dxr3_aa_init_plugin }, + { PLUGIN_VIDEO_OUT, 22, "aadxr3", XINE_VERSION_CODE, &vo_info_dxr3_aa, &dxr3_aa_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index d2b488f5b..bcbe2477e 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -311,6 +311,6 @@ static const vo_info_t vo_info_aa = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class }, + { PLUGIN_VIDEO_OUT, 22, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index d40ad06e3..231befcdb 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -315,6 +315,6 @@ static const vo_info_t vo_info_caca = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "caca", XINE_VERSION_CODE, &vo_info_caca, init_class }, + { PLUGIN_VIDEO_OUT, 22, "caca", XINE_VERSION_CODE, &vo_info_caca, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 53a6d2b8a..b70709856 100644 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -1258,6 +1258,6 @@ static const vo_info_t vo_info_win32 = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "vo_directx", XINE_VERSION_CODE, &vo_info_win32, init_class }, + { PLUGIN_VIDEO_OUT, 22, "vo_directx", XINE_VERSION_CODE, &vo_info_win32, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index b7864bc62..859959455 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -1070,7 +1070,7 @@ static const vo_info_t vo_info_fb = /* exported plugin catalog entry */ const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "fb", XINE_VERSION_CODE, &vo_info_fb, fb_init_class }, + { PLUGIN_VIDEO_OUT, 22, "fb", XINE_VERSION_CODE, &vo_info_fb, fb_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m index 84d441aad..9c65d579d 100644 --- a/src/video_out/video_out_macosx.m +++ b/src/video_out/video_out_macosx.m @@ -376,7 +376,7 @@ plugin_info_t xine_plugin_info[] EXPORTED = { /* work around the problem that dlclose() is not allowed to * get rid of an image module which contains objective C code and simply * crashes with a Trace/BPT trap when we try to do so */ - { PLUGIN_VIDEO_OUT | PLUGIN_NO_UNLOAD, 21, "macosx", XINE_VERSION_CODE, &vo_info_macosx, init_class }, + { PLUGIN_VIDEO_OUT | PLUGIN_NO_UNLOAD, 22, "macosx", XINE_VERSION_CODE, &vo_info_macosx, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index 569fa39ef..c28b0334e 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -292,6 +292,6 @@ static const vo_info_t vo_info_none = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "none", XINE_VERSION_CODE, &vo_info_none, init_class }, + { PLUGIN_VIDEO_OUT, 22, "none", XINE_VERSION_CODE, &vo_info_none, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index c121eef33..04413eb80 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -1979,6 +1979,6 @@ static const vo_info_t vo_info_opengl = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "opengl", XINE_VERSION_CODE, &vo_info_opengl, opengl_init_class }, + { PLUGIN_VIDEO_OUT, 22, "opengl", XINE_VERSION_CODE, &vo_info_opengl, opengl_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index 0ea1592ba..505a257ce 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.c @@ -871,6 +871,6 @@ static void *pgx32_init_class(xine_t *xine, void *visual_gen) } const plugin_info_t xine_plugin_info[] EXPORTED = { - {PLUGIN_VIDEO_OUT, 21, "pgx32", XINE_VERSION_CODE, &vo_info_pgx32, pgx32_init_class}, + {PLUGIN_VIDEO_OUT, 22, "pgx32", XINE_VERSION_CODE, &vo_info_pgx32, pgx32_init_class}, {PLUGIN_NONE, 0, "", 0, NULL, NULL} }; diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index b6417a3b2..21dcdfb09 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -1494,6 +1494,6 @@ static void *pgx64_init_class(xine_t *xine, void *visual_gen) } const plugin_info_t xine_plugin_info[] EXPORTED = { - {PLUGIN_VIDEO_OUT, 21, "pgx64", XINE_VERSION_CODE, &vo_info_pgx64, pgx64_init_class}, + {PLUGIN_VIDEO_OUT, 22, "pgx64", XINE_VERSION_CODE, &vo_info_pgx64, pgx64_init_class}, {PLUGIN_NONE, 0, "", 0, NULL, NULL} }; diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 6353d6cc6..6ee6b19bd 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -595,6 +595,6 @@ static const vo_info_t vo_info_sdl = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "sdl", XINE_VERSION_CODE, &vo_info_sdl, init_class }, + { PLUGIN_VIDEO_OUT, 22, "sdl", XINE_VERSION_CODE, &vo_info_sdl, init_class }, { PLUGIN_NONE, 0, "" , 0 , NULL, NULL} }; diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index c8a88e4f6..45e9900fd 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.c @@ -468,7 +468,7 @@ static const vo_info_t vo_info_stk = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "stk", XINE_VERSION_CODE, &vo_info_stk, init_class }, + { PLUGIN_VIDEO_OUT, 22, "stk", XINE_VERSION_CODE, &vo_info_stk, init_class }, { PLUGIN_NONE, 0, "" , 0 , NULL, NULL} }; diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index 20b515137..013695c46 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -1102,7 +1102,7 @@ static const vo_info_t vo_info_syncfb = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "SyncFB", XINE_VERSION_CODE, &vo_info_syncfb, init_class }, + { PLUGIN_VIDEO_OUT, 22, "SyncFB", XINE_VERSION_CODE, &vo_info_syncfb, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 2b9205516..3228bbdbb 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -1286,10 +1286,10 @@ static const vo_info_t vo_info_vidixfb = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ #ifdef HAVE_X11 - { PLUGIN_VIDEO_OUT, 21, "vidix", XINE_VERSION_CODE, &vo_info_vidix, vidix_init_class }, + { PLUGIN_VIDEO_OUT, 22, "vidix", XINE_VERSION_CODE, &vo_info_vidix, vidix_init_class }, #endif #ifdef HAVE_FB - { PLUGIN_VIDEO_OUT, 21, "vidixfb", XINE_VERSION_CODE, &vo_info_vidixfb, vidixfb_init_class }, + { PLUGIN_VIDEO_OUT, 22, "vidixfb", XINE_VERSION_CODE, &vo_info_vidixfb, vidixfb_init_class }, #endif { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 61dac18f0..c6ad9e2f1 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -1255,6 +1255,6 @@ static const vo_info_t vo_info_xshm = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class }, + { PLUGIN_VIDEO_OUT, 22, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index f964ae7af..1b59f5691 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -1394,6 +1394,6 @@ static const vo_info_t vo_info_xv = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, + { PLUGIN_VIDEO_OUT, 22, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 27a996a77..ddcdb677c 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -1329,7 +1329,7 @@ static const vo_info_t vo_info_xshm_2 = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class }, - { PLUGIN_VIDEO_OUT, 21, "xshm", XINE_VERSION_CODE, &vo_info_xshm_2, xshm_init_class_2 }, + { PLUGIN_VIDEO_OUT, 22, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class }, + { PLUGIN_VIDEO_OUT, 22, "xshm", XINE_VERSION_CODE, &vo_info_xshm_2, xshm_init_class_2 }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 82b51e4ec..ab5410ac3 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -1490,7 +1490,7 @@ static const vo_info_t vo_info_xv_2 = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, - { PLUGIN_VIDEO_OUT, 21, "xv", XINE_VERSION_CODE, &vo_info_xv_2, init_class_2 }, + { PLUGIN_VIDEO_OUT, 22, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, + { PLUGIN_VIDEO_OUT, 22, "xv", XINE_VERSION_CODE, &vo_info_xv_2, init_class_2 }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index cd667fe51..2c913dc0e 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.c @@ -1699,7 +1699,7 @@ static const vo_info_t vo_info_xvmc = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xvmc", XINE_VERSION_CODE, &vo_info_xvmc, init_class }, + { PLUGIN_VIDEO_OUT, 22, "xvmc", XINE_VERSION_CODE, &vo_info_xvmc, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index 5fcb95003..c66566233 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -2777,7 +2777,7 @@ static const vo_info_t vo_info_xxmc = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xxmc", XINE_VERSION_CODE, &vo_info_xxmc, init_class }, + { PLUGIN_VIDEO_OUT, 22, "xxmc", XINE_VERSION_CODE, &vo_info_xxmc, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index 39dbe0caa..8efdae9f6 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -291,7 +291,7 @@ struct xine_video_port_s { * from generic vo functions. */ -#define VIDEO_OUT_DRIVER_IFACE_VERSION 21 +#define VIDEO_OUT_DRIVER_IFACE_VERSION 22 struct vo_driver_s { -- cgit v1.2.3 From 265e36a8ddde1fa296ea39c67928aa1b7a11f7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 18:16:49 +0100 Subject: Bump the interface version for demuxer plugins. --- src/combined/flac_decoder.c | 2 +- src/combined/nsf_combined.c | 2 +- src/combined/wavpack_combined.c | 2 +- src/combined/xine_ogg_demuxer.c | 4 ++-- src/demuxers/demux.h | 2 +- src/demuxers/demux_asf.c | 2 +- src/demuxers/demux_avi.c | 2 +- src/demuxers/demux_elem.c | 2 +- src/demuxers/demux_fli.c | 2 +- src/demuxers/demux_flv.c | 2 +- src/demuxers/demux_iff.c | 2 +- src/demuxers/demux_image.c | 2 +- src/demuxers/demux_matroska.c | 2 +- src/demuxers/demux_mng.c | 2 +- src/demuxers/demux_mod.c | 2 +- src/demuxers/demux_mpeg.c | 2 +- src/demuxers/demux_mpeg_block.c | 2 +- src/demuxers/demux_mpeg_pes.c | 2 +- src/demuxers/demux_nsv.c | 2 +- src/demuxers/demux_playlist.c | 2 +- src/demuxers/demux_pva.c | 2 +- src/demuxers/demux_qt.c | 2 +- src/demuxers/demux_rawdv.c | 2 +- src/demuxers/demux_real.c | 2 +- src/demuxers/demux_slave.c | 2 +- src/demuxers/demux_ts.c | 2 +- src/demuxers/demux_yuv4mpeg2.c | 2 +- src/demuxers/demux_yuv_frames.c | 2 +- src/demuxers/group_audio.c | 32 ++++++++++++++++---------------- src/demuxers/group_games.c | 22 +++++++++++----------- src/libsputext/demux_sputext.c | 2 +- 31 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c index 0dc6823aa..307829166 100644 --- a/src/combined/flac_decoder.c +++ b/src/combined/flac_decoder.c @@ -407,7 +407,7 @@ static const decoder_info_t dec_info_audio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class }, + { PLUGIN_DEMUX, 27, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class }, { PLUGIN_AUDIO_DECODER, 15, "flacdec", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/combined/nsf_combined.c b/src/combined/nsf_combined.c index 0f71a287d..538835818 100644 --- a/src/combined/nsf_combined.c +++ b/src/combined/nsf_combined.c @@ -36,7 +36,7 @@ static const decoder_info_t decoder_info_nsf = { }; const plugin_info_t xine_plugin_info[] EXPORTED = { - { PLUGIN_DEMUX, 26, "nsfdemux", XINE_VERSION_CODE, &demux_info_nsf, demux_nsf_init_plugin }, + { PLUGIN_DEMUX, 27, "nsfdemux", XINE_VERSION_CODE, &demux_info_nsf, demux_nsf_init_plugin }, { PLUGIN_AUDIO_DECODER, 15, "nsfdec", XINE_VERSION_CODE, &decoder_info_nsf, decoder_nsf_init_plugin }, { PLUGIN_NONE, 0, NULL, 0, NULL, NULL } }; diff --git a/src/combined/wavpack_combined.c b/src/combined/wavpack_combined.c index e7a1bc76a..1a889844a 100644 --- a/src/combined/wavpack_combined.c +++ b/src/combined/wavpack_combined.c @@ -38,7 +38,7 @@ static const decoder_info_t decoder_info_wv = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "wavpack", XINE_VERSION_CODE, &demux_info_wv, demux_wv_init_plugin }, + { PLUGIN_DEMUX, 27, "wavpack", XINE_VERSION_CODE, &demux_info_wv, demux_wv_init_plugin }, { PLUGIN_AUDIO_DECODER, 15, "wavpackdec", XINE_VERSION_CODE, &decoder_info_wv, decoder_wavpack_init_plugin }, { PLUGIN_NONE, 0, NULL, 0, NULL, NULL } }; diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 6f8dbe658..53365c7b9 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -2190,8 +2190,8 @@ void *theora_init_plugin (xine_t *xine, void *data); const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "ogg", XINE_VERSION_CODE, &demux_info_ogg, ogg_init_class }, - { PLUGIN_DEMUX, 26, "anx", XINE_VERSION_CODE, &demux_info_anx, anx_init_class }, + { PLUGIN_DEMUX, 27, "ogg", XINE_VERSION_CODE, &demux_info_ogg, ogg_init_class }, + { PLUGIN_DEMUX, 27, "anx", XINE_VERSION_CODE, &demux_info_anx, anx_init_class }, #ifdef HAVE_VORBIS { PLUGIN_AUDIO_DECODER, 15, "vorbis", XINE_VERSION_CODE, &dec_info_vorbis, vorbis_init_plugin }, #endif diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index 50c8e0985..c9597463b 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -31,7 +31,7 @@ # include #endif -#define DEMUXER_PLUGIN_IFACE_VERSION 26 +#define DEMUXER_PLUGIN_IFACE_VERSION 27 #define DEMUX_OK 0 #define DEMUX_FINISHED 1 diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index b557abdfe..f16163335 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -2141,6 +2141,6 @@ static const demuxer_info_t demux_info_asf = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "asf", XINE_VERSION_CODE, &demux_info_asf, init_class }, + { PLUGIN_DEMUX, 27, "asf", XINE_VERSION_CODE, &demux_info_asf, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 51fb488e4..62a9b67f3 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -2343,6 +2343,6 @@ static const demuxer_info_t demux_info_avi = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "avi", XINE_VERSION_CODE, &demux_info_avi, init_class }, + { PLUGIN_DEMUX, 27, "avi", XINE_VERSION_CODE, &demux_info_avi, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 230242083..3e33b45ab 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -286,6 +286,6 @@ static const demuxer_info_t demux_info_elem = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "elem", XINE_VERSION_CODE, &demux_info_elem, init_plugin }, + { PLUGIN_DEMUX, 27, "elem", XINE_VERSION_CODE, &demux_info_elem, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index 1f59c340b..ccbf675bb 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -379,6 +379,6 @@ static const demuxer_info_t demux_info_fli = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "fli", XINE_VERSION_CODE, &demux_info_fli, init_plugin }, + { PLUGIN_DEMUX, 27, "fli", XINE_VERSION_CODE, &demux_info_fli, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index 1c5a1e7b7..b48f1a7c2 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -909,6 +909,6 @@ static const demuxer_info_t demux_info_flv = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "flashvideo", XINE_VERSION_CODE, &demux_info_flv, init_plugin }, + { PLUGIN_DEMUX, 27, "flashvideo", XINE_VERSION_CODE, &demux_info_flv, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index 885b25b28..b33495eda 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -1259,7 +1259,7 @@ static const demuxer_info_t demux_info_iff = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "iff", XINE_VERSION_CODE, &demux_info_iff, init_plugin }, + { PLUGIN_DEMUX, 27, "iff", XINE_VERSION_CODE, &demux_info_iff, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index c3352d7c8..64313cc5a 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -249,6 +249,6 @@ static const demuxer_info_t demux_info_image = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "image", XINE_VERSION_CODE, &demux_info_image, init_class }, + { PLUGIN_DEMUX, 27, "image", XINE_VERSION_CODE, &demux_info_image, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 7b7358ac8..ffdc5aa37 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -2886,6 +2886,6 @@ static const demuxer_info_t demux_info_matroska = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "matroska", XINE_VERSION_CODE, &demux_info_matroska, init_class }, + { PLUGIN_DEMUX, 27, "matroska", XINE_VERSION_CODE, &demux_info_matroska, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index 67e9e175e..439637c6c 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -365,6 +365,6 @@ static const demuxer_info_t demux_info_mng = { }; const plugin_info_t xine_plugin_info[] EXPORTED = { - { PLUGIN_DEMUX, 26, "mng", XINE_VERSION_CODE, &demux_info_mng, (void*)init_plugin}, + { PLUGIN_DEMUX, 27, "mng", XINE_VERSION_CODE, &demux_info_mng, (void*)init_plugin}, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index ff68fdd42..680ed5094 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -380,6 +380,6 @@ static const demuxer_info_t demux_info_mod = { }; const plugin_info_t xine_plugin_info[] EXPORTED = { - { PLUGIN_DEMUX, 26, "modplug", XINE_VERSION_CODE, &demux_info_mod, demux_mod_init_plugin }, + { PLUGIN_DEMUX, 27, "modplug", XINE_VERSION_CODE, &demux_info_mod, demux_mod_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index d3cf0ca3c..6e45b5b14 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -1248,6 +1248,6 @@ static const demuxer_info_t demux_info_mpeg = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "mpeg", XINE_VERSION_CODE, &demux_info_mpeg, init_plugin }, + { PLUGIN_DEMUX, 27, "mpeg", XINE_VERSION_CODE, &demux_info_mpeg, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 390043b4d..e56cc000b 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -1548,6 +1548,6 @@ static const demuxer_info_t demux_info_mpeg_block = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "mpeg_block", XINE_VERSION_CODE, &demux_info_mpeg_block, init_plugin }, + { PLUGIN_DEMUX, 27, "mpeg_block", XINE_VERSION_CODE, &demux_info_mpeg_block, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index c24919867..0b2b28312 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -1794,6 +1794,6 @@ static const demuxer_info_t demux_info_mpeg_pes = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "mpeg_pes", XINE_VERSION_CODE, &demux_info_mpeg_pes, init_plugin }, + { PLUGIN_DEMUX, 27, "mpeg_pes", XINE_VERSION_CODE, &demux_info_mpeg_pes, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 7ece813a0..5c4cb2603 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -670,6 +670,6 @@ static const demuxer_info_t demux_info_nsv = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "nsv", XINE_VERSION_CODE, &demux_info_nsv, demux_nsv_init_plugin }, + { PLUGIN_DEMUX, 27, "nsv", XINE_VERSION_CODE, &demux_info_nsv, demux_nsv_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c index da90dbbcc..e3f9d61cf 100644 --- a/src/demuxers/demux_playlist.c +++ b/src/demuxers/demux_playlist.c @@ -721,6 +721,6 @@ static const demuxer_info_t demux_info_flv = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "playlist", XINE_VERSION_CODE, &demux_info_flv, init_plugin }, + { PLUGIN_DEMUX, 27, "playlist", XINE_VERSION_CODE, &demux_info_flv, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index d936f5ef1..225e60bf5 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -505,6 +505,6 @@ static const demuxer_info_t demux_info_pva = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "pva", XINE_VERSION_CODE, &demux_info_pva, init_plugin }, + { PLUGIN_DEMUX, 27, "pva", XINE_VERSION_CODE, &demux_info_pva, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 03903e472..f546476c3 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -3160,6 +3160,6 @@ static const demuxer_info_t demux_info_qt = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "quicktime", XINE_VERSION_CODE, &demux_info_qt, init_plugin }, + { PLUGIN_DEMUX, 27, "quicktime", XINE_VERSION_CODE, &demux_info_qt, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index d41bef207..7358effe3 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -437,6 +437,6 @@ static const demuxer_info_t demux_info_raw_dv = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "rawdv", XINE_VERSION_CODE, &demux_info_raw_dv, init_plugin }, + { PLUGIN_DEMUX, 27, "rawdv", XINE_VERSION_CODE, &demux_info_raw_dv, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 7ca6a75e7..c8098b8bf 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -1648,6 +1648,6 @@ static const demuxer_info_t demux_info_real = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "real", XINE_VERSION_CODE, &demux_info_real, init_class }, + { PLUGIN_DEMUX, 27, "real", XINE_VERSION_CODE, &demux_info_real, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index 036c89dc4..942833d7a 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -421,6 +421,6 @@ static const demuxer_info_t demux_info_slave = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "slave", XINE_VERSION_CODE, &demux_info_slave, init_plugin }, + { PLUGIN_DEMUX, 27, "slave", XINE_VERSION_CODE, &demux_info_slave, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 2e1ab4ce6..12504c81b 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -2299,7 +2299,7 @@ static const demuxer_info_t demux_info_ts = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "mpeg-ts", XINE_VERSION_CODE, &demux_info_ts, init_class }, + { PLUGIN_DEMUX, 27, "mpeg-ts", XINE_VERSION_CODE, &demux_info_ts, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 33e7f8a56..0375de88c 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -478,6 +478,6 @@ static const demuxer_info_t demux_info_yuv4mpeg2 = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "yuv4mpeg2", XINE_VERSION_CODE, &demux_info_yuv4mpeg2, init_plugin }, + { PLUGIN_DEMUX, 27, "yuv4mpeg2", XINE_VERSION_CODE, &demux_info_yuv4mpeg2, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 1ffdc39d5..17a4feb31 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -254,7 +254,7 @@ static const demuxer_info_t demux_info_yuv_frames = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "yuv_frames", XINE_VERSION_CODE, &demux_info_yuv_frames, init_class }, + { PLUGIN_DEMUX, 27, "yuv_frames", XINE_VERSION_CODE, &demux_info_yuv_frames, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c index 8d6c18190..78bf4012b 100644 --- a/src/demuxers/group_audio.c +++ b/src/demuxers/group_audio.c @@ -99,21 +99,21 @@ static const demuxer_info_t demux_info_wav = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "aac", XINE_VERSION_CODE, &demux_info_aac, demux_aac_init_plugin }, - { PLUGIN_DEMUX, 26, "ac3", XINE_VERSION_CODE, &demux_info_ac3, demux_ac3_init_plugin }, - { PLUGIN_DEMUX, 26, "aud", XINE_VERSION_CODE, &demux_info_aud, demux_aud_init_plugin }, - { PLUGIN_DEMUX, 26, "aiff", XINE_VERSION_CODE, &demux_info_aiff, demux_aiff_init_plugin }, - { PLUGIN_DEMUX, 26, "cdda", XINE_VERSION_CODE, &demux_info_cdda, demux_cdda_init_plugin }, - { PLUGIN_DEMUX, 26, "dts", XINE_VERSION_CODE, &demux_info_dts, demux_dts_init_plugin }, - { PLUGIN_DEMUX, 26, "flac", XINE_VERSION_CODE, &demux_info_flac, demux_flac_init_plugin }, - { PLUGIN_DEMUX, 26, "mp3", XINE_VERSION_CODE, &demux_info_mpgaudio, demux_mpgaudio_init_class }, - { PLUGIN_DEMUX, 26, "mpc", XINE_VERSION_CODE, &demux_info_mpc, demux_mpc_init_plugin }, - { PLUGIN_DEMUX, 26, "realaudio", XINE_VERSION_CODE, &demux_info_realaudio, demux_realaudio_init_plugin }, - { PLUGIN_DEMUX, 26, "shn", XINE_VERSION_CODE, &demux_info_shn, demux_shn_init_plugin }, - { PLUGIN_DEMUX, 26, "snd", XINE_VERSION_CODE, &demux_info_snd, demux_snd_init_plugin }, - { PLUGIN_DEMUX, 26, "tta", XINE_VERSION_CODE, &demux_info_tta, demux_tta_init_plugin }, - { PLUGIN_DEMUX, 26, "voc", XINE_VERSION_CODE, &demux_info_voc, demux_voc_init_plugin }, - { PLUGIN_DEMUX, 26, "vox", XINE_VERSION_CODE, &demux_info_vox, demux_vox_init_plugin }, - { PLUGIN_DEMUX, 26, "wav", XINE_VERSION_CODE, &demux_info_wav, demux_wav_init_plugin }, + { PLUGIN_DEMUX, 27, "aac", XINE_VERSION_CODE, &demux_info_aac, demux_aac_init_plugin }, + { PLUGIN_DEMUX, 27, "ac3", XINE_VERSION_CODE, &demux_info_ac3, demux_ac3_init_plugin }, + { PLUGIN_DEMUX, 27, "aud", XINE_VERSION_CODE, &demux_info_aud, demux_aud_init_plugin }, + { PLUGIN_DEMUX, 27, "aiff", XINE_VERSION_CODE, &demux_info_aiff, demux_aiff_init_plugin }, + { PLUGIN_DEMUX, 27, "cdda", XINE_VERSION_CODE, &demux_info_cdda, demux_cdda_init_plugin }, + { PLUGIN_DEMUX, 27, "dts", XINE_VERSION_CODE, &demux_info_dts, demux_dts_init_plugin }, + { PLUGIN_DEMUX, 27, "flac", XINE_VERSION_CODE, &demux_info_flac, demux_flac_init_plugin }, + { PLUGIN_DEMUX, 27, "mp3", XINE_VERSION_CODE, &demux_info_mpgaudio, demux_mpgaudio_init_class }, + { PLUGIN_DEMUX, 27, "mpc", XINE_VERSION_CODE, &demux_info_mpc, demux_mpc_init_plugin }, + { PLUGIN_DEMUX, 27, "realaudio", XINE_VERSION_CODE, &demux_info_realaudio, demux_realaudio_init_plugin }, + { PLUGIN_DEMUX, 27, "shn", XINE_VERSION_CODE, &demux_info_shn, demux_shn_init_plugin }, + { PLUGIN_DEMUX, 27, "snd", XINE_VERSION_CODE, &demux_info_snd, demux_snd_init_plugin }, + { PLUGIN_DEMUX, 27, "tta", XINE_VERSION_CODE, &demux_info_tta, demux_tta_init_plugin }, + { PLUGIN_DEMUX, 27, "voc", XINE_VERSION_CODE, &demux_info_voc, demux_voc_init_plugin }, + { PLUGIN_DEMUX, 27, "vox", XINE_VERSION_CODE, &demux_info_vox, demux_vox_init_plugin }, + { PLUGIN_DEMUX, 27, "wav", XINE_VERSION_CODE, &demux_info_wav, demux_wav_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c index ad257c2fb..cfae26848 100644 --- a/src/demuxers/group_games.c +++ b/src/demuxers/group_games.c @@ -79,16 +79,16 @@ static const demuxer_info_t demux_info_vmd = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "wve", XINE_VERSION_CODE, &demux_info_eawve, demux_eawve_init_plugin}, - { PLUGIN_DEMUX, 26, "idcin", XINE_VERSION_CODE, &demux_info_idcin, demux_idcin_init_plugin }, - { PLUGIN_DEMUX, 26, "ipmovie", XINE_VERSION_CODE, &demux_info_ipmovie, demux_ipmovie_init_plugin }, - { PLUGIN_DEMUX, 26, "vqa", XINE_VERSION_CODE, &demux_info_vqa, demux_vqa_init_plugin }, - { PLUGIN_DEMUX, 26, "wc3movie", XINE_VERSION_CODE, &demux_info_wc3movie, demux_wc3movie_init_plugin }, - { PLUGIN_DEMUX, 26, "roq", XINE_VERSION_CODE, &demux_info_roq, demux_roq_init_plugin }, - { PLUGIN_DEMUX, 26, "str", XINE_VERSION_CODE, &demux_info_str, demux_str_init_plugin }, - { PLUGIN_DEMUX, 26, "film", XINE_VERSION_CODE, &demux_info_film, demux_film_init_plugin }, - { PLUGIN_DEMUX, 26, "smjpeg", XINE_VERSION_CODE, &demux_info_smjpeg, demux_smjpeg_init_plugin }, - { PLUGIN_DEMUX, 26, "fourxm", XINE_VERSION_CODE, &demux_info_fourxm, demux_fourxm_init_plugin }, - { PLUGIN_DEMUX, 26, "vmd", XINE_VERSION_CODE, &demux_info_vmd, demux_vmd_init_plugin }, + { PLUGIN_DEMUX, 27, "wve", XINE_VERSION_CODE, &demux_info_eawve, demux_eawve_init_plugin}, + { PLUGIN_DEMUX, 27, "idcin", XINE_VERSION_CODE, &demux_info_idcin, demux_idcin_init_plugin }, + { PLUGIN_DEMUX, 27, "ipmovie", XINE_VERSION_CODE, &demux_info_ipmovie, demux_ipmovie_init_plugin }, + { PLUGIN_DEMUX, 27, "vqa", XINE_VERSION_CODE, &demux_info_vqa, demux_vqa_init_plugin }, + { PLUGIN_DEMUX, 27, "wc3movie", XINE_VERSION_CODE, &demux_info_wc3movie, demux_wc3movie_init_plugin }, + { PLUGIN_DEMUX, 27, "roq", XINE_VERSION_CODE, &demux_info_roq, demux_roq_init_plugin }, + { PLUGIN_DEMUX, 27, "str", XINE_VERSION_CODE, &demux_info_str, demux_str_init_plugin }, + { PLUGIN_DEMUX, 27, "film", XINE_VERSION_CODE, &demux_info_film, demux_film_init_plugin }, + { PLUGIN_DEMUX, 27, "smjpeg", XINE_VERSION_CODE, &demux_info_smjpeg, demux_smjpeg_init_plugin }, + { PLUGIN_DEMUX, 27, "fourxm", XINE_VERSION_CODE, &demux_info_fourxm, demux_fourxm_init_plugin }, + { PLUGIN_DEMUX, 27, "vmd", XINE_VERSION_CODE, &demux_info_vmd, demux_vmd_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index 6e8b1a646..5f8ea103d 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.c @@ -1498,6 +1498,6 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 26, "sputext", XINE_VERSION_CODE, NULL, &init_sputext_demux_class }, + { PLUGIN_DEMUX, 27, "sputext", XINE_VERSION_CODE, NULL, &init_sputext_demux_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; -- cgit v1.2.3 From 5d4f71c06873aea6df30b07abb84e7bdace5d54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 18:19:30 +0100 Subject: Bump the interface version for audio decoder plugins. --- src/combined/flac_decoder.c | 2 +- src/combined/nsf_combined.c | 2 +- src/combined/wavpack_combined.c | 2 +- src/combined/xine_ogg_demuxer.c | 4 ++-- src/libffmpeg/ff_dvaudio_decoder.c | 2 +- src/libffmpeg/ffmpeg_decoder.c | 2 +- src/libreal/real_common.c | 2 +- src/libw32dll/qt_decoder.c | 2 +- src/libw32dll/w32codec.c | 2 +- src/libxineadec/fooaudio.c | 2 +- src/libxineadec/gsm610.c | 2 +- src/libxineadec/xine_a52_decoder.c | 2 +- src/libxineadec/xine_dts_decoder.c | 2 +- src/libxineadec/xine_faad_decoder.c | 2 +- src/libxineadec/xine_lpcm_decoder.c | 2 +- src/libxineadec/xine_mad_decoder.c | 2 +- src/libxineadec/xine_musepack_decoder.c | 2 +- src/xine-engine/audio_decoder.h | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c index 307829166..cb7db0364 100644 --- a/src/combined/flac_decoder.c +++ b/src/combined/flac_decoder.c @@ -408,6 +408,6 @@ static const decoder_info_t dec_info_audio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ { PLUGIN_DEMUX, 27, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class }, - { PLUGIN_AUDIO_DECODER, 15, "flacdec", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "flacdec", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/combined/nsf_combined.c b/src/combined/nsf_combined.c index 538835818..085467937 100644 --- a/src/combined/nsf_combined.c +++ b/src/combined/nsf_combined.c @@ -37,6 +37,6 @@ static const decoder_info_t decoder_info_nsf = { const plugin_info_t xine_plugin_info[] EXPORTED = { { PLUGIN_DEMUX, 27, "nsfdemux", XINE_VERSION_CODE, &demux_info_nsf, demux_nsf_init_plugin }, - { PLUGIN_AUDIO_DECODER, 15, "nsfdec", XINE_VERSION_CODE, &decoder_info_nsf, decoder_nsf_init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "nsfdec", XINE_VERSION_CODE, &decoder_info_nsf, decoder_nsf_init_plugin }, { PLUGIN_NONE, 0, NULL, 0, NULL, NULL } }; diff --git a/src/combined/wavpack_combined.c b/src/combined/wavpack_combined.c index 1a889844a..9c5dade03 100644 --- a/src/combined/wavpack_combined.c +++ b/src/combined/wavpack_combined.c @@ -39,6 +39,6 @@ static const decoder_info_t decoder_info_wv = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ { PLUGIN_DEMUX, 27, "wavpack", XINE_VERSION_CODE, &demux_info_wv, demux_wv_init_plugin }, - { PLUGIN_AUDIO_DECODER, 15, "wavpackdec", XINE_VERSION_CODE, &decoder_info_wv, decoder_wavpack_init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "wavpackdec", XINE_VERSION_CODE, &decoder_info_wv, decoder_wavpack_init_plugin }, { PLUGIN_NONE, 0, NULL, 0, NULL, NULL } }; diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 53365c7b9..81e65b590 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -2193,10 +2193,10 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { { PLUGIN_DEMUX, 27, "ogg", XINE_VERSION_CODE, &demux_info_ogg, ogg_init_class }, { PLUGIN_DEMUX, 27, "anx", XINE_VERSION_CODE, &demux_info_anx, anx_init_class }, #ifdef HAVE_VORBIS - { PLUGIN_AUDIO_DECODER, 15, "vorbis", XINE_VERSION_CODE, &dec_info_vorbis, vorbis_init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "vorbis", XINE_VERSION_CODE, &dec_info_vorbis, vorbis_init_plugin }, #endif #ifdef HAVE_SPEEX - { PLUGIN_AUDIO_DECODER, 15, "speex", XINE_VERSION_CODE, &dec_info_speex, speex_init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "speex", XINE_VERSION_CODE, &dec_info_speex, speex_init_plugin }, #endif #ifdef HAVE_THEORA { PLUGIN_VIDEO_DECODER, 18, "theora", XINE_VERSION_CODE, &dec_info_theora, theora_init_plugin }, diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index 0db76c9b2..482ae396e 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -407,6 +407,6 @@ static const decoder_info_t dec_info_dvaudio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_AUDIO_DECODER, 15, "dvaudio", XINE_VERSION_CODE, &dec_info_dvaudio, init_dvaudio_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "dvaudio", XINE_VERSION_CODE, &dec_info_dvaudio, init_dvaudio_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libffmpeg/ffmpeg_decoder.c b/src/libffmpeg/ffmpeg_decoder.c index c0fb90e97..9410e5793 100644 --- a/src/libffmpeg/ffmpeg_decoder.c +++ b/src/libffmpeg/ffmpeg_decoder.c @@ -50,6 +50,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "ffmpegvideo", XINE_VERSION_CODE, &dec_info_ffmpeg_video, init_video_plugin }, { PLUGIN_VIDEO_DECODER, 18, "ffmpeg-wmv8", XINE_VERSION_CODE, &dec_info_ffmpeg_wmv8, init_video_plugin }, { PLUGIN_VIDEO_DECODER, 18, "ffmpeg-wmv9", XINE_VERSION_CODE, &dec_info_ffmpeg_wmv9, init_video_plugin }, - { PLUGIN_AUDIO_DECODER, 15, "ffmpegaudio", XINE_VERSION_CODE, &dec_info_ffmpeg_audio, init_audio_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "ffmpegaudio", XINE_VERSION_CODE, &dec_info_ffmpeg_audio, init_audio_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libreal/real_common.c b/src/libreal/real_common.c index fcd0fac8f..3985440ac 100644 --- a/src/libreal/real_common.c +++ b/src/libreal/real_common.c @@ -185,6 +185,6 @@ void *_x_real_codec_open(xine_stream_t *const stream, const char *const path, const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "realvdec", XINE_VERSION_CODE, &dec_info_realvideo, init_realvdec }, - { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 15, "realadec", XINE_VERSION_CODE, &dec_info_realaudio, init_realadec }, + { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "realadec", XINE_VERSION_CODE, &dec_info_realaudio, init_realadec }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index 9967b8e70..b447b4803 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.c @@ -1115,6 +1115,6 @@ static const decoder_info_t qtv_dec_info = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "qtv", XINE_VERSION_CODE, &qtv_dec_info, qtv_init_class }, - { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 15, "qta", XINE_VERSION_CODE, &qta_dec_info, qta_init_class }, + { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "qta", XINE_VERSION_CODE, &qta_dec_info, qta_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index efbf69f67..b20780f86 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -1679,6 +1679,6 @@ static const decoder_info_t dec_info_audio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "win32v", XINE_VERSION_CODE, &dec_info_video, init_video_decoder_class }, - { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 15, "win32a", XINE_VERSION_CODE, &dec_info_audio, init_audio_decoder_class }, + { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "win32a", XINE_VERSION_CODE, &dec_info_audio, init_audio_decoder_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c index 198be2968..42427611f 100644 --- a/src/libxineadec/fooaudio.c +++ b/src/libxineadec/fooaudio.c @@ -330,7 +330,7 @@ static const decoder_info_t dec_info_audio = { * will export to the public. */ const plugin_info_t xine_plugin_info[] EXPORTED = { /* { type, API version, "name", version, special_info, init_function }, */ - { PLUGIN_AUDIO_DECODER, 15, "fooaudio", XINE_VERSION_CODE, &dec_info_audio, &init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "fooaudio", XINE_VERSION_CODE, &dec_info_audio, &init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c index 723f18614..4ca3827d7 100644 --- a/src/libxineadec/gsm610.c +++ b/src/libxineadec/gsm610.c @@ -276,6 +276,6 @@ static const decoder_info_t dec_info_audio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_AUDIO_DECODER, 15, "gsm610", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "gsm610", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxineadec/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c index e79958087..2d901d00a 100644 --- a/src/libxineadec/xine_a52_decoder.c +++ b/src/libxineadec/xine_a52_decoder.c @@ -844,6 +844,6 @@ static const decoder_info_t dec_info_audio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 15, "a/52", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, + { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "a/52", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxineadec/xine_dts_decoder.c b/src/libxineadec/xine_dts_decoder.c index d12f51e36..369c354fd 100644 --- a/src/libxineadec/xine_dts_decoder.c +++ b/src/libxineadec/xine_dts_decoder.c @@ -573,6 +573,6 @@ static const decoder_info_t dec_info_audio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_AUDIO_DECODER, 15, "dts", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "dts", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c index 3eab9b959..36d1d0679 100644 --- a/src/libxineadec/xine_faad_decoder.c +++ b/src/libxineadec/xine_faad_decoder.c @@ -470,6 +470,6 @@ static const decoder_info_t dec_info_audio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_AUDIO_DECODER, 15, "faad", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "faad", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c index a1c5f1622..96c02906d 100644 --- a/src/libxineadec/xine_lpcm_decoder.c +++ b/src/libxineadec/xine_lpcm_decoder.c @@ -273,6 +273,6 @@ static const decoder_info_t dec_info_audio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_AUDIO_DECODER, 15, "pcm", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "pcm", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxineadec/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c index 996daaff8..906db048a 100644 --- a/src/libxineadec/xine_mad_decoder.c +++ b/src/libxineadec/xine_mad_decoder.c @@ -360,6 +360,6 @@ static const decoder_info_t dec_info_audio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_AUDIO_DECODER, 15, "mad", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "mad", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxineadec/xine_musepack_decoder.c b/src/libxineadec/xine_musepack_decoder.c index 52d9e0f0b..ad5002439 100644 --- a/src/libxineadec/xine_musepack_decoder.c +++ b/src/libxineadec/xine_musepack_decoder.c @@ -456,7 +456,7 @@ static const decoder_info_t dec_info_audio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* { type, API version, "name", version, special_info, init_function }, */ - { PLUGIN_AUDIO_DECODER, 15, "mpc", XINE_VERSION_CODE, &dec_info_audio, &init_plugin }, + { PLUGIN_AUDIO_DECODER, 16, "mpc", XINE_VERSION_CODE, &dec_info_audio, &init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/xine-engine/audio_decoder.h b/src/xine-engine/audio_decoder.h index f5a9f506e..307692b81 100644 --- a/src/xine-engine/audio_decoder.h +++ b/src/xine-engine/audio_decoder.h @@ -31,7 +31,7 @@ # include #endif -#define AUDIO_DECODER_IFACE_VERSION 15 +#define AUDIO_DECODER_IFACE_VERSION 16 /* * generic xine audio decoder plugin interface -- cgit v1.2.3 From 86af045eabd1e30e41a9750a6d48fa3ed8767df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 18:21:13 +0100 Subject: Bump the interface version for video decoder plugins. --- src/combined/xine_ogg_demuxer.c | 2 +- src/dxr3/dxr3_decode_video.c | 2 +- src/libffmpeg/ffmpeg_decoder.c | 6 +++--- src/libmpeg2/xine_mpeg2_decoder.c | 2 +- src/libmpeg2new/xine_mpeg2new_decoder.c | 2 +- src/libreal/real_common.c | 2 +- src/libw32dll/qt_decoder.c | 2 +- src/libw32dll/w32codec.c | 2 +- src/libxinevdec/bitplane.c | 2 +- src/libxinevdec/foovideo.c | 2 +- src/libxinevdec/gdkpixbuf.c | 2 +- src/libxinevdec/image.c | 2 +- src/libxinevdec/rgb.c | 2 +- src/libxinevdec/yuv.c | 2 +- src/xine-engine/video_decoder.h | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 81e65b590..1f96c2213 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -2199,7 +2199,7 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { { PLUGIN_AUDIO_DECODER, 16, "speex", XINE_VERSION_CODE, &dec_info_speex, speex_init_plugin }, #endif #ifdef HAVE_THEORA - { PLUGIN_VIDEO_DECODER, 18, "theora", XINE_VERSION_CODE, &dec_info_theora, theora_init_plugin }, + { PLUGIN_VIDEO_DECODER, 19, "theora", XINE_VERSION_CODE, &dec_info_theora, theora_init_plugin }, #endif { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 345627d8f..e26e303a1 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -74,7 +74,7 @@ static const decoder_info_t dxr3_video_decoder_info = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER, 18, "dxr3-mpeg2", XINE_VERSION_CODE, &dxr3_video_decoder_info, &dxr3_init_plugin }, + { PLUGIN_VIDEO_DECODER, 19, "dxr3-mpeg2", XINE_VERSION_CODE, &dxr3_video_decoder_info, &dxr3_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libffmpeg/ffmpeg_decoder.c b/src/libffmpeg/ffmpeg_decoder.c index 9410e5793..45080590d 100644 --- a/src/libffmpeg/ffmpeg_decoder.c +++ b/src/libffmpeg/ffmpeg_decoder.c @@ -47,9 +47,9 @@ void init_once_routine(void) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "ffmpegvideo", XINE_VERSION_CODE, &dec_info_ffmpeg_video, init_video_plugin }, - { PLUGIN_VIDEO_DECODER, 18, "ffmpeg-wmv8", XINE_VERSION_CODE, &dec_info_ffmpeg_wmv8, init_video_plugin }, - { PLUGIN_VIDEO_DECODER, 18, "ffmpeg-wmv9", XINE_VERSION_CODE, &dec_info_ffmpeg_wmv9, init_video_plugin }, + { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "ffmpegvideo", XINE_VERSION_CODE, &dec_info_ffmpeg_video, init_video_plugin }, + { PLUGIN_VIDEO_DECODER, 19, "ffmpeg-wmv8", XINE_VERSION_CODE, &dec_info_ffmpeg_wmv8, init_video_plugin }, + { PLUGIN_VIDEO_DECODER, 19, "ffmpeg-wmv9", XINE_VERSION_CODE, &dec_info_ffmpeg_wmv9, init_video_plugin }, { PLUGIN_AUDIO_DECODER, 16, "ffmpegaudio", XINE_VERSION_CODE, &dec_info_ffmpeg_audio, init_audio_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libmpeg2/xine_mpeg2_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c index 788f6bb2f..ccce02186 100644 --- a/src/libmpeg2/xine_mpeg2_decoder.c +++ b/src/libmpeg2/xine_mpeg2_decoder.c @@ -164,6 +164,6 @@ static const decoder_info_t dec_info_mpeg2 = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER, 18, "mpeg2", XINE_VERSION_CODE, &dec_info_mpeg2, init_plugin }, + { PLUGIN_VIDEO_DECODER, 19, "mpeg2", XINE_VERSION_CODE, &dec_info_mpeg2, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libmpeg2new/xine_mpeg2new_decoder.c b/src/libmpeg2new/xine_mpeg2new_decoder.c index d0c01a0d4..386b0049d 100644 --- a/src/libmpeg2new/xine_mpeg2new_decoder.c +++ b/src/libmpeg2new/xine_mpeg2new_decoder.c @@ -499,6 +499,6 @@ static decoder_info_t dec_info_mpeg2 = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER, 18, "mpeg2new", XINE_VERSION_CODE, &dec_info_mpeg2, init_plugin }, + { PLUGIN_VIDEO_DECODER, 19, "mpeg2new", XINE_VERSION_CODE, &dec_info_mpeg2, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libreal/real_common.c b/src/libreal/real_common.c index 3985440ac..531fb780e 100644 --- a/src/libreal/real_common.c +++ b/src/libreal/real_common.c @@ -184,7 +184,7 @@ void *_x_real_codec_open(xine_stream_t *const stream, const char *const path, const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "realvdec", XINE_VERSION_CODE, &dec_info_realvideo, init_realvdec }, + { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "realvdec", XINE_VERSION_CODE, &dec_info_realvideo, init_realvdec }, { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "realadec", XINE_VERSION_CODE, &dec_info_realaudio, init_realadec }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index b447b4803..ca358bb9b 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.c @@ -1114,7 +1114,7 @@ static const decoder_info_t qtv_dec_info = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "qtv", XINE_VERSION_CODE, &qtv_dec_info, qtv_init_class }, + { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "qtv", XINE_VERSION_CODE, &qtv_dec_info, qtv_init_class }, { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "qta", XINE_VERSION_CODE, &qta_dec_info, qta_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index b20780f86..3b66dfb23 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -1678,7 +1678,7 @@ static const decoder_info_t dec_info_audio = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "win32v", XINE_VERSION_CODE, &dec_info_video, init_video_decoder_class }, + { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "win32v", XINE_VERSION_CODE, &dec_info_video, init_video_decoder_class }, { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "win32a", XINE_VERSION_CODE, &dec_info_audio, init_audio_decoder_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index 08bdb4c22..c8400f464 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.c @@ -1549,6 +1549,6 @@ static const decoder_info_t dec_info_video = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER, 18, "bitplane", XINE_VERSION_CODE, &dec_info_video, init_plugin }, + { PLUGIN_VIDEO_DECODER, 19, "bitplane", XINE_VERSION_CODE, &dec_info_video, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c index 1dc6fa137..b33705a3f 100644 --- a/src/libxinevdec/foovideo.c +++ b/src/libxinevdec/foovideo.c @@ -276,6 +276,6 @@ static const decoder_info_t dec_info_video = { */ const plugin_info_t xine_plugin_info[] EXPORTED = { /* { type, API, "name", version, special_info, init_function } */ - { PLUGIN_VIDEO_DECODER, 18, "foovideo", XINE_VERSION_CODE, &dec_info_video, init_plugin }, + { PLUGIN_VIDEO_DECODER, 19, "foovideo", XINE_VERSION_CODE, &dec_info_video, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c index 1ae0920bd..7fd4a6a0e 100644 --- a/src/libxinevdec/gdkpixbuf.c +++ b/src/libxinevdec/gdkpixbuf.c @@ -289,6 +289,6 @@ static const decoder_info_t dec_info_image = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER, 18, "gdkpixbuf", XINE_VERSION_CODE, &dec_info_image, init_class }, + { PLUGIN_VIDEO_DECODER, 19, "gdkpixbuf", XINE_VERSION_CODE, &dec_info_image, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index a73440f9c..7a97972c7 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -268,6 +268,6 @@ static const decoder_info_t dec_info_image = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER, 18, "image", XINE_VERSION_CODE, &dec_info_image, init_class }, + { PLUGIN_VIDEO_DECODER, 19, "image", XINE_VERSION_CODE, &dec_info_image, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index 1cf61febe..5360fd8b2 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -442,6 +442,6 @@ static const decoder_info_t dec_info_video = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER, 18, "rgb", XINE_VERSION_CODE, &dec_info_video, init_plugin }, + { PLUGIN_VIDEO_DECODER, 19, "rgb", XINE_VERSION_CODE, &dec_info_video, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index b9856379a..352f59e9a 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -368,6 +368,6 @@ static const decoder_info_t dec_info_video = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER, 18, "yuv", XINE_VERSION_CODE, &dec_info_video, init_plugin }, + { PLUGIN_VIDEO_DECODER, 19, "yuv", XINE_VERSION_CODE, &dec_info_video, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/xine-engine/video_decoder.h b/src/xine-engine/video_decoder.h index ed3386717..705efa3da 100644 --- a/src/xine-engine/video_decoder.h +++ b/src/xine-engine/video_decoder.h @@ -31,7 +31,7 @@ # include #endif -#define VIDEO_DECODER_IFACE_VERSION 18 +#define VIDEO_DECODER_IFACE_VERSION 19 /* -- cgit v1.2.3 From f7cbfdf9575df64a5ba6f594912ae18c45a1058e Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 11 Dec 2007 17:22:54 +0000 Subject: Bump the interface version of the VCD plugin (which got missed earlier). --- src/input/vcd/xineplug_inp_vcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index c33f73e40..45d9789ba 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1988,7 +1988,7 @@ _("For tracking down bugs in the VCD plugin. Mask values are:\n" const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, (char *) SHORT_PLUGIN_NAME, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, (char *) SHORT_PLUGIN_NAME, XINE_VERSION_CODE, NULL, vcd_init }, { PLUGIN_NONE, 0, (char *) "", 0, NULL, NULL } }; -- cgit v1.2.3 From bebea7e1e218eed9e72dac3c7c2934f16c96f4a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 19:04:47 +0100 Subject: Transform get_extensions and get_mimetypes into strings. Please note that this commit temporarily breaks building. --- src/combined/flac_demuxer.c | 15 ++----------- src/combined/nsf_demuxer.c | 12 ++--------- src/combined/wavpack_demuxer.c | 12 ++--------- src/combined/xine_ogg_demuxer.c | 33 +++++++---------------------- src/demuxers/demux.h | 19 ++++++++--------- src/demuxers/demux_4xm.c | 12 ++--------- src/demuxers/demux_aac.c | 12 ++--------- src/demuxers/demux_ac3.c | 12 ++--------- src/demuxers/demux_aiff.c | 17 +++++---------- src/demuxers/demux_asf.c | 30 ++++++++++---------------- src/demuxers/demux_aud.c | 12 ++--------- src/demuxers/demux_avi.c | 15 ++++--------- src/demuxers/demux_cdda.c | 12 ++--------- src/demuxers/demux_dts.c | 12 ++--------- src/demuxers/demux_eawve.c | 12 ++--------- src/demuxers/demux_elem.c | 12 ++--------- src/demuxers/demux_film.c | 12 ++--------- src/demuxers/demux_flac.c | 12 ++--------- src/demuxers/demux_fli.c | 12 ++--------- src/demuxers/demux_flv.c | 12 ++--------- src/demuxers/demux_idcin.c | 13 ++---------- src/demuxers/demux_iff.c | 27 +++++++++-------------- src/demuxers/demux_image.c | 13 ++---------- src/demuxers/demux_ipmovie.c | 12 ++--------- src/demuxers/demux_matroska.c | 14 ++---------- src/demuxers/demux_mng.c | 19 ++++++----------- src/demuxers/demux_mod.c | 12 ++--------- src/demuxers/demux_mpc.c | 12 ++--------- src/demuxers/demux_mpeg.c | 15 ++++--------- src/demuxers/demux_mpeg_block.c | 12 ++--------- src/demuxers/demux_mpeg_pes.c | 12 ++--------- src/demuxers/demux_mpgaudio.c | 47 +++++++++++++++-------------------------- src/demuxers/demux_nsv.c | 12 ++--------- src/demuxers/demux_playlist.c | 31 +++++++++++---------------- src/demuxers/demux_pva.c | 12 ++--------- src/demuxers/demux_qt.c | 19 ++++++----------- src/demuxers/demux_rawdv.c | 12 ++--------- src/demuxers/demux_real.c | 19 ++++++----------- src/demuxers/demux_realaudio.c | 12 ++--------- src/demuxers/demux_roq.c | 12 ++--------- src/demuxers/demux_shn.c | 12 ++--------- src/demuxers/demux_slave.c | 12 ++--------- src/demuxers/demux_smjpeg.c | 12 ++--------- src/demuxers/demux_snd.c | 18 +++++----------- src/demuxers/demux_str.c | 13 ++---------- src/demuxers/demux_ts.c | 13 ++---------- src/demuxers/demux_tta.c | 12 ++--------- src/demuxers/demux_vmd.c | 12 ++--------- src/demuxers/demux_voc.c | 12 ++--------- src/demuxers/demux_vox.c | 12 ++--------- src/demuxers/demux_vqa.c | 12 ++--------- src/demuxers/demux_wav.c | 19 ++++++----------- src/demuxers/demux_wc3movie.c | 12 ++--------- src/demuxers/demux_yuv4mpeg2.c | 12 ++--------- src/demuxers/demux_yuv_frames.c | 13 ++---------- src/libsputext/demux_sputext.c | 17 ++++----------- 56 files changed, 195 insertions(+), 652 deletions(-) diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c index b16c56106..2afdef1ce 100644 --- a/src/combined/flac_demuxer.c +++ b/src/combined/flac_demuxer.c @@ -712,17 +712,6 @@ open_plugin (demux_class_t *class_gen, /* FLAC Demuxer class */ - -static char * -get_extensions (demux_class_t *this_gen) { - return "flac"; -} - -static char * -get_mimetypes (demux_class_t *this_gen) { - return "application/x-flac: flac: FLAC Audio;"; -} - void * demux_flac_init_class (xine_t *xine, void *data) { @@ -737,8 +726,8 @@ demux_flac_init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("FLAC demux plugin"); this->demux_class.identifier = "FLAC"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = "application/x-flac: flac: FLAC Audio;"; + this->demux_class.extensions = "flac"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c index f6e5f8eff..adf97a43d 100644 --- a/src/combined/nsf_demuxer.c +++ b/src/combined/nsf_demuxer.c @@ -349,14 +349,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "nsf"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_nsf_init_plugin (xine_t *xine, void *data) { demux_nsf_class_t *this; @@ -365,8 +357,8 @@ void *demux_nsf_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("NES Music file demux plugin"); this->demux_class.identifier = "NSF"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "nsf"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c index 6ab5013e8..a8c0b4160 100644 --- a/src/combined/wavpack_demuxer.c +++ b/src/combined/wavpack_demuxer.c @@ -378,22 +378,14 @@ static demux_plugin_t *open_plugin (demux_class_t *const class_gen, return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *const this_gen) { - return "wv"; -} - -static const char *get_mimetypes (demux_class_t *const this_gen) { - return NULL; -} - void *demux_wv_init_plugin (xine_t *const xine, void *const data) { demux_wv_class_t *const this = xine_xmalloc (sizeof (demux_wv_class_t)); this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Wavpack demux plugin"); this->demux_class.identifier = "Wavpack"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "wv"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 1f96c2213..393700510 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -2116,15 +2116,6 @@ static demux_plugin_t *ogg_open_plugin (demux_class_t *class_gen, /* * Annodex demuxer class */ - -static const char *anx_get_extensions (demux_class_t *this_gen) { - return "anx axa axv"; -} - -static const char *anx_get_mimetypes (demux_class_t *this_gen) { - return "application/x-annodex: ogg: Annodex media;"; -} - static void *anx_init_class (xine_t *xine, void *data) { demux_anx_class_t *this; @@ -2133,8 +2124,8 @@ static void *anx_init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = anx_open_plugin; this->demux_class.description = N_("Annodex demux plugin"); this->demux_class.identifier = "Annodex"; - this->demux_class.get_mimetypes = anx_get_mimetypes; - this->demux_class.get_extensions = anx_get_extensions; + this->demux_class.mimetypes = "application/x-annodex: ogg: Annodex media;"; + this->demux_class.extensions = "anx axa axv"; this->demux_class.dispose = default_demux_class_dispose; return this; @@ -2143,18 +2134,6 @@ static void *anx_init_class (xine_t *xine, void *data) { /* * ogg demuxer class */ - -static const char *ogg_get_extensions (demux_class_t *this_gen) { - return "ogg ogm spx"; -} - -static const char *ogg_get_mimetypes (demux_class_t *this_gen) { - return "audio/x-ogg: ogg: OggVorbis Audio;" - "audio/x-speex: ogg: Speex Audio;" - "application/x-ogg: ogg: Ogg Stream;" - "application/ogg: ogg: Ogg Stream;"; -} - static void *ogg_init_class (xine_t *xine, void *data) { demux_ogg_class_t *this; @@ -2163,8 +2142,12 @@ static void *ogg_init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = ogg_open_plugin; this->demux_class.description = N_("OGG demux plugin"); this->demux_class.identifier = "OGG"; - this->demux_class.get_mimetypes = ogg_get_mimetypes; - this->demux_class.get_extensions = ogg_get_extensions; + this->demux_class.mimetypes = + "audio/x-ogg: ogg: OggVorbis Audio;" + "audio/x-speex: ogg: Speex Audio;" + "application/x-ogg: ogg: Ogg Stream;" + "application/ogg: ogg: Ogg Stream;"; + this->demux_class.extensions = "ogg ogm spx"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index c9597463b..b666ee2cc 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -70,20 +70,19 @@ struct demux_class_s { */ const char *textdomain; - /* - * return MIME types supported for this plugin + /** + * @brief MIME types supported for this plugin */ - const char* (*get_mimetypes) (demux_class_t *this); + const char* mimetypes; - /* - * return ' ' seperated list of file extensions this - * demuxer is likely to handle - * (will be used to filter media files in - * file selection dialogs) + /** + * @brief space separated list of file extensions this demuxer is + * likely to handle + * + * (will be used to filter media files in file selection dialogs) */ - - const char* (*get_extensions) (demux_class_t *this); + const char* extensions; /* * close down, free all resources diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 3c28c1ad5..8f43cfcf5 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -515,14 +515,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "4xm"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_fourxm_init_plugin (xine_t *xine, void *data) { demux_fourxm_class_t *this; @@ -531,8 +523,8 @@ void *demux_fourxm_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("4X Technologies (4xm) demux plugin"); this->demux_class.identifier = "4X Technologies"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "4xm"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index 64f94b46a..b16ab8f02 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -302,14 +302,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "aac"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_aac_init_plugin (xine_t *xine, void *data) { demux_aac_class_t *this; @@ -318,8 +310,8 @@ void *demux_aac_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("ADIF/ADTS AAC demux plugin"); this->demux_class.identifier = "AAC"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "aac"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 3f5b7a6aa..23a96b3fa 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -460,14 +460,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "ac3"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_ac3_init_plugin (xine_t *xine, void *data) { demux_ac3_class_t *this; @@ -476,8 +468,8 @@ void *demux_ac3_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Raw AC3 demux plugin"); this->demux_class.identifier = "AC3"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "ac3"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index c7b98d8ac..812c293f0 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -380,16 +380,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "aif aiff"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "audio/x-aiff: aif, aiff: AIFF audio;" - "audio/aiff: aif, aiff: AIFF audio;" - "audio/x-pn-aiff: aif, aiff: AIFF audio;"; -} - void *demux_aiff_init_plugin (xine_t *xine, void *data) { demux_aiff_class_t *this; @@ -398,8 +388,11 @@ void *demux_aiff_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("AIFF file demux plugin"); this->demux_class.identifier = "AIFF"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = + "audio/x-aiff: aif, aiff: AIFF audio;" + "audio/aiff: aif, aiff: AIFF audio;" + "audio/x-pn-aiff: aif, aiff: AIFF audio;"; + this->demux_class.extensions = "aif aiff"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index f16163335..42dfeb016 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -2096,23 +2096,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - /* asx, wvx, wax are metafile or playlist */ - return "asf wmv wma asx wvx wax"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - - return "video/x-ms-asf: asf: ASF stream;" - "video/x-ms-wmv: wmv: Windows Media Video;" - "audio/x-ms-wma: wma: Windows Media Audio;" - "application/vnd.ms-asf: asf: ASF stream;" - "application/x-mplayer2: asf,asx,asp: mplayer2;" - "video/x-ms-asf-plugin: asf,asx,asp: mms animation;" - "video/x-ms-wvx: wvx: wmv metafile;" - "video/x-ms-wax: wva: wma metafile;"; -} - static void *init_class (xine_t *xine, void *data) { demux_asf_class_t *this; @@ -2124,8 +2107,17 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("ASF demux plugin"); this->demux_class.identifier = "ASF"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = + "video/x-ms-asf: asf: ASF stream;" + "video/x-ms-wmv: wmv: Windows Media Video;" + "audio/x-ms-wma: wma: Windows Media Audio;" + "application/vnd.ms-asf: asf: ASF stream;" + "application/x-mplayer2: asf,asx,asp: mplayer2;" + "video/x-ms-asf-plugin: asf,asx,asp: mms animation;" + "video/x-ms-wvx: wvx: wmv metafile;" + "video/x-ms-wax: wva: wma metafile;"; + /* asx, wvx, wax are metafile or playlist */ + this->demux_class.extensions = "asf wmv wma asx wvx wax"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 35df1856c..53b07722c 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -313,14 +313,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "aud"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_aud_init_plugin (xine_t *xine, void *data) { demux_aud_class_t *this; @@ -329,8 +321,8 @@ void *demux_aud_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Westwood Studios AUD file demux plugin"); this->demux_class.identifier = "Westwood Studios AUD"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "aud"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 62a9b67f3..49cf6c75a 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -2310,15 +2310,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str /* * demux avi class */ -static const char *get_extensions (demux_class_t *this_gen) { - return "avi"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "video/msvideo: avi: AVI video;" - "video/x-msvideo: avi: AVI video;"; -} - static void *init_class (xine_t *xine, void *data) { demux_avi_class_t *this; @@ -2327,8 +2318,10 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("AVI/RIFF demux plugin"); this->demux_class.identifier = "AVI"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = + "video/msvideo: avi: AVI video;" + "video/x-msvideo: avi: AVI video;"; + this->demux_class.extensions = "avi"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index 181e6a034..f11523239 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -219,14 +219,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return NULL; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_cdda_init_plugin (xine_t *xine, void *data) { demux_cdda_class_t *this; @@ -235,8 +227,8 @@ void *demux_cdda_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("CD Digital Audio demux plugin"); this->demux_class.identifier = "CDDA"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = NULL; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index 998106a0d..30a69d145 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -387,14 +387,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "dts"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_dts_init_plugin (xine_t *xine, void *data) { demux_dts_class_t *this; @@ -403,8 +395,8 @@ void *demux_dts_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Raw DTS demux plugin"); this->demux_class.identifier = "DTS"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "dts" this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index bcaaf8543..cbae63153 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -394,14 +394,6 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre return &this->demux_plugin; } -static const char *get_extensions(demux_class_t *this_gen){ - return "wve"; -} - -static const char *get_mimetypes(demux_class_t *this_gen){ - return NULL; -} - void *demux_eawve_init_plugin(xine_t *xine, void *data) { demux_eawve_class_t *this; @@ -410,8 +402,8 @@ void *demux_eawve_init_plugin(xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Electronics Arts WVE format demux plugin"); this->demux_class.identifier = "EA WVE"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "wve"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 3e33b45ab..0642edf0e 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -254,14 +254,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "mpv"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_elem_class_t *this; @@ -270,8 +262,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Elementary MPEG stream demux plugin"); this->demux_class.identifier = "MPEG_ELEM"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "mpv"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 533328fdd..94d3c9194 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -899,14 +899,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "cpk cak film"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_film_init_plugin (xine_t *xine, void *data) { demux_film_class_t *this; @@ -915,8 +907,8 @@ void *demux_film_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("FILM (CPK) demux plugin"); this->demux_class.identifier = "FILM (CPK)"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "cpk cak film"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c index 80b41bef5..a82d80fae 100644 --- a/src/demuxers/demux_flac.c +++ b/src/demuxers/demux_flac.c @@ -524,14 +524,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "flac"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_flac_init_plugin (xine_t *xine, void *data) { demux_flac_class_t *this; @@ -540,8 +532,8 @@ void *demux_flac_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Free Lossless Audio Codec (flac) demux plugin"); this->demux_class.identifier = "FLAC"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "flac"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index ccbf675bb..2ff8f3309 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -347,14 +347,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "fli flc"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "video/x-flic: fli,flc: Autodesk FLIC files;"; -} - static void *init_plugin (xine_t *xine, void *data) { demux_fli_class_t *this; @@ -363,8 +355,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Autodesk Animator FLI/FLC demux plugin"); this->demux_class.identifier = "FLI/FLC"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = "video/x-flic: fli,flc: Autodesk FLIC files;"; + this->demux_class.extensions = "fli flc"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index b48f1a7c2..f78743579 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -877,14 +877,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "flv"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "video/x-flv: flv: Flash video;"; -} - static void *init_plugin (xine_t *xine, void *data) { demux_flv_class_t *this; @@ -893,8 +885,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Flash Video file demux plugin"); this->demux_class.identifier = "FLV"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = "video/x-flv: flv: Flash video;"; + this->demux_class.extensions = "flv"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index cef8f48dc..d17f558ab 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -517,15 +517,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } - -static const char *get_extensions (demux_class_t *this_gen) { - return "cin"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_idcin_init_plugin (xine_t *xine, void *data) { demux_idcin_class_t *this; @@ -534,8 +525,8 @@ void *demux_idcin_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Id Quake II Cinematic file demux plugin"); this->demux_class.identifier = "Id CIN"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "cin"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index b33495eda..bc97ffac9 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -1220,21 +1220,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "iff svx 8svx 16sv ilbm ham ham6 ham8 anim anim3 anim5 anim7 anim8"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "audio/x-8svx: 8svx: IFF-8SVX Audio;" - "audio/8svx: 8svx: IFF-8SVX Audio;" - "audio/x-16sv: 16sv: IFF-16SV Audio;" - "audio/168sv: 16sv: IFF-16SV Audio;" - "image/x-ilbm: ilbm: IFF-ILBM Picture;" - "image/ilbm: ilbm: IFF-ILBM Picture;" - "video/x-anim: anim: IFF-ANIM Video;" - "video/anim: anim: IFF-ANIM Video;"; -} - static void *init_plugin (xine_t *xine, void *data) { demux_iff_class_t *this; @@ -1243,8 +1228,16 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("IFF demux plugin"); this->demux_class.identifier = "IFF"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = + "audio/x-8svx: 8svx: IFF-8SVX Audio;" + "audio/8svx: 8svx: IFF-8SVX Audio;" + "audio/x-16sv: 16sv: IFF-16SV Audio;" + "audio/168sv: 16sv: IFF-16SV Audio;" + "image/x-ilbm: ilbm: IFF-ILBM Picture;" + "image/ilbm: ilbm: IFF-ILBM Picture;" + "video/x-anim: anim: IFF-ANIM Video;" + "video/anim: anim: IFF-ANIM Video;"; + this->demux_class.extensions = "iff svx 8svx 16sv ilbm ham ham6 ham8 anim anim3 anim5 anim7 anim8"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index 64313cc5a..92e43d686 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -215,15 +215,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, /* * image demuxer class */ - -static const char *get_extensions (demux_class_t *this_gen) { - return "png gif jpg jpeg"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *init_class (xine_t *xine, void *data) { demux_image_class_t *this; @@ -232,8 +223,8 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("image demux plugin"); this->demux_class.identifier = "imagedmx"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "png gif jpg jpeg"; this->demux_class.dispose = default_demux_class_dispose; lprintf("class opened\n"); diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index 22656acca..690f12667 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -721,14 +721,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "mve mv8"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_ipmovie_init_plugin (xine_t *xine, void *data) { demux_ipmovie_class_t *this; @@ -737,8 +729,8 @@ void *demux_ipmovie_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Interplay MVE Movie demux plugin"); this->demux_class.identifier = "Interplay MVE"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "mve mv8"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index ffdc5aa37..1f790dbe4 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -2850,16 +2850,6 @@ error: /* * demux matroska class */ -static const char *get_extensions (demux_class_t *this_gen) { - return "mkv"; -} - - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "video/mkv: mkv: matroska;"; -} - - static void *init_class (xine_t *xine, void *data) { demux_matroska_class_t *this; @@ -2870,8 +2860,8 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("matroska demux plugin"); this->demux_class.identifier = "matroska"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = "video/mkv: mkv: matroska;"; + this->demux_class.extensions = "mkv"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index 439637c6c..974cf3b32 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -334,17 +334,6 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre return &this->demux_plugin; } -static const char *get_extensions(demux_class_t *this_gen){ - return "png mng"; -} - -static const char *get_mimetypes(demux_class_t *this_gen){ - return "image/png: png: PNG image;" - "image/x-png: png: PNG image;" - "video/mng: mng: MNG animation;" - "video/x-mng: mng: MNG animation;"; -} - static void *init_plugin(xine_t *xine, void *data){ demux_mng_class_t *this; @@ -353,8 +342,12 @@ static void *init_plugin(xine_t *xine, void *data){ this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Multiple-image Network Graphics demux plugin"); this->demux_class.identifier = "MNG"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = + "image/png: png: PNG image;" + "image/x-png: png: PNG image;" + "video/mng: mng: MNG animation;" + "video/x-mng: mng: MNG animation;"; + this->demux_class.extensions = "png mng"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index 680ed5094..59813bb90 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -352,14 +352,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "mod it stm s3m 669 amf med mdl xm"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *demux_mod_init_plugin (xine_t *xine, void *data) { demux_mod_class_t *this; @@ -368,8 +360,8 @@ static void *demux_mod_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("ModPlug Amiga MOD Music file demux plugin"); this->demux_class.identifier = "mod"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "mod it stm s3m 669 amf med mdl xm"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index 7c2918bb2..ec7cb0590 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.c @@ -366,14 +366,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "mpc mp+"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_mpc_init_plugin (xine_t *xine, void *data) { demux_mpc_class_t *this; @@ -382,8 +374,8 @@ void *demux_mpc_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Musepack demux plugin"); this->demux_class.identifier = "Musepack"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "mpc mp+"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 6e45b5b14..945a5c3ad 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -1215,15 +1215,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "mpg mpeg"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "video/mpeg: mpeg, mpg, mpe: MPEG animation;" - "video/x-mpeg: mpeg, mpg, mpe: MPEG animation;"; -} - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_class_t *this; @@ -1232,8 +1223,10 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("MPEG program stream demux plugin"); this->demux_class.identifier = "MPEG"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = + "video/mpeg: mpeg, mpg, mpe: MPEG animation;" + "video/x-mpeg: mpeg, mpg, mpe: MPEG animation;"; + this->demux_class.extensions = "mpg mpeg"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index e56cc000b..7367a8daa 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -1513,14 +1513,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "vob"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_block_class_t *this; @@ -1532,8 +1524,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("DVD/VOB demux plugin"); this->demux_class.identifier = "MPEG_BLOCK"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "vob"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 0b2b28312..acb57586f 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -1760,14 +1760,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "pes"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_pes_class_t *this; @@ -1778,8 +1770,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("mpeg pes demux plugin"); this->demux_class.identifier = "MPEG_PES"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "pes"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 6728c2129..3d6bd7892 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -1025,34 +1025,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str /* * demux mpegaudio class */ - -static const char *get_extensions (demux_class_t *this_gen) { - demux_mpgaudio_class_t *this = (demux_mpgaudio_class_t *) this_gen; - - if( _x_decoder_available(this->xine, BUF_AUDIO_MPEG) ) - return "mp3 mp2 mpa mpega"; - else - return ""; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - demux_mpgaudio_class_t *this = (demux_mpgaudio_class_t *) this_gen; - - if( _x_decoder_available(this->xine, BUF_AUDIO_MPEG) ) - return "audio/mpeg2: mp2: MPEG audio;" - "audio/x-mpeg2: mp2: MPEG audio;" - "audio/mpeg3: mp3: MPEG audio;" - "audio/x-mpeg3: mp3: MPEG audio;" - "audio/mpeg: mpa,abs,mpega: MPEG audio;" - "audio/x-mpeg: mpa,abs,mpega: MPEG audio;" - "audio/x-mpegurl: mp3: MPEG audio;" - "audio/mpegurl: mp3: MPEG audio;" - "audio/mp3: mp3: MPEG audio;" - "audio/x-mp3: mp3: MPEG audio;"; - else - return ""; -} - void *demux_mpgaudio_init_class (xine_t *xine, void *data) { demux_mpgaudio_class_t *this; @@ -1063,8 +1035,23 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("MPEG audio demux plugin"); this->demux_class.identifier = "MPEGAUDIO"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + if( _x_decoder_available(this->xine, BUF_AUDIO_MPEG) ) { + this->demux_class.mimetypes = + "audio/mpeg2: mp2: MPEG audio;" + "audio/x-mpeg2: mp2: MPEG audio;" + "audio/mpeg3: mp3: MPEG audio;" + "audio/x-mpeg3: mp3: MPEG audio;" + "audio/mpeg: mpa,abs,mpega: MPEG audio;" + "audio/x-mpeg: mpa,abs,mpega: MPEG audio;" + "audio/x-mpegurl: mp3: MPEG audio;" + "audio/mpegurl: mp3: MPEG audio;" + "audio/mp3: mp3: MPEG audio;" + "audio/x-mp3: mp3: MPEG audio;"; + this->demux_class.extensions = "mp3 mp2 mpa mpega"; + } else { + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = NULL; + } this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 5c4cb2603..331f9d3de 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -638,14 +638,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "nsv"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *demux_nsv_init_plugin (xine_t *xine, void *data) { demux_nsv_class_t *this; @@ -654,8 +646,8 @@ static void *demux_nsv_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Nullsoft Video demux plugin"); this->demux_class.identifier = "Nullsoft NSV"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "nsv"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c index e3f9d61cf..7d687f578 100644 --- a/src/demuxers/demux_playlist.c +++ b/src/demuxers/demux_playlist.c @@ -680,23 +680,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "m3u ram pls asx wax wvx smi smil qtl xspf rss"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "audio/mpegurl: m3u: M3U playlist;" - "audio/x-mpegurl: m3u: M3U playlist;" - //"audio/x-pn-realaudio: ram: RAM playlist;" - //"audio/vnd.rn-realaudio: ram: RAM playlist;" - "audio/x-scpls: pls: Winamp playlist;" - "audio/x-ms-wax: wax, asx: WAX playlist;" - "audio/x-ms-wvx: wvx, asx: WVX playlist;" - "application/smil: smi, smil: SMIL playlist;" - "application/x-quicktimeplayer: qtl: Quicktime playlist;" - "application/xspf+xml: xspf: XSPF playlist;"; -} - static void *init_plugin (xine_t *xine, void *data) { demux_playlist_class_t *this; @@ -705,8 +688,18 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Playlist demux plugin"); this->demux_class.identifier = "playlist"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = + "audio/mpegurl: m3u: M3U playlist;" + "audio/x-mpegurl: m3u: M3U playlist;" + //"audio/x-pn-realaudio: ram: RAM playlist;" + //"audio/vnd.rn-realaudio: ram: RAM playlist;" + "audio/x-scpls: pls: Winamp playlist;" + "audio/x-ms-wax: wax, asx: WAX playlist;" + "audio/x-ms-wvx: wvx, asx: WVX playlist;" + "application/smil: smi, smil: SMIL playlist;" + "application/x-quicktimeplayer: qtl: Quicktime playlist;" + "application/xspf+xml: xspf: XSPF playlist;"; + this->demux_class.extensions = "m3u ram pls asx wax wvx smi smil qtl xspf rss"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 225e60bf5..d4335e376 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -473,14 +473,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "pva"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *init_plugin (xine_t *xine, void *data) { demux_pva_class_t *this; @@ -489,8 +481,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("TechnoTrend PVA demux plugin"); this->demux_class.identifier = "TechnoTrend PVA"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "pva"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index f546476c3..d44bd46bd 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -3122,17 +3122,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "mov qt mp4 m4a m4b"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "video/quicktime: mov,qt: Quicktime animation;" - "video/x-quicktime: mov,qt: Quicktime animation;" - "audio/x-m4a: m4a,m4b: MPEG-4 audio;" - "application/x-quicktimeplayer: qtl: Quicktime list;"; -} - static void *init_plugin (xine_t *xine, void *data) { demux_qt_class_t *this; @@ -3144,8 +3133,12 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Apple Quicktime (MOV) and MPEG-4 demux plugin"); this->demux_class.identifier = "MOV/MPEG-4"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = + "video/quicktime: mov,qt: Quicktime animation;" + "video/x-quicktime: mov,qt: Quicktime animation;" + "audio/x-m4a: m4a,m4b: MPEG-4 audio;" + "application/x-quicktimeplayer: qtl: Quicktime list;"; + this->demux_class.extensions = "mov qt mp4 m4a m4b"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index 7358effe3..904ebcbea 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -405,14 +405,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "dv dif"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *init_plugin (xine_t *xine, void *data) { demux_raw_dv_class_t *this; @@ -421,8 +413,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Raw DV Video stream"); this->demux_class.identifier = "raw_dv"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "dv dif"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index c8098b8bf..f6bbb83d7 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -1613,17 +1613,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "rm rmvb ram"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "audio/x-pn-realaudio: ra, rm, ram: Real Media file;" - "audio/x-pn-realaudio-plugin: rpm: Real Media plugin file;" - "audio/x-real-audio: ra, rm, ram: Real Media file;" - "application/vnd.rn-realmedia: ra, rm, ram: Real Media file;"; -} - static void *init_class (xine_t *xine, void *data) { demux_real_class_t *this; @@ -1632,8 +1621,12 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("RealMedia file demux plugin"); this->demux_class.identifier = "Real"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = + "audio/x-pn-realaudio: ra, rm, ram: Real Media file;" + "audio/x-pn-realaudio-plugin: rpm: Real Media plugin file;" + "audio/x-real-audio: ra, rm, ram: Real Media file;" + "application/vnd.rn-realmedia: ra, rm, ram: Real Media file;"; + this->demux_class.extensions = "rm rmvb ram"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index 02145edce..283453aca 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -375,14 +375,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "ra"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "audio/x-realaudio: ra: RealAudio File;"; -} - void *demux_realaudio_init_plugin (xine_t *xine, void *data) { demux_ra_class_t *this; @@ -391,8 +383,8 @@ void *demux_realaudio_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("RealAudio file demux plugin"); this->demux_class.identifier = "RA"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = "audio/x-realaudio: ra: RealAudio File;"; + this->demux_class.extensions = "ra" this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 50ff61553..13c515f1c 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -455,14 +455,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "roq"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_roq_init_plugin (xine_t *xine, void *data) { demux_roq_class_t *this; @@ -471,8 +463,8 @@ void *demux_roq_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Id RoQ file demux plugin"); this->demux_class.identifier = "RoQ"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "roq"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c index e16a58604..09a4a1c52 100644 --- a/src/demuxers/demux_shn.c +++ b/src/demuxers/demux_shn.c @@ -222,14 +222,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "shn"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_shn_init_plugin (xine_t *xine, void *data) { demux_shn_class_t *this; @@ -238,8 +230,8 @@ void *demux_shn_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Shorten demux plugin"); this->demux_class.identifier = "Shorten"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "shn"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index 942833d7a..14955166b 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -389,14 +389,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return ""; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *init_plugin (xine_t *xine, void *data) { demux_slave_class_t *this; @@ -405,8 +397,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = ""; this->demux_class.identifier = "slave"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = NULL; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index 0c9094ac1..6c69d5b2a 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -443,14 +443,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "mjpg"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_smjpeg_init_plugin (xine_t *xine, void *data) { demux_smjpeg_class_t *this; @@ -459,8 +451,8 @@ void *demux_smjpeg_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("SMJPEG file demux plugin"); this->demux_class.identifier = "SMJPEG"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "mjpg"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index 42c192d78..2b740fbb0 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -361,17 +361,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "snd au"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "audio/basic: snd,au: ULAW (Sun) audio;" - "audio/x-basic: snd,au: ULAW (Sun) audio;" - "audio/x-pn-au: snd,au: ULAW (Sun) audio;"; - -} - void *demux_snd_init_plugin (xine_t *xine, void *data) { demux_snd_class_t *this; @@ -380,8 +369,11 @@ void *demux_snd_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("SND/AU file demux plugin"); this->demux_class.identifier = "SND/AU"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = + "audio/basic: snd,au: ULAW (Sun) audio;" + "audio/x-basic: snd,au: ULAW (Sun) audio;" + "audio/x-pn-au: snd,au: ULAW (Sun) audio;"; + this->demux_class.extensions = "snd au"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index 6ce23325d..2e9816cdf 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -598,15 +598,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - /* also .mov, but we don't want to hijack that extension */ - return "str iki ik2 dps dat xa xa1 xa2 xas xap"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_str_init_plugin (xine_t *xine, void *data) { demux_str_class_t *this; @@ -615,8 +606,8 @@ void *demux_str_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Sony Playstation STR file demux plugin"); this->demux_class.identifier = "PSX STR"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "str iki ik2 dps dat xa xa1 xa2 xas xap"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 12504c81b..d0c0e33be 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -2262,15 +2262,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, /* * ts demuxer class */ - -static const char *get_extensions (demux_class_t *this_gen) { - return "ts m2t trp"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *init_class (xine_t *xine, void *data) { demux_ts_class_t *this; @@ -2282,8 +2273,8 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("MPEG Transport Stream demuxer"); this->demux_class.identifier = "MPEG_TS"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "ts m2t trp"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index a150bc533..d0631abb2 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.c @@ -275,14 +275,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "tta"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_tta_init_plugin (xine_t *xine, void *data) { demux_tta_class_t *this; @@ -291,8 +283,8 @@ void *demux_tta_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("True Audio demux plugin"); this->demux_class.identifier = "True Audio"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "tta"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c index 65a41d0d3..e6063d619 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.c @@ -464,14 +464,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "vmd"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_vmd_init_plugin (xine_t *xine, void *data) { demux_vmd_class_t *this; @@ -480,8 +472,8 @@ void *demux_vmd_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Sierra VMD file demux plugin"); this->demux_class.identifier = "VMD"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "vmd"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index 99c5a5cc5..b3f2cfd56 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -339,14 +339,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "voc"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_voc_init_plugin (xine_t *xine, void *data) { demux_voc_class_t *this; @@ -355,8 +347,8 @@ void *demux_voc_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("VOC file demux plugin"); this->demux_class.identifier = "VOC"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "voc"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index 8d5f9e174..e65e55175 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -216,14 +216,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "vox"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_vox_init_plugin (xine_t *xine, void *data) { demux_vox_class_t *this; @@ -232,8 +224,8 @@ void *demux_vox_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Dialogic VOX file demux plugin"); this->demux_class.identifier = "VOX"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "vox"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index e3d78f88d..9983f2302 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -377,14 +377,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "vqa"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_vqa_init_plugin (xine_t *xine, void *data) { demux_vqa_class_t *this; @@ -393,8 +385,8 @@ void *demux_vqa_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Westwood Studios VQA file demux plugin"); this->demux_class.identifier = "VQA"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "vqa"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index f0480d1bc..ee62cfc20 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -391,17 +391,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "wav"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return "audio/x-wav: wav: WAV audio;" - "audio/wav: wav: WAV audio;" - "audio/x-pn-wav: wav: WAV audio;" - "audio/x-pn-windows-acm: wav: WAV audio;"; -} - void *demux_wav_init_plugin (xine_t *xine, void *data) { demux_wav_class_t *this; @@ -410,8 +399,12 @@ void *demux_wav_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("WAV file demux plugin"); this->demux_class.identifier = "WAV"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = + "audio/x-wav: wav: WAV audio;" + "audio/wav: wav: WAV audio;" + "audio/x-pn-wav: wav: WAV audio;" + "audio/x-pn-windows-acm: wav: WAV audio;"; + this->demux_class.extensions = "wav"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index 3d108937a..da42bac3e 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -714,14 +714,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "mve"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - void *demux_wc3movie_init_plugin (xine_t *xine, void *data) { demux_mve_class_t *this; @@ -730,8 +722,8 @@ void *demux_wc3movie_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("Wing Commander III Movie (MVE) demux plugin"); this->demux_class.identifier = "WC3 Movie"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "mve"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 0375de88c..222bff3b4 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -446,14 +446,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return &this->demux_plugin; } -static const char *get_extensions (demux_class_t *this_gen) { - return "y4m"; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *init_plugin (xine_t *xine, void *data) { demux_yuv4mpeg2_class_t *this; @@ -462,8 +454,8 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("YUV4MPEG2 file demux plugin"); this->demux_class.identifier = "YUV4MPEG2"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "y4m"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 17a4feb31..93f0e80d1 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -221,15 +221,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, /* * demuxer class */ - -static const char *get_extensions (demux_class_t *this_gen) { - return NULL; -} - -static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; -} - static void *init_class (xine_t *xine, void *data) { demux_yuv_frames_class_t *this; @@ -238,8 +229,8 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("YUV frames dummy demux plugin"); this->demux_class.identifier = "YUV_FRAMES"; - this->demux_class.get_mimetypes = get_mimetypes; - this->demux_class.get_extensions = get_extensions; + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = NULL; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index 5f8ea103d..0c9124786 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.c @@ -1448,17 +1448,6 @@ static demux_plugin_t *open_demux_plugin (demux_class_t *class_gen, xine_stream_ return NULL; } -static const char *get_demux_extensions (demux_class_t *this_gen) { - return "asc txt sub srt smi ssa"; -} - -static const char *get_demux_mimetypes (demux_class_t *this_gen) { - return NULL; - - /* do not report this mimetype, it might confuse browsers. */ - /* "text/plain: asc txt sub srt: VIDEO subtitles;" */ -} - static void config_timeout_cb(void *this_gen, xine_cfg_entry_t *entry) { demux_sputext_class_t *this = (demux_sputext_class_t *)this_gen; @@ -1476,8 +1465,10 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_demux_plugin; this->demux_class.description = N_("sputext demuxer plugin"); this->demux_class.identifier = "sputext"; - this->demux_class.get_mimetypes = get_demux_mimetypes; - this->demux_class.get_extensions = get_demux_extensions; + /* do not report this mimetype, it might confuse browsers. */ + /* "text/plain: asc txt sub srt: VIDEO subtitles;" */ + this->demux_class.mimetypes = NULL; + this->demux_class.extensions = "asc txt sub srt smi ssa"; this->demux_class.dispose = default_demux_class_dispose; /* -- cgit v1.2.3 From 161cc6fe26901b63fc04a85432018b2aaad371f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 19:13:09 +0100 Subject: Update the plugins loader to use the new extensions and mimetypes attributes. --- src/xine-engine/load_plugins.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 3e6708e65..717f81786 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -2429,6 +2429,7 @@ char *xine_get_file_extensions (xine_t *self) { plugin_node_t *node; char *str; int list_id, list_size; + const char *exts; pthread_mutex_lock (&catalog->lock); @@ -2438,14 +2439,13 @@ char *xine_get_file_extensions (xine_t *self) { list_size = xine_sarray_size (catalog->plugin_lists[PLUGIN_DEMUX - 1]); for (list_id = 0; list_id < list_size; list_id++) { demux_class_t *cls; - const char *exts; node = xine_sarray_get (catalog->plugin_lists[PLUGIN_DEMUX - 1], list_id); if (node->plugin_class || _load_plugin_class(self, node, NULL)) { cls = (demux_class_t *)node->plugin_class; - if((exts = cls->get_extensions(cls)) && *exts) + if( (exts = cls->extensions) && *exts ) len += strlen(exts) + 1; } } @@ -2457,7 +2457,6 @@ char *xine_get_file_extensions (xine_t *self) { list_size = xine_sarray_size (catalog->plugin_lists[PLUGIN_DEMUX - 1]); for (list_id = 0; list_id < list_size; list_id++) { demux_class_t *cls; - const char *e; int l; node = xine_sarray_get (catalog->plugin_lists[PLUGIN_DEMUX - 1], list_id); @@ -2465,9 +2464,9 @@ char *xine_get_file_extensions (xine_t *self) { cls = (demux_class_t *)node->plugin_class; - if((e = cls->get_extensions (cls)) && *e) { - l = strlen(e); - memcpy (&str[pos], e, l); + if((exts = cls->extensions) && *exts) { + l = strlen(exts); + memcpy (&str[pos], exts, l); pos += l; @@ -2507,16 +2506,14 @@ char *xine_get_mime_types (xine_t *self) { for (list_id = 0; list_id < list_size; list_id++) { demux_class_t *cls; - const char *s; node = xine_sarray_get (catalog->plugin_lists[PLUGIN_DEMUX - 1], list_id); if (node->plugin_class || _load_plugin_class(self, node, NULL)) { cls = (demux_class_t *)node->plugin_class; - s = cls->get_mimetypes (cls); - if (s) - len += strlen(s); + if ( cls->mimetypes ); + len += strlen(cls->mimetypes); } } @@ -2529,18 +2526,15 @@ char *xine_get_mime_types (xine_t *self) { for (list_id = 0; list_id < list_size; list_id++) { demux_class_t *cls; - const char *s; - int l; node = xine_sarray_get (catalog->plugin_lists[PLUGIN_DEMUX - 1], list_id); if (node->plugin_class || _load_plugin_class(self, node, NULL)) { cls = (demux_class_t *)node->plugin_class; - s = cls->get_mimetypes (cls); - if (s) { - l = strlen(s); - memcpy (&str[pos], s, l); + if (cls->mimetypes) { + const size_t l = strlen(cls->mimetypes); + memcpy (&str[pos], cls->mimetypes, l); pos += l; } @@ -2586,9 +2580,8 @@ char *xine_get_demux_for_mime_type (xine_t *self, const char *mime_type) { cls = (demux_class_t *)node->plugin_class; - mt = cls->get_mimetypes (cls); - if (mt) { - mime_demux = strdup(mt); + if (cls->mimetypes) { + mime_demux = strdup(cls->mimetypes); for(s=mime_demux; *s; s++) *s = tolower(*s); -- cgit v1.2.3 From 68fa754870eac5150ae6e96a1a5e18c1f07f63dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 19:21:21 +0100 Subject: Check if the extension is compatible with the plugin before trying to open it. --- src/xine-engine/load_plugins.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 717f81786..0a885f2d9 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -1298,6 +1298,12 @@ static demux_plugin_t *probe_demux (xine_stream_t *stream, int method1, int meth xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "load_plugins: probing demux '%s'\n", node->info->id); if (node->plugin_class || _load_plugin_class(stream->xine, node, NULL)) { + if ( stream->content_detection_method == METHOD_BY_EXTENSION && + ! _x_demux_check_extension(input->get_mrl(input), + ((demux_class_t *)node->plugin_class)->extensions) + ) + continue; + if ((plugin = ((demux_class_t *)node->plugin_class)->open_plugin(node->plugin_class, stream, input))) { inc_node_ref(node); plugin->node = node; @@ -1357,6 +1363,13 @@ demux_plugin_t *_x_find_demux_plugin_by_name(xine_stream_t *stream, const char * if (strcasecmp(node->info->id, name) == 0) { if (node->plugin_class || _load_plugin_class(stream->xine, node, NULL)) { + + if ( stream->content_detection_method == METHOD_BY_EXTENSION && + ! _x_demux_check_extension(input->get_mrl(input), + ((demux_class_t *)node->plugin_class)->extensions) + ) + continue; + if ((plugin = ((demux_class_t *)node->plugin_class)->open_plugin(node->plugin_class, stream, input))) { inc_node_ref(node); plugin->node = node; @@ -1414,6 +1427,14 @@ demux_plugin_t *_x_find_demux_plugin_last_probe(xine_stream_t *stream, const cha xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "load_plugin: probing '%s' (method %d)...\n", node->info->id, stream->content_detection_method ); if (node->plugin_class || _load_plugin_class(xine, node, NULL)) { + + if ( stream->content_detection_method == METHOD_BY_EXTENSION && + ! _x_demux_check_extension(input->get_mrl(input), + ((demux_class_t *)node->plugin_class)->extensions) + ) + continue; + + if ((plugin = ((demux_class_t *)node->plugin_class)->open_plugin(node->plugin_class, stream, input))) { xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "load_plugins: using demuxer '%s' (instead of '%s')\n", node->info->id, last_demux_name); -- cgit v1.2.3 From ef8cf26197068261acd3ff8dc37f664fe979d337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 19:21:46 +0100 Subject: Remove stray variable. --- src/xine-engine/load_plugins.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 0a885f2d9..4103df507 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -2581,7 +2581,6 @@ char *xine_get_demux_for_mime_type (xine_t *self, const char *mime_type) { char *id = NULL; char *mime_arg, *mime_demux; char *s; - const char *mt; int list_id, list_size; /* create a copy and convert to lower case */ -- cgit v1.2.3 From c818bc04294ababd55f33c52ed4ac3f6e1b4ca3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 19:23:11 +0100 Subject: Let _x_demux_check_extension() consider empty extensions string as an always-pass. --- src/xine-engine/demux.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index f33397256..379d552bf 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -449,6 +449,10 @@ int _x_demux_read_header( input_plugin_t *input, unsigned char *buffer, off_t si int _x_demux_check_extension (const char *mrl, const char *extensions){ char *last_dot, *e, *ext_copy, *ext_work; + /* An empty extensions string means that the by-extension method can't + be used, so consider those cases as always passing. */ + if ( extensions == NULL ) return 1; + ext_copy = strdup(extensions); ext_work = ext_copy; -- cgit v1.2.3 From 431e07e0b69bd75ff85ba0c2e1b1e08313e746be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 20:07:25 +0100 Subject: Remove redundant METHOD_BY_EXTENSION checks now that libxine takes care of them. --- src/combined/flac_demuxer.c | 15 +-------------- src/combined/nsf_demuxer.c | 14 +------------- src/combined/wavpack_demuxer.c | 12 +----------- src/combined/xine_ogg_demuxer.c | 26 ++------------------------ src/demuxers/demux_4xm.c | 14 +------------- src/demuxers/demux_aac.c | 14 +------------- src/demuxers/demux_ac3.c | 14 +------------- src/demuxers/demux_aiff.c | 14 +------------- src/demuxers/demux_asf.c | 18 +----------------- src/demuxers/demux_aud.c | 14 +------------- src/demuxers/demux_avi.c | 12 +----------- src/demuxers/demux_dts.c | 16 ++-------------- src/demuxers/demux_eawve.c | 14 +------------- src/demuxers/demux_elem.c | 10 +--------- src/demuxers/demux_film.c | 14 +------------- src/demuxers/demux_flac.c | 14 +------------- src/demuxers/demux_fli.c | 14 +------------- src/demuxers/demux_flv.c | 6 ------ src/demuxers/demux_idcin.c | 14 +------------- src/demuxers/demux_iff.c | 14 +------------- src/demuxers/demux_image.c | 13 +------------ src/demuxers/demux_ipmovie.c | 14 +------------- src/demuxers/demux_matroska.c | 13 +------------ src/demuxers/demux_mng.c | 12 +----------- src/demuxers/demux_mod.c | 16 +--------------- src/demuxers/demux_mpc.c | 14 +------------- src/demuxers/demux_mpeg.c | 14 +------------- src/demuxers/demux_mpeg_pes.c | 21 ++------------------- src/demuxers/demux_mpgaudio.c | 13 +------------ src/demuxers/demux_nsv.c | 14 +------------- src/demuxers/demux_pva.c | 14 +------------- src/demuxers/demux_qt.c | 19 +------------------ src/demuxers/demux_rawdv.c | 14 +------------- src/demuxers/demux_real.c | 17 +---------------- src/demuxers/demux_realaudio.c | 16 ++-------------- src/demuxers/demux_roq.c | 14 +------------- src/demuxers/demux_shn.c | 14 +------------- src/demuxers/demux_smjpeg.c | 14 +------------- src/demuxers/demux_snd.c | 14 +------------- src/demuxers/demux_str.c | 14 +------------- src/demuxers/demux_ts.c | 4 +--- src/demuxers/demux_tta.c | 14 +------------- src/demuxers/demux_vmd.c | 14 +------------- src/demuxers/demux_voc.c | 14 +------------- src/demuxers/demux_vox.c | 13 +++++++------ src/demuxers/demux_vqa.c | 14 +------------- src/demuxers/demux_wav.c | 14 +------------- src/demuxers/demux_wc3movie.c | 14 +------------- src/demuxers/demux_yuv4mpeg2.c | 14 +------------- 49 files changed, 58 insertions(+), 634 deletions(-) diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c index 2afdef1ce..a8a01f7d4 100644 --- a/src/combined/flac_demuxer.c +++ b/src/combined/flac_demuxer.c @@ -580,20 +580,7 @@ open_plugin (demux_class_t *class_gen, return NULL; } break; - case METHOD_BY_EXTENSION: { - char *ending, *mrl; - - mrl = input->get_mrl (input); - - ending = strrchr (mrl, '.'); - - if (!ending || (strlen (ending) < 5)) - return NULL; - - if (strncasecmp (ending, ".flac", 5)) - return NULL; - } - break; + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: break; default: diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c index adf97a43d..898d00f3e 100644 --- a/src/combined/nsf_demuxer.c +++ b/src/combined/nsf_demuxer.c @@ -318,19 +318,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c index a8c0b4160..850a58be7 100644 --- a/src/combined/wavpack_demuxer.c +++ b/src/combined/wavpack_demuxer.c @@ -349,17 +349,7 @@ static demux_plugin_t *open_plugin (demux_class_t *const class_gen, this->status = DEMUX_FINISHED; switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *const mrl = input->get_mrl (input); - const char *const extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* Falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 393700510..f5df0401d 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -1943,18 +1943,7 @@ static int detect_ogg_content (int detection_method, demux_class_t *class_gen, return 0; } - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (_x_demux_check_extension (mrl, extensions)) - return 1; - else - return 0; - } - + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: return 1; @@ -2005,18 +1994,7 @@ static int detect_anx_content (int detection_method, demux_class_t *class_gen, #undef ANNODEX_SIGNATURE_SEARCH - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (_x_demux_check_extension (mrl, extensions)) - return 1; - else - return 0; - } - + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: return 1; diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 8f43cfcf5..d5cb64bfb 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -484,19 +484,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index b16ab8f02..8fcfd2489 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -273,19 +273,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->status = DEMUX_FINISHED; switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* Falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: if (!open_aac_file(this)) { diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 23a96b3fa..40aa2c763 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -429,19 +429,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 812c293f0..d2ca1da90 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -349,19 +349,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 42dfeb016..5321aaf92 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -2031,23 +2031,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, break; - case METHOD_BY_EXTENSION: { - const char *const mrl = input->get_mrl (input); - const char *const ending = strrchr (mrl, '.'); - - if (!ending) - return NULL; - - if (strncasecmp(ending, ".asf", 4) && - strncasecmp(ending, ".wmv", 4) && - strncasecmp(ending, ".wma", 4) ) { - return NULL; - } - - lprintf ("extension accepted.\n"); - } - break; - + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 53b07722c..a99d0c325 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -284,19 +284,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { case METHOD_BY_CONTENT: /* no reliable detection */ - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: if (!open_aud_file(this)) { diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 49cf6c75a..466ffc290 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -2253,17 +2253,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) - return NULL; - } - /* we want to fall through here */ - + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index 30a69d145..060ae4c86 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -358,19 +358,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: if (!open_dts_file(this)) { @@ -396,7 +384,7 @@ void *demux_dts_init_plugin (xine_t *xine, void *data) { this->demux_class.description = N_("Raw DTS demux plugin"); this->demux_class.identifier = "DTS"; this->demux_class.mimetypes = NULL; - this->demux_class.extensions = "dts" + this->demux_class.extensions = "dts"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index cbae63153..7d684ec66 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -363,19 +363,7 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 0642edf0e..94b70cdc6 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -217,15 +217,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) - return NULL; - } + case METHOD_BY_EXTENSION: break; case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 94d3c9194..0a5007188 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -868,19 +868,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c index a82d80fae..436f048db 100644 --- a/src/demuxers/demux_flac.c +++ b/src/demuxers/demux_flac.c @@ -493,19 +493,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index 2ff8f3309..b37145145 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -316,19 +316,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index f78743579..b2169beba 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -855,12 +855,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { case METHOD_BY_EXTENSION: - if (!_x_demux_check_extension(input->get_mrl(input), "flv")) { - free (this); - return NULL; - } - - /* falling through is intended */ case METHOD_BY_CONTENT: case METHOD_EXPLICIT: if (!open_flv_file(this)) { diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index d17f558ab..61f674ccf 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -486,19 +486,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index bc97ffac9..7146f7f28 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -1189,19 +1189,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index 92e43d686..58cab54fe 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -167,18 +167,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, } break; - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - return NULL; - } - } - break; - + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index 690f12667..3f0f4b133 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -690,19 +690,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 1f790dbe4..2d231b66b 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -2788,18 +2788,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: { - const char *const mrl = input->get_mrl(input); - const char *const extensions = class_gen->get_extensions (class_gen);; - - lprintf ("stage by extension %s\n", mrl); - - if (!_x_demux_check_extension (mrl, extensions)) - return NULL; - - } - break; - + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index 974cf3b32..b59160640 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -285,17 +285,7 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre } break; - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl(input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } + case METHOD_BY_EXTENSION: break; default: diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index 59813bb90..df48cc564 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -323,21 +323,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { case METHOD_EXPLICIT: - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - if (!open_mod_file(this)) { - free (this); - return NULL; - } - } + case METHOD_BY_EXTENSION: break; case METHOD_BY_CONTENT: diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index ec7cb0590..f1a2c600c 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.c @@ -335,19 +335,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->status = DEMUX_FINISHED; switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* Falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 945a5c3ad..2d0878589 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -1191,19 +1191,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return NULL; } - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - break; - + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index acb57586f..72a052a20 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -1726,25 +1726,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: { - const char *const mrl = input->get_mrl (input); - const char *const ending = strrchr(mrl, '.'); - - if (!ending) { - free (this->scratch_base); - free (this); - return NULL; - } - - if (strncasecmp(ending, ".MPEG", 5) - && strncasecmp (ending, ".vdr", 4) - && strncasecmp (ending, ".mpg", 4)) { - free (this->scratch_base); - free (this); - return NULL; - } - } - break; + case METHOD_BY_EXTENSION: + break; case METHOD_EXPLICIT: { diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 3d6bd7892..058dc130b 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -983,18 +983,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: { - const char *const mrl = input->get_mrl(input); - const char *const extensions = class_gen->get_extensions (class_gen); - - lprintf ("stage by extension %s\n", mrl); - - if (!_x_demux_check_extension (mrl, extensions)) - return NULL; - - } - break; - + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 331f9d3de..cc4c89fe9 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -607,19 +607,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index d4335e376..16588d062 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -443,19 +443,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index d44bd46bd..bc0e249c8 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -3076,24 +3076,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str break; - case METHOD_BY_EXTENSION: { - const char *const mrl = input->get_mrl (input); - const char *const ending = strrchr(mrl, '.'); - - if (!ending) { - free (this); - return NULL; - } - - if (strncasecmp (ending, ".mov", 4) && - strncasecmp (ending, ".qt", 3) && - strncasecmp (ending, ".mp4", 4)) { - free (this); - return NULL; - } - } - - /* we want to fall through here */ + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: { if (!is_qt_file(this->input)) { diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index 904ebcbea..31c9a4981 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -376,19 +376,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - break; - + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index f6bbb83d7..3c148f7b7 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -1559,22 +1559,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str lprintf ("by content accepted.\n"); break; - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - lprintf ("by extension '%s'\n", mrl); - - if (!_x_demux_check_extension (mrl, extensions)) { - return NULL; - } - lprintf ("by extension accepted.\n"); - } - - break; - + case METHOD_BY_EXTENSION: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index 283453aca..e7713c16c 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -344,19 +344,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: @@ -384,7 +372,7 @@ void *demux_realaudio_init_plugin (xine_t *xine, void *data) { this->demux_class.description = N_("RealAudio file demux plugin"); this->demux_class.identifier = "RA"; this->demux_class.mimetypes = "audio/x-realaudio: ra: RealAudio File;"; - this->demux_class.extensions = "ra" + this->demux_class.extensions = "ra"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 13c515f1c..7d883f4e2 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -424,19 +424,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c index 09a4a1c52..79bfcab54 100644 --- a/src/demuxers/demux_shn.c +++ b/src/demuxers/demux_shn.c @@ -193,19 +193,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->status = DEMUX_FINISHED; switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* Falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: if (!open_shn_file(this)) { diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index 6c69d5b2a..96af0c26c 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -412,19 +412,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index 2b740fbb0..6459a2e19 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -330,19 +330,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index 2e9816cdf..56bfad093 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -568,19 +568,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index d0c0e33be..cb14ebf6f 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -2166,9 +2166,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, const char *const mrl = input->get_mrl (input); /* check extension */ - const char *const extensions = class_gen->get_extensions (class_gen); - - if (_x_demux_check_extension (mrl, extensions)) + if (_x_demux_check_extension (mrl, class_gen->extensions)) break; /* accept dvb streams */ diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index d0631abb2..179fbc1c6 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.c @@ -246,19 +246,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* Falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: if (!open_tta_file(this)) { diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c index e6063d619..865eeb569 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.c @@ -433,19 +433,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index b3f2cfd56..1c15b893f 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -308,19 +308,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index e65e55175..ade0f9b52 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -181,17 +181,18 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { case METHOD_BY_CONTENT: - case METHOD_EXPLICIT: - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; + case METHOD_EXPLICIT: { + const char *mrl; mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - if (!_x_demux_check_extension (mrl, extensions)) + if (!_x_demux_check_extension (mrl, class_gen->extensions)) return NULL; } - break; + break; + + case METHOD_BY_EXTENSION: + break; default: return NULL; diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index 9983f2302..64fd170db 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -346,19 +346,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index ee62cfc20..77a2d3888 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -351,19 +351,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index da42bac3e..13ba1de5c 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -683,19 +683,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 222bff3b4..3469fdaff 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -415,19 +415,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { - const char *extensions, *mrl; - - mrl = input->get_mrl (input); - extensions = class_gen->get_extensions (class_gen); - - if (!_x_demux_check_extension (mrl, extensions)) { - free (this); - return NULL; - } - } - /* falling through is intended */ - + case METHOD_BY_EXTENSION: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: -- cgit v1.2.3 From f77028285a231edada74b0d93e4198fa8179880e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 20:09:04 +0100 Subject: Rename METHOD_BY_EXTENSION to METHOD_BY_MRL, as it's used to identify protocols too. --- src/combined/flac_demuxer.c | 2 +- src/combined/nsf_demuxer.c | 2 +- src/combined/wavpack_demuxer.c | 2 +- src/combined/xine_ogg_demuxer.c | 4 ++-- src/demuxers/demux.h | 2 +- src/demuxers/demux_4xm.c | 2 +- src/demuxers/demux_aac.c | 2 +- src/demuxers/demux_ac3.c | 2 +- src/demuxers/demux_aiff.c | 2 +- src/demuxers/demux_asf.c | 2 +- src/demuxers/demux_aud.c | 2 +- src/demuxers/demux_avi.c | 2 +- src/demuxers/demux_cdda.c | 2 +- src/demuxers/demux_dts.c | 2 +- src/demuxers/demux_eawve.c | 2 +- src/demuxers/demux_elem.c | 2 +- src/demuxers/demux_film.c | 2 +- src/demuxers/demux_flac.c | 2 +- src/demuxers/demux_fli.c | 2 +- src/demuxers/demux_flv.c | 2 +- src/demuxers/demux_idcin.c | 2 +- src/demuxers/demux_iff.c | 2 +- src/demuxers/demux_image.c | 2 +- src/demuxers/demux_ipmovie.c | 2 +- src/demuxers/demux_matroska.c | 2 +- src/demuxers/demux_mng.c | 2 +- src/demuxers/demux_mod.c | 2 +- src/demuxers/demux_mpc.c | 2 +- src/demuxers/demux_mpeg.c | 2 +- src/demuxers/demux_mpeg_block.c | 2 +- src/demuxers/demux_mpeg_pes.c | 2 +- src/demuxers/demux_mpgaudio.c | 2 +- src/demuxers/demux_nsv.c | 2 +- src/demuxers/demux_playlist.c | 2 +- src/demuxers/demux_pva.c | 2 +- src/demuxers/demux_qt.c | 2 +- src/demuxers/demux_rawdv.c | 2 +- src/demuxers/demux_real.c | 2 +- src/demuxers/demux_realaudio.c | 2 +- src/demuxers/demux_roq.c | 2 +- src/demuxers/demux_shn.c | 2 +- src/demuxers/demux_slave.c | 2 +- src/demuxers/demux_smjpeg.c | 2 +- src/demuxers/demux_snd.c | 2 +- src/demuxers/demux_str.c | 2 +- src/demuxers/demux_ts.c | 2 +- src/demuxers/demux_tta.c | 2 +- src/demuxers/demux_vmd.c | 2 +- src/demuxers/demux_voc.c | 2 +- src/demuxers/demux_vox.c | 2 +- src/demuxers/demux_vqa.c | 2 +- src/demuxers/demux_wav.c | 2 +- src/demuxers/demux_wc3movie.c | 2 +- src/demuxers/demux_yuv4mpeg2.c | 2 +- src/demuxers/demux_yuv_frames.c | 2 +- src/libsputext/demux_sputext.c | 2 +- src/xine-engine/load_plugins.c | 14 +++++++------- 57 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c index a8a01f7d4..bee98d2a3 100644 --- a/src/combined/flac_demuxer.c +++ b/src/combined/flac_demuxer.c @@ -580,7 +580,7 @@ open_plugin (demux_class_t *class_gen, return NULL; } break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: break; default: diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c index 898d00f3e..cce7c8983 100644 --- a/src/combined/nsf_demuxer.c +++ b/src/combined/nsf_demuxer.c @@ -318,7 +318,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c index 850a58be7..ac5c66a8d 100644 --- a/src/combined/wavpack_demuxer.c +++ b/src/combined/wavpack_demuxer.c @@ -349,7 +349,7 @@ static demux_plugin_t *open_plugin (demux_class_t *const class_gen, this->status = DEMUX_FINISHED; switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index f5df0401d..70cfc5846 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -1943,7 +1943,7 @@ static int detect_ogg_content (int detection_method, demux_class_t *class_gen, return 0; } - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: return 1; @@ -1994,7 +1994,7 @@ static int detect_anx_content (int detection_method, demux_class_t *class_gen, #undef ANNODEX_SIGNATURE_SEARCH - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: return 1; diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index b666ee2cc..ee5ca42f0 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -40,7 +40,7 @@ #define DEMUX_CAN_HANDLE 1 #define METHOD_BY_CONTENT 1 -#define METHOD_BY_EXTENSION 2 +#define METHOD_BY_MRL 2 #define METHOD_EXPLICIT 3 typedef struct demux_class_s demux_class_t ; diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index d5cb64bfb..5ad5d5938 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -484,7 +484,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index 8fcfd2489..d329cc087 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -273,7 +273,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->status = DEMUX_FINISHED; switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: if (!open_aac_file(this)) { diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 40aa2c763..e48416803 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -429,7 +429,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index d2ca1da90..f873f5d4f 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -349,7 +349,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 5321aaf92..b9d38ebb3 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -2031,7 +2031,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index a99d0c325..2aa83d162 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -284,7 +284,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { case METHOD_BY_CONTENT: /* no reliable detection */ - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: if (!open_aud_file(this)) { diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 466ffc290..d2e0c0412 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -2253,7 +2253,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index f11523239..3a6c7cba7 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -200,7 +200,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { case METHOD_BY_CONTENT: - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: if (strncasecmp (input->get_mrl (input), "cdda:", 5)) { free (this); return NULL; diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index 060ae4c86..be552653f 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -358,7 +358,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: if (!open_dts_file(this)) { diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index 7d684ec66..b0d10dc1c 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -363,7 +363,7 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 94b70cdc6..a40d3053e 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -217,7 +217,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: break; case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 0a5007188..b22dc4b0f 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -868,7 +868,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c index 436f048db..a7a7c5009 100644 --- a/src/demuxers/demux_flac.c +++ b/src/demuxers/demux_flac.c @@ -493,7 +493,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index b37145145..2da3019b2 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -316,7 +316,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index b2169beba..99c861e0d 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -854,7 +854,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->status = DEMUX_FINISHED; switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: if (!open_flv_file(this)) { diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index 61f674ccf..39b38c81d 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -486,7 +486,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index 7146f7f28..9e91684d5 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -1189,7 +1189,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index 58cab54fe..4731acfe4 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -167,7 +167,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, } break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index 3f0f4b133..46c4689ad 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -690,7 +690,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 2d231b66b..e70426d0c 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -2788,7 +2788,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index b59160640..f7af7ec42 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -285,7 +285,7 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre } break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: break; default: diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index df48cc564..54dacdc8e 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -323,7 +323,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { case METHOD_EXPLICIT: - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: break; case METHOD_BY_CONTENT: diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index f1a2c600c..60750b550 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.c @@ -335,7 +335,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->status = DEMUX_FINISHED; switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 2d0878589..0a97b27bc 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -1191,7 +1191,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return NULL; } - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 7367a8daa..2f7c48d44 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -1452,7 +1452,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: { + case METHOD_BY_MRL: { char *ending; const char *const mrl = input->get_mrl (input); diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 72a052a20..1ec5b8365 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -1726,7 +1726,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: break; case METHOD_EXPLICIT: { diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 058dc130b..9b8033c7c 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -983,7 +983,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index cc4c89fe9..d5ffed5f8 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -607,7 +607,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c index 7d687f578..c6df006fe 100644 --- a/src/demuxers/demux_playlist.c +++ b/src/demuxers/demux_playlist.c @@ -651,7 +651,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, this->demux_plugin.demux_class = class_gen; switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: lprintf ("detect by extension\n"); this->playlist = detect_by_extension (input); if (!this->playlist) { diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 16588d062..2f85387b2 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -443,7 +443,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index bc0e249c8..3f23ddce2 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -3076,7 +3076,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: { if (!is_qt_file(this->input)) { diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index 31c9a4981..0ae52b6bf 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -376,7 +376,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 3c148f7b7..761296ac4 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -1559,7 +1559,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str lprintf ("by content accepted.\n"); break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_EXPLICIT: break; diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index e7713c16c..0ce399e11 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -344,7 +344,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 7d883f4e2..95f81de9a 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -424,7 +424,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c index 79bfcab54..445661b8f 100644 --- a/src/demuxers/demux_shn.c +++ b/src/demuxers/demux_shn.c @@ -193,7 +193,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->status = DEMUX_FINISHED; switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: if (!open_shn_file(this)) { diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index 14955166b..d7a17546f 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -335,7 +335,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: { + case METHOD_BY_MRL: { const char *const mrl = input->get_mrl (input); if(!strncmp(mrl, "slave://", 8)) diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index 96af0c26c..d24459f5b 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -412,7 +412,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index 6459a2e19..728caf170 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -330,7 +330,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index 56bfad093..ccb653ad2 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -568,7 +568,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index cb14ebf6f..5c2a124c1 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -2162,7 +2162,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, } break; - case METHOD_BY_EXTENSION: { + case METHOD_BY_MRL: { const char *const mrl = input->get_mrl (input); /* check extension */ diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index 179fbc1c6..2a8af09bb 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.c @@ -246,7 +246,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: if (!open_tta_file(this)) { diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c index 865eeb569..41475f966 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.c @@ -433,7 +433,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index 1c15b893f..528d7972b 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -308,7 +308,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index ade0f9b52..d99121d51 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -191,7 +191,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } break; - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: break; default: diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index 64fd170db..3cbbced9d 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -346,7 +346,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index 77a2d3888..9cf2adefe 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -351,7 +351,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index 13ba1de5c..b3cf9dfb3 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -683,7 +683,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 3469fdaff..54e8ebbaa 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -415,7 +415,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: case METHOD_BY_CONTENT: case METHOD_EXPLICIT: diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 93f0e80d1..301a5978e 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -176,7 +176,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, return NULL; break; - case METHOD_BY_EXTENSION: { + case METHOD_BY_MRL: { const char *const mrl = input->get_mrl (input); if (strncmp (mrl, "v4l:/", 5)) diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index 0c9124786..69eb28388 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.c @@ -1400,7 +1400,7 @@ static demux_plugin_t *open_demux_plugin (demux_class_t *class_gen, xine_stream_ this->buflen = 0; switch (stream->content_detection_method) { - case METHOD_BY_EXTENSION: + case METHOD_BY_MRL: { const char *const mrl = input->get_mrl(input); const char *const ending = strrchr(mrl, '.'); diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 4103df507..08ddc9424 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -1298,7 +1298,7 @@ static demux_plugin_t *probe_demux (xine_stream_t *stream, int method1, int meth xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "load_plugins: probing demux '%s'\n", node->info->id); if (node->plugin_class || _load_plugin_class(stream->xine, node, NULL)) { - if ( stream->content_detection_method == METHOD_BY_EXTENSION && + if ( stream->content_detection_method == METHOD_BY_MRL && ! _x_demux_check_extension(input->get_mrl(input), ((demux_class_t *)node->plugin_class)->extensions) ) @@ -1325,16 +1325,16 @@ demux_plugin_t *_x_find_demux_plugin (xine_stream_t *stream, input_plugin_t *inp switch (stream->xine->demux_strategy) { case XINE_DEMUX_DEFAULT_STRATEGY: - return probe_demux (stream, METHOD_BY_CONTENT, METHOD_BY_EXTENSION, input); + return probe_demux (stream, METHOD_BY_CONTENT, METHOD_BY_MRL, input); case XINE_DEMUX_REVERT_STRATEGY: - return probe_demux (stream, METHOD_BY_EXTENSION, METHOD_BY_CONTENT, input); + return probe_demux (stream, METHOD_BY_MRL, METHOD_BY_CONTENT, input); case XINE_DEMUX_CONTENT_STRATEGY: return probe_demux (stream, METHOD_BY_CONTENT, -1, input); case XINE_DEMUX_EXTENSION_STRATEGY: - return probe_demux (stream, METHOD_BY_EXTENSION, -1, input); + return probe_demux (stream, METHOD_BY_MRL, -1, input); default: xprintf (stream->xine, XINE_VERBOSITY_LOG, @@ -1364,7 +1364,7 @@ demux_plugin_t *_x_find_demux_plugin_by_name(xine_stream_t *stream, const char * if (strcasecmp(node->info->id, name) == 0) { if (node->plugin_class || _load_plugin_class(stream->xine, node, NULL)) { - if ( stream->content_detection_method == METHOD_BY_EXTENSION && + if ( stream->content_detection_method == METHOD_BY_MRL && ! _x_demux_check_extension(input->get_mrl(input), ((demux_class_t *)node->plugin_class)->extensions) ) @@ -1402,7 +1402,7 @@ demux_plugin_t *_x_find_demux_plugin_last_probe(xine_stream_t *stream, const cha demux_plugin_t *plugin = NULL; methods[0] = METHOD_BY_CONTENT; - methods[1] = METHOD_BY_EXTENSION; + methods[1] = METHOD_BY_MRL; methods[2] = -1; i = 0; @@ -1428,7 +1428,7 @@ demux_plugin_t *_x_find_demux_plugin_last_probe(xine_stream_t *stream, const cha "load_plugin: probing '%s' (method %d)...\n", node->info->id, stream->content_detection_method ); if (node->plugin_class || _load_plugin_class(xine, node, NULL)) { - if ( stream->content_detection_method == METHOD_BY_EXTENSION && + if ( stream->content_detection_method == METHOD_BY_MRL && ! _x_demux_check_extension(input->get_mrl(input), ((demux_class_t *)node->plugin_class)->extensions) ) -- cgit v1.2.3 From 47e34b5c2e7649f647597c9551d241de1a1df23c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 20:20:22 +0100 Subject: Make _x_demux_check_extension check for protocol prefixes too if :/ is in the string. --- src/xine-engine/demux.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 379d552bf..405384626 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -448,6 +448,7 @@ int _x_demux_read_header( input_plugin_t *input, unsigned char *buffer, off_t si int _x_demux_check_extension (const char *mrl, const char *extensions){ char *last_dot, *e, *ext_copy, *ext_work; + int found = 0; /* An empty extensions string means that the by-extension method can't be used, so consider those cases as always passing. */ @@ -459,15 +460,21 @@ int _x_demux_check_extension (const char *mrl, const char *extensions){ last_dot = strrchr (mrl, '.'); if (last_dot) { last_dot++; - while ( ( e = xine_strsep(&ext_work, " ")) != NULL ) { - if (strcasecmp (last_dot, e) == 0) { - free(ext_copy); - return 1; + } + + while ( ( e = xine_strsep(&ext_work, " ")) != NULL ) { + if ( strstr(e, ":/") ) { + if ( strcasecmp (mrl, e) == 0 ) { + found = 1; + break; } + } else if (strcasecmp (last_dot, e) == 0) { + found = 1; + break; } } free(ext_copy); - return 0; + return found; } -- cgit v1.2.3 From 6520f339cb5fe4f2d07e64bec612c33dc1c91acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 20:21:35 +0100 Subject: Fail opening the device while using BY_CONTENT detection method, only allow BY_MRL and EXPLITIC. Also report cdda:/ as extension so that the global BY_MRL check will check for that. --- src/demuxers/demux_cdda.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index 3a6c7cba7..d2a2b4db4 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -200,14 +200,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { case METHOD_BY_CONTENT: + return NULL; case METHOD_BY_MRL: - if (strncasecmp (input->get_mrl (input), "cdda:", 5)) { - free (this); - return NULL; - } - - break; - case METHOD_EXPLICIT: break; @@ -228,7 +222,7 @@ void *demux_cdda_init_plugin (xine_t *xine, void *data) { this->demux_class.description = N_("CD Digital Audio demux plugin"); this->demux_class.identifier = "CDDA"; this->demux_class.mimetypes = NULL; - this->demux_class.extensions = NULL; + this->demux_class.extensions = "cdda:/"; this->demux_class.dispose = default_demux_class_dispose; return this; -- cgit v1.2.3 From 0c14df4d032947b635815e7acf537bd6a49315e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 20:43:05 +0100 Subject: Check if a dot was found before dereferencing the pointer. --- src/xine-engine/demux.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 405384626..187c27873 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -468,9 +468,11 @@ int _x_demux_check_extension (const char *mrl, const char *extensions){ found = 1; break; } - } else if (strcasecmp (last_dot, e) == 0) { - found = 1; - break; + } else if (last_dot) { + if (strcasecmp (last_dot, e) == 0) { + found = 1; + break; + } } } free(ext_copy); -- cgit v1.2.3 From 594d847a3398e58eefed8c8c8fad900d035d7ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 20:57:35 +0100 Subject: Allow the TS demuxer to accept dvb streams; fix BY_MRL detection for slave. --- src/demuxers/demux_slave.c | 13 ++----------- src/demuxers/demux_ts.c | 34 +++++++--------------------------- 2 files changed, 9 insertions(+), 38 deletions(-) diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index d7a17546f..fc42ae4c4 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -335,16 +335,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { - case METHOD_BY_MRL: { - const char *const mrl = input->get_mrl (input); - - if(!strncmp(mrl, "slave://", 8)) - break; - - free (this); - return NULL; - } - case METHOD_BY_CONTENT: { if (_x_demux_read_header(input, this->scratch, SCRATCH_SIZE) > 0) { @@ -356,6 +346,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str return NULL; } + case METHOD_BY_MRL: case METHOD_EXPLICIT: break; @@ -398,7 +389,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.description = ""; this->demux_class.identifier = "slave"; this->demux_class.mimetypes = NULL; - this->demux_class.extensions = NULL; + this->demux_class.extensions = "slave://"; this->demux_class.dispose = default_demux_class_dispose; return this; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 5c2a124c1..e320a6760 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -2162,32 +2162,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, } break; - case METHOD_BY_MRL: { - const char *const mrl = input->get_mrl (input); - - /* check extension */ - if (_x_demux_check_extension (mrl, class_gen->extensions)) - break; - - /* accept dvb streams */ - /* - * Also handle the special dvbs,dvbt and dvbc mrl formats: - * the content is exactly the same but the input plugin - * uses a different tuning algorithm [Pragma] - */ - - if (!strncasecmp (mrl, "dvb://", 6)) - break; - if (!strncasecmp (mrl, "dvbs://", 7)) - break; - if (!strncasecmp (mrl, "dvbc://", 7)) - break; - if (!strncasecmp (mrl, "dvbt://", 7)) - break; - - return NULL; - } - + case METHOD_BY_MRL: case METHOD_EXPLICIT: break; @@ -2272,7 +2247,12 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.description = N_("MPEG Transport Stream demuxer"); this->demux_class.identifier = "MPEG_TS"; this->demux_class.mimetypes = NULL; - this->demux_class.extensions = "ts m2t trp"; + + /* accept dvb streams; also handle the special dvbs,dvbt and dvbc + * mrl formats: the content is exactly the same but the input plugin + * uses a different tuning algorithm [Pragma] + */ + this->demux_class.extensions = "ts m2t trp dvb:// dvbs:// dvbc:// dvbt://"; this->demux_class.dispose = default_demux_class_dispose; return this; -- cgit v1.2.3 From f64816b715ec1b39b87f309580abd13139c3b306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 21:00:52 +0100 Subject: Fail when using BY_CONTENT detection, missing autodetection. --- src/demuxers/demux_vox.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index d99121d51..0e648263e 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -181,16 +181,9 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str switch (stream->content_detection_method) { case METHOD_BY_CONTENT: - case METHOD_EXPLICIT: { - const char *mrl; - - mrl = input->get_mrl (input); - - if (!_x_demux_check_extension (mrl, class_gen->extensions)) - return NULL; - } - break; + return NULL; + case METHOD_EXPLICIT: case METHOD_BY_MRL: break; -- cgit v1.2.3 From 0a83e75a5caea6537ea4bede87d7cfaaa4a1a0e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 21:01:45 +0100 Subject: Don't export _x_demux_check_extension, now that plugins don't need it anymore. --- src/xine-engine/xine_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 48aafa3f3..7e57640c0 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -446,7 +446,7 @@ void _x_demux_control_end (xine_stream_t *stream, uint32_t flags) XINE_ int _x_demux_start_thread (xine_stream_t *stream) XINE_PROTECTED; int _x_demux_stop_thread (xine_stream_t *stream) XINE_PROTECTED; int _x_demux_read_header (input_plugin_t *input, unsigned char *buffer, off_t size) XINE_PROTECTED; -int _x_demux_check_extension (const char *mrl, const char *extensions) XINE_PROTECTED; +int _x_demux_check_extension (const char *mrl, const char *extensions); off_t _x_read_abort (xine_stream_t *stream, int fd, char *buf, off_t todo) XINE_PROTECTED; -- cgit v1.2.3 From a151844ec16b67d6f844c176a611d5907e15ed5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 21:18:04 +0100 Subject: Provide some change log for the branch. --- ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 109fff9af..418bcb0b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,13 @@ xine-lib (1.1.90) (Unreleased) * DVB subtitles' opacity is now controllable. * The internal copies of libcdio and libvcd are no longer present, you need to use an installed copy of them if you want VCD support. + * Replace get_* functions for literals with direct string access. + * Use default dispose() functions when they just need to call free() in + various plugins. + * Rename METHOD_BY_EXTENSION to METHOD_BY_MRL as it also checks prefixes + for specific input protocols. + * Check for supported extensions before opening the plugin and remove + redundant core from plugins. xine-lib (1.1.9) (unreleased) * Fix dvd://.../title[.chapter] handling (somewhat broken in 1.1.8). -- cgit v1.2.3