summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/libxineadec/fooaudio.c16
-rw-r--r--src/libxineadec/gsm610.c12
-rw-r--r--src/libxineadec/xine_a52_decoder.c14
-rw-r--r--src/libxineadec/xine_dts_decoder.c12
-rw-r--r--src/libxineadec/xine_faad_decoder.c12
-rw-r--r--src/libxineadec/xine_lpcm_decoder.c12
-rw-r--r--src/libxineadec/xine_mad_decoder.c12
-rw-r--r--src/libxineadec/xine_musepack_decoder.c8
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;