summaryrefslogtreecommitdiff
path: root/src/combined
diff options
context:
space:
mode:
Diffstat (limited to 'src/combined')
-rw-r--r--src/combined/flac_decoder.c23
-rw-r--r--src/combined/flac_demuxer.c55
-rw-r--r--src/combined/nsf_combined.c4
-rw-r--r--src/combined/nsf_decoder.c27
-rw-r--r--src/combined/nsf_demuxer.c46
-rw-r--r--src/combined/wavpack_combined.c4
-rw-r--r--src/combined/wavpack_decoder.c18
-rw-r--r--src/combined/wavpack_demuxer.c44
-rw-r--r--src/combined/xine_ogg_demuxer.c109
-rw-r--r--src/combined/xine_speex_decoder.c18
-rw-r--r--src/combined/xine_theora_decoder.c29
-rw-r--r--src/combined/xine_vorbis_decoder.c19
12 files changed, 63 insertions, 333 deletions
diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c
index 75465f6fe..cb7db0364 100644
--- a/src/combined/flac_decoder.c
+++ b/src/combined/flac_decoder.c
@@ -379,19 +379,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);
-}
-
static void *
init_plugin (xine_t *xine, void *data) {
flac_class_t *this;
@@ -399,9 +386,9 @@ 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.dispose = dispose_class;
+ this->decoder_class.identifier = "flacdec";
+ this->decoder_class.description = N_("flac audio decoder plugin");
+ this->decoder_class.dispose = default_audio_decoder_dispose;
return this;
@@ -420,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_AUDIO_DECODER, 15, "flacdec", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
+ { PLUGIN_DEMUX, 27, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class },
+ { PLUGIN_AUDIO_DECODER, 16, "flacdec", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c
index 7a5aabe0b..bee98d2a3 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_MRL:
case METHOD_EXPLICIT:
break;
default:
@@ -712,36 +699,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";
-}
-
-static char *
-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) {
@@ -754,11 +711,11 @@ 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.get_mimetypes = get_mimetypes;
- this->demux_class.get_extensions = get_extensions;
- this->demux_class.dispose = class_dispose;
+ this->demux_class.description = N_("FLAC demux plugin");
+ this->demux_class.identifier = "FLAC";
+ 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_combined.c b/src/combined/nsf_combined.c
index 0f71a287d..085467937 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_AUDIO_DECODER, 15, "nsfdec", XINE_VERSION_CODE, &decoder_info_nsf, decoder_nsf_init_plugin },
+ { PLUGIN_DEMUX, 27, "nsfdemux", XINE_VERSION_CODE, &demux_info_nsf, demux_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/nsf_decoder.c b/src/combined/nsf_decoder.c
index a809ff9cc..b2694e789 100644
--- a/src/combined/nsf_decoder.c
+++ b/src/combined/nsf_decoder.c
@@ -230,27 +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) {
-
- 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) {
@@ -260,9 +239,9 @@ 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.dispose = dispose_class;
+ this->decoder_class.identifier = "NSF";
+ this->decoder_class.description = N_("NES Music audio decoder plugin");
+ 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 95897e3ac..cce7c8983 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_MRL:
case METHOD_BY_CONTENT:
case METHOD_EXPLICIT:
@@ -349,39 +337,17 @@ 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";
-}
-
-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;
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.get_mimetypes = get_mimetypes;
- this->demux_class.get_extensions = get_extensions;
- this->demux_class.dispose = class_dispose;
+ this->demux_class.description = N_("NES Music file demux plugin");
+ this->demux_class.identifier = "NSF";
+ 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_combined.c b/src/combined/wavpack_combined.c
index e7a1bc76a..9c5dade03 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_AUDIO_DECODER, 15, "wavpackdec", XINE_VERSION_CODE, &decoder_info_wv, decoder_wavpack_init_plugin },
+ { PLUGIN_DEMUX, 27, "wavpack", XINE_VERSION_CODE, &demux_info_wv, demux_wv_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/wavpack_decoder.c b/src/combined/wavpack_decoder.c
index 2bd0339d8..8eb041664 100644
--- a/src/combined/wavpack_decoder.c
+++ b/src/combined/wavpack_decoder.c
@@ -311,27 +311,15 @@ 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);
-}
-
void *decoder_wavpack_init_plugin (xine_t *xine, void *data) {
wavpack_class_t *this;
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.dispose = dispose_class;
+ this->decoder_class.identifier = "wavpackdec";
+ this->decoder_class.description = N_("wavpack audio decoder plugin");
+ 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 4b8300d44..ac5c66a8d 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_MRL:
case METHOD_BY_CONTENT:
case METHOD_EXPLICIT:
@@ -378,37 +368,15 @@ 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";
-}
-
-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));
this->demux_class.open_plugin = open_plugin;
- this->demux_class.get_description = get_description;
- this->demux_class.get_identifier = get_identifier;
- this->demux_class.get_mimetypes = get_mimetypes;
- this->demux_class.get_extensions = get_extensions;
- this->demux_class.dispose = class_dispose;
+ this->demux_class.description = N_("Wavpack demux plugin");
+ this->demux_class.identifier = "Wavpack";
+ 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 2a69c4da2..70cfc5846 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_MRL:
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_MRL:
case METHOD_EXPLICIT:
return 1;
@@ -2116,40 +2094,17 @@ 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";
-}
-
-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;
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.get_mimetypes = anx_get_mimetypes;
- this->demux_class.get_extensions = anx_get_extensions;
- this->demux_class.dispose = anx_class_dispose;
+ this->demux_class.description = N_("Annodex demux plugin");
+ this->demux_class.identifier = "Annodex";
+ 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;
}
@@ -2157,43 +2112,21 @@ 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";
-}
-
-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_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;
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.get_mimetypes = ogg_get_mimetypes;
- this->demux_class.get_extensions = ogg_get_extensions;
- this->demux_class.dispose = ogg_class_dispose;
+ this->demux_class.description = N_("OGG demux plugin");
+ this->demux_class.identifier = "OGG";
+ 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;
}
@@ -2218,16 +2151,16 @@ 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 },
+ { 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 },
+ { 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/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c
index fa1ede0f2..e4fc44eec 100644
--- a/src/combined/xine_speex_decoder.c
+++ b/src/combined/xine_speex_decoder.c
@@ -376,18 +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);
-}
-
void *speex_init_plugin (xine_t *xine, void *data) {
speex_class_t *this;
@@ -395,9 +383,9 @@ 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.dispose = dispose_class;
+ this->decoder_class.identifier = "speex";
+ this->decoder_class.description = N_("Speex audio decoder plugin");
+ 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 9fd3d6416..8d06a5510 100644
--- a/src/combined/xine_theora_decoder.c
+++ b/src/combined/xine_theora_decoder.c
@@ -343,29 +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
- */
- free (this);
-}
-
void *theora_init_plugin (xine_t *xine, void *data) {
/*initialize our plugin*/
theora_class_t *this;
@@ -373,9 +350,9 @@ 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.dispose = theora_dispose_class;
+ this->decoder_class.identifier = "theora video";
+ this->decoder_class.description = N_("theora video decoder plugin");
+ 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 29d095228..aa3546e2e 100644
--- a/src/combined/xine_vorbis_decoder.c
+++ b/src/combined/xine_vorbis_decoder.c
@@ -310,19 +310,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);
-}
-
void *vorbis_init_plugin (xine_t *xine, void *data) {
vorbis_class_t *this;
@@ -330,9 +317,9 @@ 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.dispose = dispose_class;
+ this->decoder_class.identifier = "vorbis";
+ this->decoder_class.description = N_("vorbis audio decoder plugin");
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
return this;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-04 14:06:35 +0000