LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Very minor style cleanup

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-02-11 15:47:30 -04:00
parent 218950fe76
commit 7b6e1523b4
6 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/Source.h
+2 -2
View File
@@ -109,12 +109,12 @@ public:
virtual int getChannels() const = 0;
virtual bool setFilter(std::map<Filter::Parameter, float> &params) = 0;
virtual bool setFilter(const std::map<Filter::Parameter, float> &params) = 0;
virtual bool setFilter() = 0;
virtual bool getFilter(std::map<Filter::Parameter, float> &params) = 0;
virtual bool setSceneEffect(int slot, int effect) = 0;
virtual bool setSceneEffect(int slot, int effect, std::map<Filter::Parameter, float> &params) = 0;
virtual bool setSceneEffect(int slot, int effect, const std::map<Filter::Parameter, float> &params) = 0;
virtual bool setSceneEffect(int slot) = 0;
virtual bool getSceneEffect(int slot, int &effect, std::map<Filter::Parameter, float> &params) = 0;
src/modules/audio/null/Source.cpp
+2 -2
View File
@@ -239,7 +239,7 @@ bool Source::queue(void *, size_t, int, int, int)
return false;
}
bool Source::setFilter(std::map<Filter::Parameter, float> &)
bool Source::setFilter(const std::map<Filter::Parameter, float> &)
{
return false;
}
@@ -259,7 +259,7 @@ bool Source::setSceneEffect(int, int)
return false;
}
bool Source::setSceneEffect(int, int, std::map<Filter::Parameter, float> &)
bool Source::setSceneEffect(int, int, const std::map<Filter::Parameter, float> &)
{
return false;
}
src/modules/audio/null/Source.h
+2 -2
View File
@@ -82,12 +82,12 @@ public:
virtual int getFreeBufferCount() const;
virtual bool queue(void *data, size_t length, int dataSampleRate, int dataBitDepth, int dataChannels);
virtual bool setFilter(std::map<Filter::Parameter, float> &params);
virtual bool setFilter(const std::map<Filter::Parameter, float> &params);
virtual bool setFilter();
virtual bool getFilter(std::map<Filter::Parameter, float> &params);
virtual bool setSceneEffect(int slot, int effect);
virtual bool setSceneEffect(int slot, int effect, std::map<Filter::Parameter, float> &params);
virtual bool setSceneEffect(int slot, int effect, const std::map<Filter::Parameter, float> &params);
virtual bool setSceneEffect(int slot);
virtual bool getSceneEffect(int slot, int &effect, std::map<Filter::Parameter, float> &params);
src/modules/audio/openal/Audio.cpp
+12 -1
View File
@@ -155,11 +155,15 @@ Audio::Audio()
{
for (auto c : capture)
delete c;
#ifdef ALC_EXT_EFX
if (alDeleteAuxiliaryEffectSlots)
{
for (auto slot : effectSlots)
alDeleteAuxiliaryEffectSlots(1, &slot);
}
#endif
alcMakeContextCurrent(nullptr);
alcDestroyContext(context);
alcCloseDevice(device);
@@ -177,15 +181,22 @@ Audio::~Audio()
delete poolThread;
delete pool;
for (auto c : capture)
delete c;
#ifdef ALC_EXT_EFX
for (auto e : effects)
{
if (e != nullptr)
delete e;
}
if (alDeleteAuxiliaryEffectSlots)
{
for (auto slot : effectSlots)
alDeleteAuxiliaryEffectSlots(1, &slot);
}
#endif
alcMakeContextCurrent(nullptr);
alcDestroyContext(context);
@@ -458,7 +469,7 @@ bool Audio::setSceneEffect(int slot, std::map<Effect::Parameter, float> &params)
#ifdef ALC_EXT_EFX
if (alAuxiliaryEffectSloti)
{
if (result == true)
if (result)
{
if (params.find(Effect::EFFECT_VOLUME) != params.end())
alAuxiliaryEffectSlotf(effectSlots[slot], AL_EFFECTSLOT_GAIN, params[Effect::EFFECT_VOLUME]);
src/modules/audio/openal/Source.cpp
+4 -2
View File
@@ -244,8 +244,10 @@ Source::~Source()
delete directfilter;
for (auto sf : sendfilters)
{
if (sf != nullptr)
delete sf;
}
}
love::audio::Source *Source::clone()
@@ -1252,7 +1254,7 @@ int Source::getChannels() const
return channels;
}
bool Source::setFilter(std::map<Filter::Parameter, float> &params)
bool Source::setFilter(const std::map<Filter::Parameter, float> &params)
{
if (!directfilter)
directfilter = new Filter();
@@ -1322,7 +1324,7 @@ bool Source::setSceneEffect(int slot, int effect)
return true;
}
bool Source::setSceneEffect(int slot, int effect, std::map<Filter::Parameter, float> &params)
bool Source::setSceneEffect(int slot, int effect, const std::map<Filter::Parameter, float> &params)
{
if (slot < 0 || slot >= (int)sendtargets.size())
return false;
src/modules/audio/openal/Source.h
+2 -2
View File
@@ -146,12 +146,12 @@ public:
virtual float getAirAbsorptionFactor() const;
virtual int getChannels() const;
virtual bool setFilter(std::map<Filter::Parameter, float> &params);
virtual bool setFilter(const std::map<Filter::Parameter, float> &params);
virtual bool setFilter();
virtual bool getFilter(std::map<Filter::Parameter, float> &params);
virtual bool setSceneEffect(int slot, int effect);
virtual bool setSceneEffect(int slot, int effect, std::map<Filter::Parameter, float> &params);
virtual bool setSceneEffect(int slot, int effect, const std::map<Filter::Parameter, float> &params);
virtual bool setSceneEffect(int slot);
virtual bool getSceneEffect(int slot, int &effect, std::map<Filter::Parameter, float> &params);