Merge from 1.2 main.

1 files changed, 5 insertions, 18 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 }
 };