Attachment #136931 for bug #182283





CONFLICTS=	kdemultimedia-3.[1-3]*

OPTIONS_DEFINE=	FFMPEG JACK MPC MPEG OSS PULSEAUDIO RESAMPLER XIPH
OPTIONS_DEFAULT=	MPC MPEG OSS RESAMPLER XIPH

MPC_DESC=	Monkey's Audio decoder plugin
MPEG_DESC=	MPEG Audio decoder plugin
RESAMPLER_DESC=	Resampler processing plugin
XIPH_DESC=	FLAC/Speex/Vorbis decoder plugin


USES=		gmake
USE_AUTOTOOLS=	libltdl libtool
USE_BZIP2=	yes
USE_GCC=	any
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_LDCONFIG=	yes


RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_oss_sink.so:${PORTSDIR}/audio/akode-plugins-oss
.endif

.if ${PORT_OPTIONS:MPULSEAUDIO}
RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_polyp_sink.so:${PORTSDIR}/audio/akode-plugins-pulseaudio
.endif

.if ${PORT_OPTIONS:MRESAMPLER}
RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_src_resampler.so:${PORTSDIR}/audio/akode-plugins-resampler
.endif

Line 0 Link Here

(-)akode/files/patch-akode-akodeplay-akodeplay.cpp (+10 lines)
	1	--- akode/akodeplay/akodeplay.cpp-orig 2006-11-06 07:20:52.000000000 -0600
	2	+++ akode/akodeplay/akodeplay.cpp 2013-09-19 08:14:28.000000000 -0500
	3	@@ -19,6 +19,7 @@
	4	*/
	5
	6	#include <iostream>
	7	+#include <cstdlib>
	8
	9	#include "../lib/akodelib.h"
	10	#include "../lib/player.h"

Line 0 Link Here

