1 files changed, 16 insertions, 57 deletions

diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c
index ea57a6939..c58500ab2 100644
--- a/src/demuxers/demux_aud.c
+++ b/src/demuxers/demux_aud.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
  */
 
 /*
@@ -33,8 +33,6 @@
  * initialized to 0 at the start of the file and maintained throughout the
  * data. This makes seeking conceptually impossible. Upshot: Random
  * seeking is not supported.
- *
- * $Id: demux_aud.c,v 1.20 2007/01/19 00:26:40 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -47,10 +45,10 @@
 #include <string.h>
 #include <stdlib.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>
 #include "bswap.h"
 #include "group_audio.h"
 
@@ -97,7 +95,7 @@ static int open_aud_file(demux_aud_t *this) {
    * of numbers. There is a 80002/16777216 = 0.48% chance of a false
    * positive.
    */
-  this->audio_samplerate = LE_16(&header[0]);
+  this->audio_samplerate = _X_LE_16(&header[0]);
   if ((this->audio_samplerate < 8000) || (this->audio_samplerate > 48000))
     return 0;
 
@@ -133,7 +131,7 @@ static int demux_aud_send_chunk(demux_plugin_t *this_gen) {
   demux_aud_t *this = (demux_aud_t *) this_gen;
 
   unsigned char chunk_preamble[AUD_CHUNK_PREAMBLE_SIZE];
-  unsigned int chunk_size;
+  int chunk_size;
   off_t current_file_pos;
   int64_t audio_pts;
   buf_element_t *buf;
@@ -145,12 +143,12 @@ static int demux_aud_send_chunk(demux_plugin_t *this_gen) {
   }
 
   /* validate the chunk */
-  if (LE_32(&chunk_preamble[4]) != 0x0000DEAF) {
+  if (_X_LE_32(&chunk_preamble[4]) != 0x0000DEAF) {
     this->status = DEMUX_FINISHED;
     return this->status;
   }
 
-  chunk_size = LE_16(&chunk_preamble[0]);
+  chunk_size = _X_LE_16(&chunk_preamble[0]);
 
   current_file_pos = this->input->get_current_pos(this->input) -
     this->data_start;
@@ -243,11 +241,6 @@ static int demux_aud_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_aud_dispose (demux_plugin_t *this) {
-
-  free(this);
-}
-
 static int demux_aud_get_status (demux_plugin_t *this_gen) {
   demux_aud_t *this = (demux_aud_t *) this_gen;
 
@@ -279,7 +272,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_aud_send_headers;
   this->demux_plugin.send_chunk        = demux_aud_send_chunk;
   this->demux_plugin.seek              = demux_aud_seek;
-  this->demux_plugin.dispose           = demux_aud_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_aud_get_status;
   this->demux_plugin.get_stream_length = demux_aud_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_aud_get_capabilities;
@@ -291,19 +284,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT: /* no reliable detection */
-  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_EXPLICIT:
 
     if (!open_aud_file(this)) {
@@ -320,39 +301,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 "Westwood Studios AUD file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "Westwood Studios AUD";
-}
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "aud";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
-static void class_dispose (demux_class_t *this_gen) {
-  demux_aud_class_t *this = (demux_aud_class_t *) this_gen;
-
-  free (this);
-}
-
 void *demux_aud_init_plugin (xine_t *xine, void *data) {
   demux_aud_class_t     *this;
 
   this = xine_xmalloc (sizeof (demux_aud_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_("Westwood Studios AUD file demux plugin");
+  this->demux_class.identifier      = "Westwood Studios AUD";
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "aud";
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }