gfxdev
/
caudio
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Activity

Merge pull request #28 from prettyv/master 

Fix compilation with CAUDIO_BUILD_EAX_PLUGIN
This commit is contained in:
Raynaldo Rivera 2014-09-01 18:17:16 -07:00
parent 9a397582a2 9dabaaa560
commit 6d570357a4
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cAudio/src/cAudioEffects.cpp
View File

@ -1,5 +1,5 @@
// Copyright (c) 2008-2011 Raynaldo (Wildicv) Rivera, Joshua (Dark_Kilauea) Jones, Murat (wolfmanfx) Sari // Copyright (c) 2008-2011 Raynaldo (Wildicv) Rivera, Joshua (Dark_Kilauea) Jones, Murat (wolfmanfx) Sari
// This file is part of the "cAudio Engine" // This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h // For conditions of distribution and use, see copyright notice in cAudio.h
#include "cAudioEffects.h" #include "cAudioEffects.h"
@ -68,7 +68,7 @@ namespace cAudio
bool cAudioEffects::addEAXReverbEffectPreset(const char* name, const sEAXReverbParameters& setting) bool cAudioEffects::addEAXReverbEffectPreset(const char* name, const sEAXReverbParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
EAXReverbPresets[safeName] = setting; EAXReverbPresets[safeName] = setting;
return true; return true;
} }
@ -76,7 +76,7 @@ namespace cAudio
bool cAudioEffects::addReverbEffectPreset(const char* name, const sReverbParameters& setting) bool cAudioEffects::addReverbEffectPreset(const char* name, const sReverbParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
ReverbPresets[safeName] = setting; ReverbPresets[safeName] = setting;
return true; return true;
} }
@ -84,7 +84,7 @@ namespace cAudio
bool cAudioEffects::addChorusEffectPreset(const char* name, const sChorusParameters& setting) bool cAudioEffects::addChorusEffectPreset(const char* name, const sChorusParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
ChorusPresets[safeName] = setting; ChorusPresets[safeName] = setting;
return true; return true;
} }
@ -92,7 +92,7 @@ namespace cAudio
bool cAudioEffects::addDistortionEffectPreset(const char* name, const sDistortionParameters& setting) bool cAudioEffects::addDistortionEffectPreset(const char* name, const sDistortionParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
DistortionPresets[safeName] = setting; DistortionPresets[safeName] = setting;
return true; return true;
} }
@ -100,7 +100,7 @@ namespace cAudio
bool cAudioEffects::addEchoEffectPreset(const char* name, const sEchoParameters& setting) bool cAudioEffects::addEchoEffectPreset(const char* name, const sEchoParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
EchoPresets[safeName] = setting; EchoPresets[safeName] = setting;
return true; return true;
} }
@ -108,7 +108,7 @@ namespace cAudio
bool cAudioEffects::addFlangerEffectPreset(const char* name, const sFlangerParameters& setting) bool cAudioEffects::addFlangerEffectPreset(const char* name, const sFlangerParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
FlangerPresets[safeName] = setting; FlangerPresets[safeName] = setting;
return true; return true;
} }
@ -116,7 +116,7 @@ namespace cAudio
bool cAudioEffects::addFrequencyShiftEffectPreset(const char* name, const sFrequencyShiftParameters& setting) bool cAudioEffects::addFrequencyShiftEffectPreset(const char* name, const sFrequencyShiftParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
FrequencyShiftPresets[safeName] = setting; FrequencyShiftPresets[safeName] = setting;
return true; return true;
} }
@ -124,7 +124,7 @@ namespace cAudio
bool cAudioEffects::addVocalMorpherEffectPreset(const char* name, const sVocalMorpherParameters& setting) bool cAudioEffects::addVocalMorpherEffectPreset(const char* name, const sVocalMorpherParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
VocalMorpherPresets[safeName] = setting; VocalMorpherPresets[safeName] = setting;
return true; return true;
} }
@ -132,7 +132,7 @@ namespace cAudio
bool cAudioEffects::addPitchShifterEffectPreset(const char* name, const sPitchShifterParameters& setting) bool cAudioEffects::addPitchShifterEffectPreset(const char* name, const sPitchShifterParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
PitchShifterPresets[safeName] = setting; PitchShifterPresets[safeName] = setting;
return true; return true;
} }
@ -140,7 +140,7 @@ namespace cAudio
bool cAudioEffects::addRingModulatorEffectPreset(const char* name, const sRingModulatorParameters& setting) bool cAudioEffects::addRingModulatorEffectPreset(const char* name, const sRingModulatorParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
RingModulatorPresets[safeName] = setting; RingModulatorPresets[safeName] = setting;
return true; return true;
} }
@ -148,7 +148,7 @@ namespace cAudio
bool cAudioEffects::addAutowahEffectPreset(const char* name, const sAutowahParameters& setting) bool cAudioEffects::addAutowahEffectPreset(const char* name, const sAutowahParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
AutowahPresets[safeName] = setting; AutowahPresets[safeName] = setting;
return true; return true;
} }
@ -156,7 +156,7 @@ namespace cAudio
bool cAudioEffects::addCompressorEffectPreset(const char* name, const sCompressorParameters& setting) bool cAudioEffects::addCompressorEffectPreset(const char* name, const sCompressorParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
CompressorPresets[safeName] = setting; CompressorPresets[safeName] = setting;
return true; return true;
} }
@ -164,7 +164,7 @@ namespace cAudio
bool cAudioEffects::addEqualizerEffectPreset(const char* name, const sEqualizerParameters& setting) bool cAudioEffects::addEqualizerEffectPreset(const char* name, const sEqualizerParameters& setting)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
EqualizerPresets[safeName] = setting; EqualizerPresets[safeName] = setting;
return true; return true;
} }
@ -172,7 +172,7 @@ namespace cAudio
sEAXReverbParameters cAudioEffects::getEAXReverbEffectPreset(const char* name) sEAXReverbParameters cAudioEffects::getEAXReverbEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sEAXReverbParameters>::Type::iterator it = EAXReverbPresets.find(safeName); cAudioMap<cAudioString, sEAXReverbParameters>::Type::iterator it = EAXReverbPresets.find(safeName);
if(it != EAXReverbPresets.end()) if(it != EAXReverbPresets.end())
{ {
@ -184,7 +184,7 @@ namespace cAudio
sReverbParameters cAudioEffects::getReverbEffectPreset(const char* name) sReverbParameters cAudioEffects::getReverbEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sReverbParameters>::Type::iterator it = ReverbPresets.find(safeName); cAudioMap<cAudioString, sReverbParameters>::Type::iterator it = ReverbPresets.find(safeName);
if(it != ReverbPresets.end()) if(it != ReverbPresets.end())
{ {
@ -196,7 +196,7 @@ namespace cAudio
sChorusParameters cAudioEffects::getChorusEffectPreset(const char* name) sChorusParameters cAudioEffects::getChorusEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sChorusParameters>::Type::iterator it = ChorusPresets.find(safeName); cAudioMap<cAudioString, sChorusParameters>::Type::iterator it = ChorusPresets.find(safeName);
if(it != ChorusPresets.end()) if(it != ChorusPresets.end())
{ {
@ -208,7 +208,7 @@ namespace cAudio
sDistortionParameters cAudioEffects::getDistortionEffectPreset(const char* name) sDistortionParameters cAudioEffects::getDistortionEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sDistortionParameters>::Type::iterator it = DistortionPresets.find(safeName); cAudioMap<cAudioString, sDistortionParameters>::Type::iterator it = DistortionPresets.find(safeName);
if(it != DistortionPresets.end()) if(it != DistortionPresets.end())
{ {
@ -220,7 +220,7 @@ namespace cAudio
sEchoParameters cAudioEffects::getEchoEffectPreset(const char* name) sEchoParameters cAudioEffects::getEchoEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sEchoParameters>::Type::iterator it = EchoPresets.find(safeName); cAudioMap<cAudioString, sEchoParameters>::Type::iterator it = EchoPresets.find(safeName);
if(it != EchoPresets.end()) if(it != EchoPresets.end())
{ {
@ -232,7 +232,7 @@ namespace cAudio
sFlangerParameters cAudioEffects::getFlangerEffectPreset(const char* name) sFlangerParameters cAudioEffects::getFlangerEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sFlangerParameters>::Type::iterator it = FlangerPresets.find(safeName); cAudioMap<cAudioString, sFlangerParameters>::Type::iterator it = FlangerPresets.find(safeName);
if(it != FlangerPresets.end()) if(it != FlangerPresets.end())
{ {
@ -244,7 +244,7 @@ namespace cAudio
sFrequencyShiftParameters cAudioEffects::getFrequencyShiftEffectPreset(const char* name) sFrequencyShiftParameters cAudioEffects::getFrequencyShiftEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sFrequencyShiftParameters>::Type::iterator it = FrequencyShiftPresets.find(safeName); cAudioMap<cAudioString, sFrequencyShiftParameters>::Type::iterator it = FrequencyShiftPresets.find(safeName);
if(it != FrequencyShiftPresets.end()) if(it != FrequencyShiftPresets.end())
{ {
@ -256,7 +256,7 @@ namespace cAudio
sVocalMorpherParameters cAudioEffects::getVocalMorpherEffectPreset(const char* name) sVocalMorpherParameters cAudioEffects::getVocalMorpherEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sVocalMorpherParameters>::Type::iterator it = VocalMorpherPresets.find(safeName); cAudioMap<cAudioString, sVocalMorpherParameters>::Type::iterator it = VocalMorpherPresets.find(safeName);
if(it != VocalMorpherPresets.end()) if(it != VocalMorpherPresets.end())
{ {
@ -268,7 +268,7 @@ namespace cAudio
sPitchShifterParameters cAudioEffects::getPitchShifterEffectPreset(const char* name) sPitchShifterParameters cAudioEffects::getPitchShifterEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sPitchShifterParameters>::Type::iterator it = PitchShifterPresets.find(safeName); cAudioMap<cAudioString, sPitchShifterParameters>::Type::iterator it = PitchShifterPresets.find(safeName);
if(it != PitchShifterPresets.end()) if(it != PitchShifterPresets.end())
{ {
@ -280,7 +280,7 @@ namespace cAudio
sRingModulatorParameters cAudioEffects::getRingModulatorEffectPreset(const char* name) sRingModulatorParameters cAudioEffects::getRingModulatorEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sRingModulatorParameters>::Type::iterator it = RingModulatorPresets.find(safeName); cAudioMap<cAudioString, sRingModulatorParameters>::Type::iterator it = RingModulatorPresets.find(safeName);
if(it != RingModulatorPresets.end()) if(it != RingModulatorPresets.end())
{ {
@ -292,7 +292,7 @@ namespace cAudio
sAutowahParameters cAudioEffects::getAutowahEffectPreset(const char* name) sAutowahParameters cAudioEffects::getAutowahEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sAutowahParameters>::Type::iterator it = AutowahPresets.find(safeName); cAudioMap<cAudioString, sAutowahParameters>::Type::iterator it = AutowahPresets.find(safeName);
if(it != AutowahPresets.end()) if(it != AutowahPresets.end())
{ {
@ -304,7 +304,7 @@ namespace cAudio
sCompressorParameters cAudioEffects::getCompressorEffectPreset(const char* name) sCompressorParameters cAudioEffects::getCompressorEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sCompressorParameters>::Type::iterator it = CompressorPresets.find(safeName); cAudioMap<cAudioString, sCompressorParameters>::Type::iterator it = CompressorPresets.find(safeName);
if(it != CompressorPresets.end()) if(it != CompressorPresets.end())
{ {
@ -316,7 +316,7 @@ namespace cAudio
sEqualizerParameters cAudioEffects::getEqualizerEffectPreset(const char* name) sEqualizerParameters cAudioEffects::getEqualizerEffectPreset(const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
cAudioMap<cAudioString, sEqualizerParameters>::Type::iterator it = EqualizerPresets.find(safeName); cAudioMap<cAudioString, sEqualizerParameters>::Type::iterator it = EqualizerPresets.find(safeName);
if(it != EqualizerPresets.end()) if(it != EqualizerPresets.end())
{ {
@ -328,7 +328,7 @@ namespace cAudio
void cAudioEffects::removeEffectPreset(const EffectTypes& type, const char* name) void cAudioEffects::removeEffectPreset(const EffectTypes& type, const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
switch(type) switch(type)
{ {
case EET_EAX_REVERB: case EET_EAX_REVERB:
@ -378,7 +378,7 @@ namespace cAudio
bool cAudioEffects::isEffectPresetRegistered(const EffectTypes& type, const char* name) bool cAudioEffects::isEffectPresetRegistered(const EffectTypes& type, const char* name)
{ {
cAudioMutexBasicLock lock(Mutex); cAudioMutexBasicLock lock(Mutex);
cAudioString safeName = safeCStr(name); cAudioString safeName = fromUTF8(name);
switch(type) switch(type)
{ {
case EET_EAX_REVERB: case EET_EAX_REVERB: