Fix FTBFS with clang

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 10 years ago
parent 69006eae7f
commit bc4b50acff

@ -26,7 +26,7 @@ namespace aKode {
Converter::Converter(int sample_width) : m_sample_width(sample_width) {} 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) static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width)
{ {
AudioConfiguration config = *in; AudioConfiguration config = *in;

@ -27,7 +27,7 @@ namespace aKode {
CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {} 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 // 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) static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame)
{ {
T** indata1 = (T**)in->data; 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 // 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) static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame)
{ {
T** indata = (T**)frame->data; T** indata = (T**)frame->data;

@ -37,7 +37,7 @@ FastResampler::FastResampler() : speed(1.0), sample_rate(44100) {}
// A fast resampling by linear interpolation // A fast resampling by linear interpolation
// I assume you know binary arithmetics and convertions if you're reading this // I assume you know binary arithmetics and convertions if you're reading this
// T is the input/output type, Arithm defines the used arithmetic // 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) static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate)
{ {
unsigned long vt_pos_start = 0; // virtual positions of new sample unsigned long vt_pos_start = 0; // virtual positions of new sample

@ -29,7 +29,7 @@ namespace aKode {
VolumeFilter::VolumeFilter() : m_volume(0) {} VolumeFilter::VolumeFilter() : m_volume(0) {}
// T is the input/output type, S is the fast arithmetics type, Arithm is a division definition // 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) static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume)
{ {
T** indata = (T**)in->data; T** indata = (T**)in->data;

Loading…
Cancel
Save