Merge from 1.2 main.

1 files changed, 3 insertions, 15 deletions

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;
 }