Merge from 1.2 main.

1 files changed, 7 insertions, 47 deletions

diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c
index 346f0c2e6..60750b550 100644
--- a/src/demuxers/demux_mpc.c
+++ b/src/demuxers/demux_mpc.c
@@ -292,12 +292,6 @@ static int demux_mpc_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_mpc_dispose (demux_plugin_t *this_gen) {
-  demux_mpc_t *this = (demux_mpc_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_mpc_get_status (demux_plugin_t *this_gen) {
   demux_mpc_t *this = (demux_mpc_t *) this_gen;
 
@@ -331,7 +325,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_mpc_send_headers;
   this->demux_plugin.send_chunk        = demux_mpc_send_chunk;
   this->demux_plugin.seek              = demux_mpc_seek;
-  this->demux_plugin.dispose           = demux_mpc_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_mpc_get_status;
   this->demux_plugin.get_stream_length = demux_mpc_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_mpc_get_capabilities;
@@ -341,19 +335,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->status = DEMUX_FINISHED;
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION: {
-    const char *extensions, *mrl;
-
-    mrl = input->get_mrl (input);
-    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:
     
@@ -372,39 +354,17 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Musepack demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "Musepack";
-}
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "mpc mp+";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
-static void class_dispose (demux_class_t *this_gen) {
-  demux_mpc_class_t *this = (demux_mpc_class_t *) this_gen;
-
-  free (this);
-}
-
 void *demux_mpc_init_plugin (xine_t *xine, void *data) {
   demux_mpc_class_t     *this;
 
   this = xine_xmalloc (sizeof (demux_mpc_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_("Musepack demux plugin");
+  this->demux_class.identifier      = "Musepack";
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "mpc mp+";
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }