1 files changed, 12 insertions, 47 deletions

diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index d38fe3c62..ddd067eb0 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -38,10 +38,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 
 #define NUM_PREVIEW_BUFFERS 50
 #define SCRATCH_SIZE 256
@@ -169,11 +169,6 @@ static int demux_mpeg_elem_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_mpeg_elem_dispose (demux_plugin_t *this) {
-
-  free (this);
-}
-
 static int demux_mpeg_elem_get_stream_length(demux_plugin_t *this_gen) {
   return 0 ; /*FIXME: implement */
 }
@@ -222,15 +217,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   }
   break;
 
-  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))
-      return NULL;
-  }
+  case METHOD_BY_MRL:
   break;
 
   case METHOD_EXPLICIT:
@@ -247,7 +234,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_mpeg_elem_send_headers;
   this->demux_plugin.send_chunk        = demux_mpeg_elem_send_chunk;
   this->demux_plugin.seek              = demux_mpeg_elem_seek;
-  this->demux_plugin.dispose           = demux_mpeg_elem_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_mpeg_elem_get_status;
   this->demux_plugin.get_stream_length = demux_mpeg_elem_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_mpeg_elem_get_capabilities;
@@ -259,39 +246,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 "Elementary MPEG stream demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "MPEG_ELEM";
-}
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "mpv";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
-static void class_dispose (demux_class_t *this_gen) {
-  demux_mpeg_elem_class_t *this = (demux_mpeg_elem_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_mpeg_elem_class_t     *this;
 
   this = calloc(1, sizeof(demux_mpeg_elem_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_("Elementary MPEG stream demux plugin");
+  this->demux_class.identifier      = "MPEG_ELEM";
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "mpv";
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }
@@ -305,6 +270,6 @@ static const demuxer_info_t demux_info_elem = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_DEMUX, 26, "elem", XINE_VERSION_CODE, &demux_info_elem, init_plugin },
+  { PLUGIN_DEMUX, 27, "elem", XINE_VERSION_CODE, &demux_info_elem, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };