Ticket #4804: libs_libmyth-change-pound-define-function-to-generic.2.patch

libs/libmyth/audiooutputbase.cpp

@@ -755 +755 @@
     return true;
 }
 
-#define __APPLY_PRE_AMP(TYPE,MIN,MAX) \
-{ \
-    TYPE *buf = (TYPE *)buffer; \
-    for ( int i = 0; i < samples; ++i ) \
-    { \
-        float f = (float)buf[i] / (float)MAX; \
-        f *= pre_amp_factor; \
-        float a = abs(f); \
-        if ( a > pre_amp_max_output ) pre_amp_max_output = a; \
-        if ( f >= 1.0 ) buf[i] = MAX; \
-        else if ( f <= -1.0 ) buf[i] = MIN; \
-        else buf[i] = (TYPE)round(f*MAX); \
-    } \
+
+template<class AudioDataType>
+void AudioOutputBase::_ApplyPreAmp(AudioDataType* buffer, int samples)
+{
+    if (samples < 0)
+        return;
+
+    for (int i = 0; i < samples; i++)
+    {
+        float f =
+            static_cast<float>(buffer[i])
+            / static_cast<float>(numeric_limits<AudioDataType>::max());
+        f *= pre_amp_factor;
+        float a = abs(f);
+        if (a > pre_amp_max_output) pre_amp_max_output = a;
+        if (f >= 1.0) buffer[i] = numeric_limits<AudioDataType>::max();
+        else if (f <= -1.0) buffer[i] = numeric_limits<AudioDataType>::min();
+        else buffer[i] = static_cast<AudioDataType>(round(f * numeric_limits<AudioDataType>::max()));
+    }
 }
 
 void AudioOutputBase::ApplyPreAmp(void *buffer, int samples, int sample_bytes)
@@ -775 +781 @@
     if ( !pre_amp_enabled ) return;
     // NOTE: This only handles 1, 2 or 4 byte samples.
     if ( sample_bytes == 4 )
-        __APPLY_PRE_AMP(int,INT_MIN,INT_MAX)
+        _ApplyPreAmp<int>((int*)(buffer), samples);
     else if ( sample_bytes == 2 )
-        __APPLY_PRE_AMP(short,SHRT_MIN,SHRT_MAX)
+        _ApplyPreAmp<short>((short*)(buffer), samples);
     else if ( sample_bytes == 1 )
-        __APPLY_PRE_AMP(char,CHAR_MIN,CHAR_MAX)
-
-    return;
+        _ApplyPreAmp<char>((char*)(buffer), samples);
 }
-#undef __APPLY_PRE_AMP
 
 bool AudioOutputBase::AddSamples(char *buffer, int samples, long long timecode)
 {

libs/libmyth/audiooutputbase.h

@@ -106 +106 @@
     int GetAudioData(unsigned char *buffer, int buf_size, bool fill_buffer);
 
     void ApplyPreAmp(void *buffer, int samples, int sample_bytes);
+    template<class AudioDataType>
+    void _ApplyPreAmp(AudioDataType* buffer, int samples);
     void _AddSamples(void *buffer, bool interleaved, int samples, long long timecode);
 
     void OutputAudioLoop(void);