1 files changed, 6 insertions, 49 deletions

diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c
index 7a5aabe0b..bee98d2a3 100644
--- a/src/combined/flac_demuxer.c
+++ b/src/combined/flac_demuxer.c
@@ -580,20 +580,7 @@ open_plugin (demux_class_t *class_gen,
             return NULL;
         }
         break;
-        case METHOD_BY_EXTENSION: {
-            char *ending, *mrl;
-    
-            mrl = input->get_mrl (input);
-    
-            ending = strrchr (mrl, '.');
-
-            if (!ending || (strlen (ending) < 5))
-                return NULL;
-
-            if (strncasecmp (ending, ".flac", 5))
-                return NULL;
-        }
-        break;
+        case METHOD_BY_MRL:
         case METHOD_EXPLICIT:
         break;
         default:
@@ -712,36 +699,6 @@ open_plugin (demux_class_t *class_gen,
 
 
 /* FLAC Demuxer class */
-
-static char *
-get_description (demux_class_t *this_gen) {
-    return "FLAC demux plugin";
-}
- 
-static char *
-get_identifier (demux_class_t *this_gen) {
-    return "FLAC";
-}
-
-static char *
-get_extensions (demux_class_t *this_gen) {
-    return "flac";
-}
-
-static char *
-get_mimetypes (demux_class_t *this_gen) {
-    return "application/x-flac: flac: FLAC Audio;";
-}
-
-static void 
-class_dispose (demux_class_t *this_gen) {
-    demux_flac_class_t *this = (demux_flac_class_t *) this_gen;
-
-    lprintf("class_dispose\n");
-
-    free (this);
-}
-
 void *
 demux_flac_init_class (xine_t *xine, void *data) {
 
@@ -754,11 +711,11 @@ demux_flac_init_class (xine_t *xine, void *data) {
     this->xine   = xine;
 
     this->demux_class.open_plugin     = open_plugin;
-    this->demux_class.get_description = get_description;
-    this->demux_class.get_identifier  = get_identifier;
-    this->demux_class.get_mimetypes   = get_mimetypes;
-    this->demux_class.get_extensions  = get_extensions;
-    this->demux_class.dispose         = class_dispose;
+    this->demux_class.description     = N_("FLAC demux plugin");
+    this->demux_class.identifier      = "FLAC";
+    this->demux_class.mimetypes       = "application/x-flac: flac: FLAC Audio;";
+    this->demux_class.extensions      = "flac";
+    this->demux_class.dispose         = default_demux_class_dispose;
 
     return this;
 }