1 files changed, 21 insertions, 52 deletions

diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
index 8017d3d3f..89b6de6d6 100644
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -40,12 +40,12 @@
 #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>
 #include "bswap.h"
-#include "buffer.h"
+#include <xine/buffer.h>
 
 #define FOURCC_TAG BE_FOURCC
 #define NSVf_TAG       FOURCC_TAG('N', 'S', 'V', 'f')
@@ -298,13 +298,21 @@ static int open_nsv_file(demux_nsv_t *this) {
       if (_x_is_fourcc(&preview[4], "NONE"))
 	this->video_type = 0;
       else
+      {
 	this->video_type = _x_fourcc_to_buf_video(this->video_fourcc);
+	if (!this->video_type)
+	  _x_report_video_fourcc (this->stream->xine, LOG_MODULE, this->video_fourcc);
+      }
 
       this->audio_fourcc = _X_ME_32(&preview[8]);
       if (_x_is_fourcc(&preview[8], "NONE"))
 	this->audio_type = 0;
       else
+      {
 	this->audio_type = _x_formattag_to_buf_audio(this->audio_fourcc);
+	if (!this->audio_type)
+	  _x_report_audio_format_tag (this->stream->xine, LOG_MODULE, this->audio_fourcc);
+      }
 
       this->bih.biSize = sizeof(this->bih);
       this->bih.biWidth = _X_LE_16(&preview[12]);
@@ -558,11 +566,6 @@ static int demux_nsv_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_nsv_dispose (demux_plugin_t *this) {
-
-  free(this);
-}
-
 static int demux_nsv_get_status (demux_plugin_t *this_gen) {
   demux_nsv_t *this = (demux_nsv_t *) this_gen;
 
@@ -594,7 +597,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_nsv_send_headers;
   this->demux_plugin.send_chunk        = demux_nsv_send_chunk;
   this->demux_plugin.seek              = demux_nsv_seek;
-  this->demux_plugin.dispose           = demux_nsv_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_nsv_get_status;
   this->demux_plugin.get_stream_length = demux_nsv_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_nsv_get_capabilities;
@@ -605,19 +608,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   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:
 
@@ -636,39 +627,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 "Nullsoft Video demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "Nullsoft NSV";
-}
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "nsv";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
-static void class_dispose (demux_class_t *this_gen) {
-  demux_nsv_class_t *this = (demux_nsv_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *demux_nsv_init_plugin (xine_t *xine, void *data) {
   demux_nsv_class_t     *this;
 
   this = calloc(1, sizeof(demux_nsv_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_("Nullsoft Video demux plugin");
+  this->demux_class.identifier      = "Nullsoft NSV";
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "nsv";
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }
@@ -682,6 +651,6 @@ static const demuxer_info_t demux_info_nsv = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_DEMUX, 26, "nsv", XINE_VERSION_CODE, &demux_info_nsv, demux_nsv_init_plugin },
+  { PLUGIN_DEMUX, 27, "nsv", XINE_VERSION_CODE, &demux_info_nsv, demux_nsv_init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };