summaryrefslogtreecommitdiff
path: root/src/libxineadec
diff options
context:
space:
mode:
Diffstat (limited to 'src/libxineadec')
-rw-r--r--src/libxineadec/fooaudio.c18
-rw-r--r--src/libxineadec/gsm610.c20
-rw-r--r--src/libxineadec/xine_a52_decoder.c23
-rw-r--r--src/libxineadec/xine_dts_decoder.c22
-rw-r--r--src/libxineadec/xine_faad_decoder.c20
-rw-r--r--src/libxineadec/xine_lpcm_decoder.c20
-rw-r--r--src/libxineadec/xine_mad_decoder.c21
-rw-r--r--src/libxineadec/xine_musepack_decoder.c23
8 files changed, 31 insertions, 136 deletions
diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c
index 5ab4fa1f6..42427611f 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 = N_("fooaudio: reference xine audio decoder plugin");
this->decoder_class.dispose = dispose_class;
return this;
@@ -342,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 84d28cc3a..4ca3827d7 100644
--- a/src/libxineadec/gsm610.c
+++ b/src/libxineadec/gsm610.c
@@ -249,18 +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);
-}
-
static void *init_plugin (xine_t *xine, void *data) {
gsm610_class_t *this ;
@@ -268,9 +256,9 @@ 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.dispose = dispose_class;
+ this->decoder_class.identifier = "GSM 6.10";
+ this->decoder_class.description = N_("GSM 6.10 audio decoder plugin");
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
return this;
}
@@ -288,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 fda439a2b..c3fa5fa7a 100644
--- a/src/libxineadec/xine_a52_decoder.c
+++ b/src/libxineadec/xine_a52_decoder.c
@@ -770,21 +770,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);
-}
-
static void *init_plugin (xine_t *xine, void *data) {
a52dec_class_t *this;
@@ -793,9 +778,9 @@ 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.dispose = dispose_class;
+ this->decoder_class.identifier = "a/52dec";
+ this->decoder_class.description = N_("liba52 based a52 audio decoder plugin");
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
cfg = this->config = xine->config;
@@ -860,6 +845,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 f62aa1b94..369c354fd 100644
--- a/src/libxineadec/xine_dts_decoder.c
+++ b/src/libxineadec/xine_dts_decoder.c
@@ -547,20 +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");
-
- free (this);
-}
-
static void *init_plugin (xine_t *xine, void *data) {
dts_class_t *this ;
@@ -569,9 +555,9 @@ 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.dispose = dispose_class;
+ this->decoder_class.identifier = "DTS";
+ this->decoder_class.description = N_("DTS passthru audio format decoder plugin");
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
return this;
}
@@ -587,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 4a2097ec4..36d1d0679 100644
--- a/src/libxineadec/xine_faad_decoder.c
+++ b/src/libxineadec/xine_faad_decoder.c
@@ -445,18 +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);
-}
-
static void *init_plugin (xine_t *xine, void *data) {
faad_class_t *this ;
@@ -464,9 +452,9 @@ 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.dispose = dispose_class;
+ this->decoder_class.identifier = "FAAD";
+ this->decoder_class.description = N_("Freeware Advanced Audio Decoder");
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
return this;
}
@@ -482,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 66cdcf637..96c02906d 100644
--- a/src/libxineadec/xine_lpcm_decoder.c
+++ b/src/libxineadec/xine_lpcm_decoder.c
@@ -248,18 +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);
-}
-
static void *init_plugin (xine_t *xine, void *data) {
lpcm_class_t *this ;
@@ -267,9 +255,9 @@ 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.dispose = dispose_class;
+ this->decoder_class.identifier = "Linear PCM";
+ this->decoder_class.description = N_("Linear PCM audio decoder plugin");
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
return this;
}
@@ -285,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 2057505e8..906db048a 100644
--- a/src/libxineadec/xine_mad_decoder.c
+++ b/src/libxineadec/xine_mad_decoder.c
@@ -335,19 +335,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);
-}
-
static void *init_plugin (xine_t *xine, void *data) {
mad_class_t *this;
@@ -355,9 +342,9 @@ 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.dispose = dispose_class;
+ this->decoder_class.identifier = "mad";
+ this->decoder_class.description = N_("libmad based mpeg audio layer 1/2/3 decoder plugin");
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
return this;
}
@@ -373,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 7e6b93f45..ad5002439 100644
--- a/src/libxineadec/xine_musepack_decoder.c
+++ b/src/libxineadec/xine_musepack_decoder.c
@@ -430,21 +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 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;
-
- free (this);
-}
-
static void *init_plugin (xine_t *xine, void *data) {
mpc_class_t *this ;
@@ -452,9 +437,9 @@ 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.dispose = dispose_class;
+ this->decoder_class.identifier = "mpc";
+ this->decoder_class.description = N_("mpc: musepack audio decoder plugin");
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
return this;
}
@@ -471,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 }
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 03:11:14 +0000