From 4c6079008803ebe11ad05051a2c220a9347feea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
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(-)

(limited to 'src/libxineadec')

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 f8bd5f9976485960fa7b2ffd1ca2a347044b38ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
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(-)

(limited to 'src/libxineadec')

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 e2a10c5fdaed1f45040fb3d737ab79f0e5d774d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
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/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 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/libxineadec')

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;
-- 
cgit v1.2.3


From 32a70cef7fdce1648d6850dafbe78bee04830429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Tue, 11 Dec 2007 15:40:37 +0100
Subject: Use default_*_class_dispose macro whenever the class dispose function
 only called free().

---
 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 +--------
 7 files changed, 7 insertions(+), 42 deletions(-)

(limited to 'src/libxineadec')

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;
 }
-- 
cgit v1.2.3


From 5d4f71c06873aea6df30b07abb84e7bdace5d54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Tue, 11 Dec 2007 18:19:30 +0100
Subject: Bump the interface version for audio decoder plugins.

---
 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 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/libxineadec')

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 }
 };
 
-- 
cgit v1.2.3