X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=spxdec_filter.c;h=94a9c78835e93157be51753bc910f251820501e8;hb=cdbc8067a2e27ee7f9e0d8ff11cf415603fc0558;hp=644d287aaf6a4daba32dd023c9770691aa3f4d24;hpb=94802b02fadd65ac1704fe9fcbcf0a2b023d2fa4;p=paraslash.git

diff --git a/spxdec_filter.c b/spxdec_filter.c
index 644d287a..94a9c788 100644
--- a/spxdec_filter.c
+++ b/spxdec_filter.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2002-2006 Jean-Marc Valin
  * Copyright (C) 2010 Andre Noll <maan@tuebingen.mpg.de>
  *
- * Licensed under the GPL v2. For licencing details see COPYING.
+ * Licensed under the GPL v2, see file COPYING.
  */
 
 /** \file spxdec_filter.c Paraslash's ogg/speex decoder. */
@@ -48,9 +48,9 @@
 #include <speex/speex_callbacks.h>
 
 #include "para.h"
+#include "portable_io.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
@@ -122,12 +122,6 @@ static int speexdec_init(struct filter_node *fn)
 	return 1;
 }
 
-#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
-#define le_short(s) ((short) ((unsigned short) (s) << 8) | ((unsigned short) (s) >> 8))
-#else
-#define le_short(s) ((short) (s))
-#endif
-
 /**
  * Size of the output buffer.
  *
@@ -179,7 +173,7 @@ static int speexdec_write_frames(int packet_no,
 		samples = new_frame_size * psd->shi.channels;
 		btr_output = para_malloc(2 * samples);
 		for (i = 0; i < samples; i++)
-			btr_output[i] = le_short(output[i + skip_idx]);
+			btr_output[i] = read_u16(output + i + skip_idx);
 		btr_add_output((char *)btr_output, samples * 2, btrn);
 	}
 	return 1;
@@ -252,7 +246,7 @@ static int compute_skip_samples(ogg_page *og, struct private_spxdec_data *psd)
 	return ret;
 }
 
-static int speexdec_post_select(__a_unused struct sched *s, void *context)
+static int speexdec_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	struct private_spxdec_data *psd = fn->private_data;
@@ -308,16 +302,10 @@ fail:
 	return ret;
 }
 
-/**
- * The init function of the ogg/speex decoder.
- *
- * \param f Its fields are filled in by the function.
- */
-void spxdec_filter_init(struct filter *f)
-{
-	f->open = spxdec_open;
-	f->close = speexdec_close;
-	f->pre_select = generic_filter_pre_select;
-	f->post_select = speexdec_post_select;
-	f->execute = speexdec_execute;
-}
+const struct filter lsg_filter_cmd_com_spxdec_user_data = {
+	.open = spxdec_open,
+	.close = speexdec_close,
+	.pre_monitor = generic_filter_pre_monitor,
+	.post_monitor = speexdec_post_monitor,
+	.execute = speexdec_execute,
+};