1 files changed, 6 insertions, 38 deletions
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
index 4b8300d44..ac5c66a8d 100644
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -349,17 +349,7 @@ static demux_plugin_t *open_plugin (demux_class_t *const class_gen,
   this->status = DEMUX_FINISHED;
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION: {
-    const char *const mrl = input->get_mrl (input);
-    const char *const extensions = class_gen->get_extensions (class_gen);
-
-    if (!_x_demux_check_extension (mrl, extensions)) {
-      free (this);
-      return NULL;
-    }
-  }
-  /* Falling through is intended */
-
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
     
@@ -378,37 +368,15 @@ static demux_plugin_t *open_plugin (demux_class_t *const class_gen,
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *const this_gen) {
-  return "Wavpack demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *const this_gen) {
-  return "Wavpack";
-}
-
-static const char *get_extensions (demux_class_t *const this_gen) {
-  return "wv";
-}
-
-static const char *get_mimetypes (demux_class_t *const this_gen) {
-  return NULL;
-}
-
-static void class_dispose (demux_class_t *const this_gen) {
-  demux_wv_class_t *const this = (demux_wv_class_t *) this_gen;
-
-  free (this);
-}
-
 void *demux_wv_init_plugin (xine_t *const xine, void *const data) {
   demux_wv_class_t *const this = xine_xmalloc (sizeof (demux_wv_class_t));
 
   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_("Wavpack demux plugin");
+  this->demux_class.identifier      = "Wavpack";
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "wv";
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }