summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-06-16 19:13:16 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2015-06-16 19:13:16 (GMT)
commitbc4b50acff7062f7155e87c4d337f37dfc5f1fd5 (patch)
treea92ce119b196b3f18ccda39a7bdf16cf2110024e
parent69006eae7f26d3f38c5512a19738656e109fd419 (diff)
downloadakode-bc4b50ac.zip
akode-bc4b50ac.tar.gz
Fix FTBFS with clang
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--akode/lib/converter.cpp2
-rw-r--r--akode/lib/crossfader.cpp4
-rw-r--r--akode/lib/fast_resampler.cpp2
-rw-r--r--akode/lib/volumefilter.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/akode/lib/converter.cpp b/akode/lib/converter.cpp
index 2169868..1a04057 100644
--- a/akode/lib/converter.cpp
+++ b/akode/lib/converter.cpp
@@ -26,7 +26,7 @@ namespace aKode {
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;
diff --git a/akode/lib/crossfader.cpp b/akode/lib/crossfader.cpp
index 8e5b970..cdf9059 100644
--- a/akode/lib/crossfader.cpp
+++ b/akode/lib/crossfader.cpp
@@ -27,7 +27,7 @@ namespace aKode {
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 @@ static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
}
// 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;
diff --git a/akode/lib/fast_resampler.cpp b/akode/lib/fast_resampler.cpp
index e666e15..1936609 100644
--- a/akode/lib/fast_resampler.cpp
+++ b/akode/lib/fast_resampler.cpp
@@ -37,7 +37,7 @@ FastResampler::FastResampler() : speed(1.0), sample_rate(44100) {}
// 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
diff --git a/akode/lib/volumefilter.cpp b/akode/lib/volumefilter.cpp
index c053453..60c123c 100644
--- a/akode/lib/volumefilter.cpp
+++ b/akode/lib/volumefilter.cpp
@@ -29,7 +29,7 @@ namespace aKode {
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;