(-)akode/files/patch-akode-lib-auto_sink.cpp (+10 lines)
	1	--- akode/lib/auto_sink.cpp-orig 2005-10-26 08:50:29.000000000 -0500
	2	+++ akode/lib/auto_sink.cpp 2013-09-19 03:25:47.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "auto_sink.h"
	5
	6	#include <iostream>
	7	+#include <cstdlib>
	8
	9	namespace aKode {
	10

Line 0 Link Here

(-)akode/files/patch-akode-lib-converter.cpp (+11 lines)
	1	--- akode/lib/converter.cpp-orig 2006-07-22 11:35:31.000000000 -0500
	2	+++ akode/lib/converter.cpp 2013-09-19 08:49:30.000000000 -0500
	3	@@ -26,7 +26,7 @@
	4
	5	Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
	6
	7	-template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
	8	+template<typename T, typename S, template<typename U> class ArithmT, template<typename U> class ArithmS>
	9	static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
	10	{
	11	AudioConfiguration config = *in;




--- akode/lib/crossfader.cpp-orig	2005-10-20 15:47:17.000000000 -0500
+++ akode/lib/crossfader.cpp	2013-09-19 08:52:46.000000000 -0500
@@ -27,7 +27,7 @@
 CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
 
 // T is the input/output type, S is the fast arithmetics type, Div is a division method
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata1 = (T**)in->data;
@@ -66,7 +66,7 @@
 }
 
 // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata = (T**)frame->data;

Line 0 Link Here

(-)akode/files/patch-akode-lib-fast_resampler.cpp (+11 lines)
	1	--- akode/lib/fast_resampler.cpp-orig 2006-05-26 13:37:17.000000000 -0500
	2	+++ akode/lib/fast_resampler.cpp 2013-09-19 08:54:51.000000000 -0500
	3	@@ -37,7 +37,7 @@
	4	// A fast resampling by linear interpolation
	5	// I assume you know binary arithmetics and convertions if you're reading this
	6	// T is the input/output type, Arithm defines the used arithmetic
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
	10	{
	11	unsigned long vt_pos_start = 0; // virtual positions of new sample

Line 0 Link Here

(-)akode/files/patch-akode-lib-magic.cpp (+10 lines)
	1	--- akode/lib/magic.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/magic.cpp 2013-09-19 08:08:58.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "magic.h"
	5	#include "file.h"
	6	#include <iostream>
	7	+#include <cstring>
	8	using std::cerr;
	9
	10	namespace aKode {

Line 0 Link Here

(-)akode/files/patch-akode-lib-player.cpp (+10 lines)
	1	--- akode/lib/player.cpp-orig 2006-11-05 08:37:48.000000000 -0600
	2	+++ akode/lib/player.cpp 2013-09-19 08:06:37.000000000 -0500
	3	@@ -21,6 +21,7 @@
	4	#include <pthread.h>
	5	#include <semaphore.h>
	6	#include <assert.h>
	7	+#include <cstring>
	8
	9	#include "audioframe.h"
	10	#include "audiobuffer.h"

Line 0 Link Here

(-)akode/files/patch-akode-lib-volumefilter.cpp (+11 lines)
	1	--- akode/lib/volumefilter.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/volumefilter.cpp 2013-09-19 08:56:37.000000000 -0500
	3	@@ -29,7 +29,7 @@
	4	VolumeFilter::VolumeFilter() : m_volume(0) {}
	5
	6	// T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
	10	{
	11	T indata = (T)in->data;

Line 0 Link Here

(-)akode-plugins-ffmpeg/files/patch-akode-lib-auto_sink.cpp (+10 lines)
	1	--- akode/lib/auto_sink.cpp-orig 2005-10-26 08:50:29.000000000 -0500
	2	+++ akode/lib/auto_sink.cpp 2013-09-19 03:25:47.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "auto_sink.h"
	5
	6	#include <iostream>
	7	+#include <cstdlib>
	8
	9	namespace aKode {
	10

Line 0 Link Here

(-)akode-plugins-ffmpeg/files/patch-akode-lib-converter.cpp (+11 lines)
	1	--- akode/lib/converter.cpp-orig 2006-07-22 11:35:31.000000000 -0500
	2	+++ akode/lib/converter.cpp 2013-09-19 08:49:30.000000000 -0500
	3	@@ -26,7 +26,7 @@
	4
	5	Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
	6
	7	-template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
	8	+template<typename T, typename S, template<typename U> class ArithmT, template<typename U> class ArithmS>
	9	static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
	10	{
	11	AudioConfiguration config = *in;




--- akode/lib/crossfader.cpp-orig	2005-10-20 15:47:17.000000000 -0500
+++ akode/lib/crossfader.cpp	2013-09-19 08:52:46.000000000 -0500
@@ -27,7 +27,7 @@
 CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
 
 // T is the input/output type, S is the fast arithmetics type, Div is a division method
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata1 = (T**)in->data;
@@ -66,7 +66,7 @@
 }
 
 // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata = (T**)frame->data;

Line 0 Link Here

(-)akode-plugins-ffmpeg/files/patch-akode-lib-fast_resampler.cpp (+11 lines)
	1	--- akode/lib/fast_resampler.cpp-orig 2006-05-26 13:37:17.000000000 -0500
	2	+++ akode/lib/fast_resampler.cpp 2013-09-19 08:54:51.000000000 -0500
	3	@@ -37,7 +37,7 @@
	4	// A fast resampling by linear interpolation
	5	// I assume you know binary arithmetics and convertions if you're reading this
	6	// T is the input/output type, Arithm defines the used arithmetic
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
	10	{
	11	unsigned long vt_pos_start = 0; // virtual positions of new sample

Line 0 Link Here

(-)akode-plugins-ffmpeg/files/patch-akode-lib-magic.cpp (+10 lines)
	1	--- akode/lib/magic.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/magic.cpp 2013-09-19 08:08:58.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "magic.h"
	5	#include "file.h"
	6	#include <iostream>
	7	+#include <cstring>
	8	using std::cerr;
	9
	10	namespace aKode {

Line 0 Link Here

(-)akode-plugins-ffmpeg/files/patch-akode-lib-player.cpp (+10 lines)
	1	--- akode/lib/player.cpp-orig 2006-11-05 08:37:48.000000000 -0600
	2	+++ akode/lib/player.cpp 2013-09-19 08:06:37.000000000 -0500
	3	@@ -21,6 +21,7 @@
	4	#include <pthread.h>
	5	#include <semaphore.h>
	6	#include <assert.h>
	7	+#include <cstring>
	8
	9	#include "audioframe.h"
	10	#include "audiobuffer.h"

Line 0 Link Here

(-)akode-plugins-ffmpeg/files/patch-akode-lib-volumefilter.cpp (+11 lines)
	1	--- akode/lib/volumefilter.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/volumefilter.cpp 2013-09-19 08:56:37.000000000 -0500
	3	@@ -29,7 +29,7 @@
	4	VolumeFilter::VolumeFilter() : m_volume(0) {}
	5
	6	// T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
	10	{
	11	T indata = (T)in->data;

Line 0 Link Here

(-)akode-plugins-jack/files/patch-akode-lib-auto_sink.cpp (+10 lines)
	1	--- akode/lib/auto_sink.cpp-orig 2005-10-26 08:50:29.000000000 -0500
	2	+++ akode/lib/auto_sink.cpp 2013-09-19 03:25:47.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "auto_sink.h"
	5
	6	#include <iostream>
	7	+#include <cstdlib>
	8
	9	namespace aKode {
	10

Line 0 Link Here

(-)akode-plugins-jack/files/patch-akode-lib-converter.cpp (+11 lines)
	1	--- akode/lib/converter.cpp-orig 2006-07-22 11:35:31.000000000 -0500
	2	+++ akode/lib/converter.cpp 2013-09-19 08:49:30.000000000 -0500
	3	@@ -26,7 +26,7 @@
	4
	5	Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
	6
	7	-template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
	8	+template<typename T, typename S, template<typename U> class ArithmT, template<typename U> class ArithmS>
	9	static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
	10	{
	11	AudioConfiguration config = *in;




--- akode/lib/crossfader.cpp-orig	2005-10-20 15:47:17.000000000 -0500
+++ akode/lib/crossfader.cpp	2013-09-19 08:52:46.000000000 -0500
@@ -27,7 +27,7 @@
 CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
 
 // T is the input/output type, S is the fast arithmetics type, Div is a division method
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata1 = (T**)in->data;
@@ -66,7 +66,7 @@
 }
 
 // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata = (T**)frame->data;

Line 0 Link Here

(-)akode-plugins-jack/files/patch-akode-lib-fast_resampler.cpp (+11 lines)
	1	--- akode/lib/fast_resampler.cpp-orig 2006-05-26 13:37:17.000000000 -0500
	2	+++ akode/lib/fast_resampler.cpp 2013-09-19 08:54:51.000000000 -0500
	3	@@ -37,7 +37,7 @@
	4	// A fast resampling by linear interpolation
	5	// I assume you know binary arithmetics and convertions if you're reading this
	6	// T is the input/output type, Arithm defines the used arithmetic
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
	10	{
	11	unsigned long vt_pos_start = 0; // virtual positions of new sample

Line 0 Link Here

(-)akode-plugins-jack/files/patch-akode-lib-magic.cpp (+10 lines)
	1	--- akode/lib/magic.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/magic.cpp 2013-09-19 08:08:58.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "magic.h"
	5	#include "file.h"
	6	#include <iostream>
	7	+#include <cstring>
	8	using std::cerr;
	9
	10	namespace aKode {

Line 0 Link Here

(-)akode-plugins-jack/files/patch-akode-lib-player.cpp (+10 lines)
	1	--- akode/lib/player.cpp-orig 2006-11-05 08:37:48.000000000 -0600
	2	+++ akode/lib/player.cpp 2013-09-19 08:06:37.000000000 -0500
	3	@@ -21,6 +21,7 @@
	4	#include <pthread.h>
	5	#include <semaphore.h>
	6	#include <assert.h>
	7	+#include <cstring>
	8
	9	#include "audioframe.h"
	10	#include "audiobuffer.h"

Line 0 Link Here

(-)akode-plugins-jack/files/patch-akode-lib-volumefilter.cpp (+11 lines)
	1	--- akode/lib/volumefilter.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/volumefilter.cpp 2013-09-19 08:56:37.000000000 -0500
	3	@@ -29,7 +29,7 @@
	4	VolumeFilter::VolumeFilter() : m_volume(0) {}
	5
	6	// T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
	10	{
	11	T indata = (T)in->data;

Lines 24-30 Link Here

(-)akode-plugins-mpc/Makefile (-1 lines)
24	USE_AUTOTOOLS= libltdl	24	USE_AUTOTOOLS= libltdl
25	USE_AUTOTOOLS= libtool	25	USE_AUTOTOOLS= libtool
26	USE_BZIP2= yes	26	USE_BZIP2= yes
27	USE_GCC= any
28	WRKSRC= ${WRKDIR}/akode-${PORTVERSION}	27	WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
29	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
30		29

Line 0 Link Here

(-)akode-plugins-mpc/files/patch-akode-lib-auto_sink.cpp (+10 lines)
	1	--- akode/lib/auto_sink.cpp-orig 2005-10-26 08:50:29.000000000 -0500
	2	+++ akode/lib/auto_sink.cpp 2013-09-19 03:25:47.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "auto_sink.h"
	5
	6	#include <iostream>
	7	+#include <cstdlib>
	8
	9	namespace aKode {
	10

Line 0 Link Here

(-)akode-plugins-mpc/files/patch-akode-lib-converter.cpp (+11 lines)
	1	--- akode/lib/converter.cpp-orig 2006-07-22 11:35:31.000000000 -0500
	2	+++ akode/lib/converter.cpp 2013-09-19 08:49:30.000000000 -0500
	3	@@ -26,7 +26,7 @@
	4
	5	Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
	6
	7	-template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
	8	+template<typename T, typename S, template<typename U> class ArithmT, template<typename U> class ArithmS>
	9	static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
	10	{
	11	AudioConfiguration config = *in;




--- akode/lib/crossfader.cpp-orig	2005-10-20 15:47:17.000000000 -0500
+++ akode/lib/crossfader.cpp	2013-09-19 08:52:46.000000000 -0500
@@ -27,7 +27,7 @@
 CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
 
 // T is the input/output type, S is the fast arithmetics type, Div is a division method
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata1 = (T**)in->data;
@@ -66,7 +66,7 @@
 }
 
 // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata = (T**)frame->data;

Line 0 Link Here

(-)akode-plugins-mpc/files/patch-akode-lib-fast_resampler.cpp (+11 lines)
	1	--- akode/lib/fast_resampler.cpp-orig 2006-05-26 13:37:17.000000000 -0500
	2	+++ akode/lib/fast_resampler.cpp 2013-09-19 08:54:51.000000000 -0500
	3	@@ -37,7 +37,7 @@
	4	// A fast resampling by linear interpolation
	5	// I assume you know binary arithmetics and convertions if you're reading this
	6	// T is the input/output type, Arithm defines the used arithmetic
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
	10	{
	11	unsigned long vt_pos_start = 0; // virtual positions of new sample

Line 0 Link Here

(-)akode-plugins-mpc/files/patch-akode-lib-magic.cpp (+10 lines)
	1	--- akode/lib/magic.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/magic.cpp 2013-09-19 08:08:58.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "magic.h"
	5	#include "file.h"
	6	#include <iostream>
	7	+#include <cstring>
	8	using std::cerr;
	9
	10	namespace aKode {

Line 0 Link Here

(-)akode-plugins-mpc/files/patch-akode-lib-player.cpp (+10 lines)
	1	--- akode/lib/player.cpp-orig 2006-11-05 08:37:48.000000000 -0600
	2	+++ akode/lib/player.cpp 2013-09-19 08:06:37.000000000 -0500
	3	@@ -21,6 +21,7 @@
	4	#include <pthread.h>
	5	#include <semaphore.h>
	6	#include <assert.h>
	7	+#include <cstring>
	8
	9	#include "audioframe.h"
	10	#include "audiobuffer.h"

Line 0 Link Here

(-)akode-plugins-mpc/files/patch-akode-lib-volumefilter.cpp (+11 lines)
	1	--- akode/lib/volumefilter.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/volumefilter.cpp 2013-09-19 08:56:37.000000000 -0500
	3	@@ -29,7 +29,7 @@
	4	VolumeFilter::VolumeFilter() : m_volume(0) {}
	5
	6	// T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
	10	{
	11	T indata = (T)in->data;

Lines 26-32 Link Here

(-)akode-plugins-mpeg/Makefile (-1 lines)
26	USE_AUTOTOOLS= libltdl	26	USE_AUTOTOOLS= libltdl
27	USE_AUTOTOOLS= libtool	27	USE_AUTOTOOLS= libtool
28	USE_BZIP2= yes	28	USE_BZIP2= yes
29	USE_GCC= any
30	WRKSRC= ${WRKDIR}/akode-${PORTVERSION}	29	WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
31	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
32		31

Line 0 Link Here

(-)akode-plugins-mpeg/files/patch-akode-lib-auto_sink.cpp (+10 lines)
	1	--- akode/lib/auto_sink.cpp-orig 2005-10-26 08:50:29.000000000 -0500
	2	+++ akode/lib/auto_sink.cpp 2013-09-19 03:25:47.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "auto_sink.h"
	5
	6	#include <iostream>
	7	+#include <cstdlib>
	8
	9	namespace aKode {
	10

Line 0 Link Here

(-)akode-plugins-mpeg/files/patch-akode-lib-converter.cpp (+11 lines)
	1	--- akode/lib/converter.cpp-orig 2006-07-22 11:35:31.000000000 -0500
	2	+++ akode/lib/converter.cpp 2013-09-19 08:49:30.000000000 -0500
	3	@@ -26,7 +26,7 @@
	4
	5	Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
	6
	7	-template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
	8	+template<typename T, typename S, template<typename U> class ArithmT, template<typename U> class ArithmS>
	9	static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
	10	{
	11	AudioConfiguration config = *in;




--- akode/lib/crossfader.cpp-orig	2005-10-20 15:47:17.000000000 -0500
+++ akode/lib/crossfader.cpp	2013-09-19 08:52:46.000000000 -0500
@@ -27,7 +27,7 @@
 CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
 
 // T is the input/output type, S is the fast arithmetics type, Div is a division method
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata1 = (T**)in->data;
@@ -66,7 +66,7 @@
 }
 
 // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata = (T**)frame->data;

Line 0 Link Here

(-)akode-plugins-mpeg/files/patch-akode-lib-fast_resampler.cpp (+11 lines)
	1	--- akode/lib/fast_resampler.cpp-orig 2006-05-26 13:37:17.000000000 -0500
	2	+++ akode/lib/fast_resampler.cpp 2013-09-19 08:54:51.000000000 -0500
	3	@@ -37,7 +37,7 @@
	4	// A fast resampling by linear interpolation
	5	// I assume you know binary arithmetics and convertions if you're reading this
	6	// T is the input/output type, Arithm defines the used arithmetic
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
	10	{
	11	unsigned long vt_pos_start = 0; // virtual positions of new sample

Line 0 Link Here

(-)akode-plugins-mpeg/files/patch-akode-lib-magic.cpp (+10 lines)
	1	--- akode/lib/magic.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/magic.cpp 2013-09-19 08:08:58.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "magic.h"
	5	#include "file.h"
	6	#include <iostream>
	7	+#include <cstring>
	8	using std::cerr;
	9
	10	namespace aKode {

Line 0 Link Here

(-)akode-plugins-mpeg/files/patch-akode-lib-player.cpp (+10 lines)
	1	--- akode/lib/player.cpp-orig 2006-11-05 08:37:48.000000000 -0600
	2	+++ akode/lib/player.cpp 2013-09-19 08:06:37.000000000 -0500
	3	@@ -21,6 +21,7 @@
	4	#include <pthread.h>
	5	#include <semaphore.h>
	6	#include <assert.h>
	7	+#include <cstring>
	8
	9	#include "audioframe.h"
	10	#include "audiobuffer.h"

Line 0 Link Here

(-)akode-plugins-mpeg/files/patch-akode-lib-volumefilter.cpp (+11 lines)
	1	--- akode/lib/volumefilter.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/volumefilter.cpp 2013-09-19 08:56:37.000000000 -0500
	3	@@ -29,7 +29,7 @@
	4	VolumeFilter::VolumeFilter() : m_volume(0) {}
	5
	6	// T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
	10	{
	11	T indata = (T)in->data;

Lines 24-30 Link Here

(-)akode-plugins-oss/Makefile (-1 lines)
24	USE_AUTOTOOLS= libltdl	24	USE_AUTOTOOLS= libltdl
25	USE_AUTOTOOLS= libtool	25	USE_AUTOTOOLS= libtool
26	USE_BZIP2= yes	26	USE_BZIP2= yes
27	USE_GCC= any
28	WRKSRC= ${WRKDIR}/akode-${PORTVERSION}	27	WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
29	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
30		29

Line 0 Link Here

(-)akode-plugins-oss/files/patch-akode-lib-auto_sink.cpp (+10 lines)
	1	--- akode/lib/auto_sink.cpp-orig 2005-10-26 08:50:29.000000000 -0500
	2	+++ akode/lib/auto_sink.cpp 2013-09-19 03:25:47.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "auto_sink.h"
	5
	6	#include <iostream>
	7	+#include <cstdlib>
	8
	9	namespace aKode {
	10

Line 0 Link Here

(-)akode-plugins-oss/files/patch-akode-lib-converter.cpp (+11 lines)
	1	--- akode/lib/converter.cpp-orig 2006-07-22 11:35:31.000000000 -0500
	2	+++ akode/lib/converter.cpp 2013-09-19 08:49:30.000000000 -0500
	3	@@ -26,7 +26,7 @@
	4
	5	Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
	6
	7	-template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
	8	+template<typename T, typename S, template<typename U> class ArithmT, template<typename U> class ArithmS>
	9	static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
	10	{
	11	AudioConfiguration config = *in;




--- akode/lib/crossfader.cpp-orig	2005-10-20 15:47:17.000000000 -0500
+++ akode/lib/crossfader.cpp	2013-09-19 08:52:46.000000000 -0500
@@ -27,7 +27,7 @@
 CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
 
 // T is the input/output type, S is the fast arithmetics type, Div is a division method
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata1 = (T**)in->data;
@@ -66,7 +66,7 @@
 }
 
 // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata = (T**)frame->data;

Line 0 Link Here

(-)akode-plugins-oss/files/patch-akode-lib-fast_resampler.cpp (+11 lines)
	1	--- akode/lib/fast_resampler.cpp-orig 2006-05-26 13:37:17.000000000 -0500
	2	+++ akode/lib/fast_resampler.cpp 2013-09-19 08:54:51.000000000 -0500
	3	@@ -37,7 +37,7 @@
	4	// A fast resampling by linear interpolation
	5	// I assume you know binary arithmetics and convertions if you're reading this
	6	// T is the input/output type, Arithm defines the used arithmetic
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
	10	{
	11	unsigned long vt_pos_start = 0; // virtual positions of new sample

Line 0 Link Here

(-)akode-plugins-oss/files/patch-akode-lib-magic.cpp (+10 lines)
	1	--- akode/lib/magic.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/magic.cpp 2013-09-19 08:08:58.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "magic.h"
	5	#include "file.h"
	6	#include <iostream>
	7	+#include <cstring>
	8	using std::cerr;
	9
	10	namespace aKode {

Line 0 Link Here

(-)akode-plugins-oss/files/patch-akode-lib-player.cpp (+10 lines)
	1	--- akode/lib/player.cpp-orig 2006-11-05 08:37:48.000000000 -0600
	2	+++ akode/lib/player.cpp 2013-09-19 08:06:37.000000000 -0500
	3	@@ -21,6 +21,7 @@
	4	#include <pthread.h>
	5	#include <semaphore.h>
	6	#include <assert.h>
	7	+#include <cstring>
	8
	9	#include "audioframe.h"
	10	#include "audiobuffer.h"

Line 0 Link Here

(-)akode-plugins-oss/files/patch-akode-lib-volumefilter.cpp (+11 lines)
	1	--- akode/lib/volumefilter.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/volumefilter.cpp 2013-09-19 08:56:37.000000000 -0500
	3	@@ -29,7 +29,7 @@
	4	VolumeFilter::VolumeFilter() : m_volume(0) {}
	5
	6	// T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
	10	{
	11	T indata = (T)in->data;

Lines 26-32 Link Here

(-)akode-plugins-resampler/Makefile (-1 lines)
26	USE_AUTOTOOLS= libltdl	26	USE_AUTOTOOLS= libltdl
27	USE_AUTOTOOLS= libtool	27	USE_AUTOTOOLS= libtool
28	USE_BZIP2= yes	28	USE_BZIP2= yes
29	USE_GCC= any
30	WRKSRC= ${WRKDIR}/akode-${PORTVERSION}	29	WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
31	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
32		31

Line 0 Link Here

(-)akode-plugins-resampler/files/patch-akode-lib-auto_sink.cpp (+10 lines)
	1	--- akode/lib/auto_sink.cpp-orig 2005-10-26 08:50:29.000000000 -0500
	2	+++ akode/lib/auto_sink.cpp 2013-09-19 03:25:47.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "auto_sink.h"
	5
	6	#include <iostream>
	7	+#include <cstdlib>
	8
	9	namespace aKode {
	10

Line 0 Link Here

(-)akode-plugins-resampler/files/patch-akode-lib-converter.cpp (+11 lines)
	1	--- akode/lib/converter.cpp-orig 2006-07-22 11:35:31.000000000 -0500
	2	+++ akode/lib/converter.cpp 2013-09-19 08:49:30.000000000 -0500
	3	@@ -26,7 +26,7 @@
	4
	5	Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
	6
	7	-template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
	8	+template<typename T, typename S, template<typename U> class ArithmT, template<typename U> class ArithmS>
	9	static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
	10	{
	11	AudioConfiguration config = *in;




--- akode/lib/crossfader.cpp-orig	2005-10-20 15:47:17.000000000 -0500
+++ akode/lib/crossfader.cpp	2013-09-19 08:52:46.000000000 -0500
@@ -27,7 +27,7 @@
 CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
 
 // T is the input/output type, S is the fast arithmetics type, Div is a division method
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata1 = (T**)in->data;
@@ -66,7 +66,7 @@
 }
 
 // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata = (T**)frame->data;

Line 0 Link Here

(-)akode-plugins-resampler/files/patch-akode-lib-fast_resampler.cpp (+11 lines)
	1	--- akode/lib/fast_resampler.cpp-orig 2006-05-26 13:37:17.000000000 -0500
	2	+++ akode/lib/fast_resampler.cpp 2013-09-19 08:54:51.000000000 -0500
	3	@@ -37,7 +37,7 @@
	4	// A fast resampling by linear interpolation
	5	// I assume you know binary arithmetics and convertions if you're reading this
	6	// T is the input/output type, Arithm defines the used arithmetic
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
	10	{
	11	unsigned long vt_pos_start = 0; // virtual positions of new sample

Line 0 Link Here

(-)akode-plugins-resampler/files/patch-akode-lib-magic.cpp (+10 lines)
	1	--- akode/lib/magic.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/magic.cpp 2013-09-19 08:08:58.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "magic.h"
	5	#include "file.h"
	6	#include <iostream>
	7	+#include <cstring>
	8	using std::cerr;
	9
	10	namespace aKode {

Line 0 Link Here

(-)akode-plugins-resampler/files/patch-akode-lib-player.cpp (+10 lines)
	1	--- akode/lib/player.cpp-orig 2006-11-05 08:37:48.000000000 -0600
	2	+++ akode/lib/player.cpp 2013-09-19 08:06:37.000000000 -0500
	3	@@ -21,6 +21,7 @@
	4	#include <pthread.h>
	5	#include <semaphore.h>
	6	#include <assert.h>
	7	+#include <cstring>
	8
	9	#include "audioframe.h"
	10	#include "audiobuffer.h"

Line 0 Link Here

(-)akode-plugins-resampler/files/patch-akode-lib-volumefilter.cpp (+11 lines)
	1	--- akode/lib/volumefilter.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/volumefilter.cpp 2013-09-19 08:56:37.000000000 -0500
	3	@@ -29,7 +29,7 @@
	4	VolumeFilter::VolumeFilter() : m_volume(0) {}
	5
	6	// T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
	10	{
	11	T indata = (T)in->data;

Lines 30-36 Link Here

(-)akode-plugins-xiph/Makefile (-1 lines)
30	USE_AUTOTOOLS= libltdl	30	USE_AUTOTOOLS= libltdl
31	USE_AUTOTOOLS= libtool	31	USE_AUTOTOOLS= libtool
32	USE_BZIP2= yes	32	USE_BZIP2= yes
33	USE_GCC= any
34	WRKSRC= ${WRKDIR}/akode-${PORTVERSION}	33	WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
35	USE_LDCONFIG= yes	34	USE_LDCONFIG= yes
36		35

Line 0 Link Here

(-)akode-plugins-xiph/files/patch-akode-lib-auto_sink.cpp (+10 lines)
	1	--- akode/lib/auto_sink.cpp-orig 2005-10-26 08:50:29.000000000 -0500
	2	+++ akode/lib/auto_sink.cpp 2013-09-19 03:25:47.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "auto_sink.h"
	5
	6	#include <iostream>
	7	+#include <cstdlib>
	8
	9	namespace aKode {
	10

Line 0 Link Here

(-)akode-plugins-xiph/files/patch-akode-lib-converter.cpp (+11 lines)
	1	--- akode/lib/converter.cpp-orig 2006-07-22 11:35:31.000000000 -0500
	2	+++ akode/lib/converter.cpp 2013-09-19 08:49:30.000000000 -0500
	3	@@ -26,7 +26,7 @@
	4
	5	Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
	6
	7	-template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
	8	+template<typename T, typename S, template<typename U> class ArithmT, template<typename U> class ArithmS>
	9	static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
	10	{
	11	AudioConfiguration config = *in;




--- akode/lib/crossfader.cpp-orig	2005-10-20 15:47:17.000000000 -0500
+++ akode/lib/crossfader.cpp	2013-09-19 08:52:46.000000000 -0500
@@ -27,7 +27,7 @@
 CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
 
 // T is the input/output type, S is the fast arithmetics type, Div is a division method
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata1 = (T**)in->data;
@@ -66,7 +66,7 @@
 }
 
 // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename U> class Arithm>
 static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
 {
     T** indata = (T**)frame->data;

Line 0 Link Here

(-)akode-plugins-xiph/files/patch-akode-lib-fast_resampler.cpp (+11 lines)
	1	--- akode/lib/fast_resampler.cpp-orig 2006-05-26 13:37:17.000000000 -0500
	2	+++ akode/lib/fast_resampler.cpp 2013-09-19 08:54:51.000000000 -0500
	3	@@ -37,7 +37,7 @@
	4	// A fast resampling by linear interpolation
	5	// I assume you know binary arithmetics and convertions if you're reading this
	6	// T is the input/output type, Arithm defines the used arithmetic
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
	10	{
	11	unsigned long vt_pos_start = 0; // virtual positions of new sample

Line 0 Link Here

(-)akode-plugins-xiph/files/patch-akode-lib-magic.cpp (+10 lines)
	1	--- akode/lib/magic.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/magic.cpp 2013-09-19 08:08:58.000000000 -0500
	3	@@ -22,6 +22,7 @@
	4	#include "magic.h"
	5	#include "file.h"
	6	#include <iostream>
	7	+#include <cstring>
	8	using std::cerr;
	9
	10	namespace aKode {

Line 0 Link Here

(-)akode-plugins-xiph/files/patch-akode-lib-player.cpp (+10 lines)
	1	--- akode/lib/player.cpp-orig 2006-11-05 08:37:48.000000000 -0600
	2	+++ akode/lib/player.cpp 2013-09-19 08:06:37.000000000 -0500
	3	@@ -21,6 +21,7 @@
	4	#include <pthread.h>
	5	#include <semaphore.h>
	6	#include <assert.h>
	7	+#include <cstring>
	8
	9	#include "audioframe.h"
	10	#include "audiobuffer.h"

Line 0 Link Here

(-)akode-plugins-xiph/files/patch-akode-lib-volumefilter.cpp (+11 lines)
	1	--- akode/lib/volumefilter.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/volumefilter.cpp 2013-09-19 08:56:37.000000000 -0500
	3	@@ -29,7 +29,7 @@
	4	VolumeFilter::VolumeFilter() : m_volume(0) {}
	5
	6	// T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
	10	{
	11	T indata = (T)in->data;

Return to bug 182283

Lines 19-28 Link Here

(-)akode/Makefile (-3 / +7 lines)
19		19
20	CONFLICTS= kdemultimedia-3.[1-3]*	20	CONFLICTS= kdemultimedia-3.[1-3]*
21		21
22	OPTIONS_DEFINE= FFMPEG JACK MPC MPEG OSS RESAMPLER XIPH	22	OPTIONS_DEFINE= FFMPEG JACK MPC MPEG OSS PULSEAUDIO RESAMPLER XIPH
23	OPTIONS_DEFAULT= MPC MPEG OSS RESAMPLER XIP	23	OPTIONS_DEFAULT= MPC MPEG OSS RESAMPLER XIPH
24		24
25	MPC_DESC= Monkey's Audio decoder plugin	25	MPC_DESC= Monkey's Audio decoder plugin
		26	MPEG_DESC= MPEG Audio decoder plugin
26	RESAMPLER_DESC= Resampler processing plugin	27	RESAMPLER_DESC= Resampler processing plugin
27	XIPH_DESC= FLAC/Speex/Vorbis decoder plugin	28	XIPH_DESC= FLAC/Speex/Vorbis decoder plugin
28		29
Lines 29-35 Link Here
29	USES= gmake	30	USES= gmake
30	USE_AUTOTOOLS= libltdl libtool	31	USE_AUTOTOOLS= libltdl libtool
31	USE_BZIP2= yes	32	USE_BZIP2= yes
32	USE_GCC= any
33	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	33	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
34	USE_LDCONFIG= yes	34	USE_LDCONFIG= yes
35		35
Lines 59-64 Link Here
59	RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_oss_sink.so:${PORTSDIR}/audio/akode-plugins-oss	59	RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_oss_sink.so:${PORTSDIR}/audio/akode-plugins-oss
60	.endif	60	.endif
61		61
		62	.if ${PORT_OPTIONS:MPULSEAUDIO}
		63	RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_polyp_sink.so:${PORTSDIR}/audio/akode-plugins-pulseaudio
		64	.endif
		65
62	.if ${PORT_OPTIONS:MRESAMPLER}	66	.if ${PORT_OPTIONS:MRESAMPLER}
63	RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_src_resampler.so:${PORTSDIR}/audio/akode-plugins-resampler	67	RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_src_resampler.so:${PORTSDIR}/audio/akode-plugins-resampler
64	.endif	68	.endif

Line 0 Link Here

(-)akode/files/patch-akode-lib-crossfader.cpp (+20 lines)
	1	--- akode/lib/crossfader.cpp-orig 2005-10-20 15:47:17.000000000 -0500
	2	+++ akode/lib/crossfader.cpp 2013-09-19 08:52:46.000000000 -0500
	3	@@ -27,7 +27,7 @@
	4	CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {}
	5
	6	// T is the input/output type, S is the fast arithmetics type, Div is a division method
	7	-template<typename T, typename S, template<typename S> class Arithm>
	8	+template<typename T, typename S, template<typename U> class Arithm>
	9	static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
	10	{
	11	T indata1 = (T)in->data;
	12	@@ -66,7 +66,7 @@
	13	}
	14
	15	// T is the input/output type, S is the fast arithmetics type, Arithm defines devisions
	16	-template<typename T, typename S, template<typename S> class Arithm>
	17	+template<typename T, typename S, template<typename U> class Arithm>
	18	static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
	19	{
	20	T indata = (T)frame->data;