1 files changed, 12 insertions, 52 deletions

diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c
index 968542057..199100a89 100644
--- a/src/demuxers/demux_rawdv.c
+++ b/src/demuxers/demux_rawdv.c
@@ -32,10 +32,10 @@
 #include <unistd.h>
 #include <string.h>
 
-#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 NTSC_FRAME_SIZE 120000
 #define NTSC_FRAME_RATE 29.97
@@ -321,12 +321,6 @@ static int demux_raw_dv_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_raw_dv_dispose (demux_plugin_t *this_gen) {
-  demux_raw_dv_t *this = (demux_raw_dv_t *) this_gen;
-
-  free (this);
-}
-
 static int demux_raw_dv_get_stream_length(demux_plugin_t *this_gen) {
   demux_raw_dv_t *this = (demux_raw_dv_t *) this_gen;
 
@@ -355,7 +349,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_raw_dv_send_headers;
   this->demux_plugin.send_chunk        = demux_raw_dv_send_chunk;
   this->demux_plugin.seek              = demux_raw_dv_seek;
-  this->demux_plugin.dispose           = demux_raw_dv_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_raw_dv_get_status;
   this->demux_plugin.get_stream_length = demux_raw_dv_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_raw_dv_get_capabilities;
@@ -382,19 +376,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)) {
-      free (this);
-      return NULL;
-    }
-  }
-  break;
-
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
   break;
 
@@ -411,39 +393,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 "Raw DV Video stream";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "raw_dv";
-}
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "dv dif";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
-static void class_dispose (demux_class_t *this_gen) {
-  demux_raw_dv_class_t *this = (demux_raw_dv_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_raw_dv_class_t     *this;
 
   this = calloc(1, sizeof(demux_raw_dv_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_("Raw DV Video stream");
+  this->demux_class.identifier      = "raw_dv";
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "dv dif";
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }
@@ -457,6 +417,6 @@ static const demuxer_info_t demux_info_raw_dv = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_DEMUX, 26, "rawdv", XINE_VERSION_CODE, &demux_info_raw_dv, init_plugin },
+  { PLUGIN_DEMUX, 27, "rawdv", XINE_VERSION_CODE, &demux_info_raw_dv, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };