1 files changed, 14 insertions, 56 deletions

diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index 1c1675b92..ce42d61d8 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
 
 /*
@@ -24,8 +24,6 @@
  * possibly be seen in a VOC file. It only plays the first block in a file.
  * It will only play that block if it is PCM data. More variations will be
  * supported as they are encountered.
- *
- * $Id: demux_voc.c,v 1.41 2007/01/19 00:26:40 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -39,10 +37,10 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
@@ -87,11 +85,11 @@ static int open_voc_file(demux_voc_t *this) {
     return 0;
 
   /* check the signature */
-  if (strncmp(header, VOC_SIGNATURE, strlen(VOC_SIGNATURE)) != 0)
+  if (memcmp(header, VOC_SIGNATURE, strlen(VOC_SIGNATURE)) != 0)
     return 0;
 
   /* file is qualified */
-  first_block_offset = LE_16(&header[0x14]);
+  first_block_offset = _X_LE_16(&header[0x14]);
   this->input->seek(this->input, first_block_offset, SEEK_SET);
 
   /* load the block preamble */
@@ -265,12 +263,6 @@ static int demux_voc_seek (demux_plugin_t *this_gen, off_t start_pos, int start_
   return this->status;
 }
 
-static void demux_voc_dispose (demux_plugin_t *this_gen) {
-  demux_voc_t *this = (demux_voc_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_voc_get_status (demux_plugin_t *this_gen) {
   demux_voc_t *this = (demux_voc_t *) this_gen;
 
@@ -305,7 +297,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_voc_send_headers;
   this->demux_plugin.send_chunk        = demux_voc_send_chunk;
   this->demux_plugin.seek              = demux_voc_seek;
-  this->demux_plugin.dispose           = demux_voc_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_voc_get_status;
   this->demux_plugin.get_stream_length = demux_voc_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_voc_get_capabilities;
@@ -316,19 +308,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:
 
@@ -347,39 +327,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 "VOC file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "VOC";
-}
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "voc";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
-static void class_dispose (demux_class_t *this_gen) {
-  demux_voc_class_t *this = (demux_voc_class_t *) this_gen;
-
-  free (this);
-}
-
 void *demux_voc_init_plugin (xine_t *xine, void *data) {
   demux_voc_class_t     *this;
 
   this = xine_xmalloc (sizeof (demux_voc_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_("VOC file demux plugin");
+  this->demux_class.identifier      = "VOC";
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "voc";
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }