1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
Index: b/akode/lib/converter.cpp
===================================================================
--- a/akode/lib/converter.cpp
+++ b/akode/lib/converter.cpp
@@ -26,7 +26,7 @@
Converter::Converter(int sample_width) : m_sample_width(sample_width) {}
-template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS>
+template<typename T, typename S, template<typename T_Type> class ArithmT, template<typename S_Type> class ArithmS>
static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
{
AudioConfiguration config = *in;
Index: b/akode/lib/crossfader.cpp
===================================================================
--- a/akode/lib/crossfader.cpp
+++ b/akode/lib/crossfader.cpp
@@ -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 S_Type> 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 S_Type> class Arithm>
static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
{
T** indata = (T**)frame->data;
Index: b/akode/lib/fast_resampler.cpp
===================================================================
--- a/akode/lib/fast_resampler.cpp
+++ b/akode/lib/fast_resampler.cpp
@@ -37,7 +37,7 @@
// A fast resampling by linear interpolation
// I assume you know binary arithmetics and convertions if you're reading this
// T is the input/output type, Arithm defines the used arithmetic
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename S_Type> class Arithm>
static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
{
unsigned long vt_pos_start = 0; // virtual positions of new sample
Index: b/akode/lib/volumefilter.cpp
===================================================================
--- a/akode/lib/volumefilter.cpp
+++ b/akode/lib/volumefilter.cpp
@@ -29,7 +29,7 @@
VolumeFilter::VolumeFilter() : m_volume(0) {}
// T is the input/output type, S is the fast arithmetics type, Arithm is a division definition
-template<typename T, typename S, template<typename S> class Arithm>
+template<typename T, typename S, template<typename S_Type> class Arithm>
static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
{
T** indata = (T**)in->data;
|