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

Rename love.audio.getEffectsList and Source:getEffectsList to getActiveEffects. They now return an empty table instead of nil when there are no active effects, as well.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-07-28 19:28:50 -03:00
parent 19b4079ecc
commit 5fc2190ce4
12 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/Audio.h
+1 -1
View File
@@ -236,7 +236,7 @@ public:
* @param list List of EFX names to fill.
* @return true if effect was present, false otherwise.
*/
virtual bool getEffectsList(std::vector<std::string> &list) = 0;
virtual bool getActiveEffects(std::vector<std::string> &list) const = 0;
/**
* Gets maximum number of scene EFX effects.
src/modules/audio/Source.h
+1 -1
View File
@@ -117,7 +117,7 @@ public:
virtual bool setEffect(const char *effect, const std::map<Filter::Parameter, float> &params) = 0;
virtual bool unsetEffect(const char *effect) = 0;
virtual bool getEffect(const char *effect, std::map<Filter::Parameter, float> &params) = 0;
virtual bool getEffectsList(std::vector<std::string> &list) = 0;
virtual bool getActiveEffects(std::vector<std::string> &list) const = 0;
virtual int getFreeBufferCount() const = 0;
virtual bool queue(void *data, size_t length, int dataSampleRate, int dataBitDepth, int dataChannels) = 0;
src/modules/audio/null/Audio.cpp
+1 -1
View File
@@ -183,7 +183,7 @@ bool Audio::getEffect(const char *, std::map<Effect::Parameter, float> &)
return false;
}
bool Audio::getEffectsList(std::vector<std::string> &list)
bool Audio::getActiveEffects(std::vector<std::string> &) const
{
return false;
}
src/modules/audio/null/Audio.h
+1 -1
View File
@@ -81,7 +81,7 @@ public:
bool setEffect(const char *, std::map<Effect::Parameter, float> &params);
bool unsetEffect(const char *);
bool getEffect(const char *, std::map<Effect::Parameter, float> &params);
bool getEffectsList(std::vector<std::string> &list);
bool getActiveEffects(std::vector<std::string> &list) const;
int getMaxSceneEffects() const;
int getMaxSourceEffects() const;
bool isEFXsupported() const;
src/modules/audio/null/Source.cpp
+1 -1
View File
@@ -274,7 +274,7 @@ bool Source::getEffect(const char *, std::map<Filter::Parameter, float> &)
return false;
}
bool Source::getEffectsList(std::vector<std::string> &)
bool Source::getActiveEffects(std::vector<std::string> &) const
{
return false;
}
src/modules/audio/null/Source.h
+1 -1
View File
@@ -90,7 +90,7 @@ public:
virtual bool setEffect(const char *effect, const std::map<Filter::Parameter, float> &params);
virtual bool unsetEffect(const char *effect);
virtual bool getEffect(const char *effect, std::map<Filter::Parameter, float> &params);
virtual bool getEffectsList(std::vector<std::string> &list);
virtual bool getActiveEffects(std::vector<std::string> &list) const;
private:
src/modules/audio/openal/Audio.cpp
+1 -1
View File
@@ -543,7 +543,7 @@ bool Audio::getEffect(const char *name, std::map<Effect::Parameter, float> &para
return true;
}
bool Audio::getEffectsList(std::vector<std::string> &list)
bool Audio::getActiveEffects(std::vector<std::string> &list) const
{
if (effectmap.empty())
return false;
src/modules/audio/openal/Audio.h
+1 -1
View File
@@ -118,7 +118,7 @@ public:
bool setEffect(const char *name, std::map<Effect::Parameter, float> &params);
bool unsetEffect(const char *name);
bool getEffect(const char *name, std::map<Effect::Parameter, float> &params);
bool getEffectsList(std::vector<std::string> &list);
bool getActiveEffects(std::vector<std::string> &list) const;
int getMaxSceneEffects() const;
int getMaxSourceEffects() const;
bool isEFXsupported() const;
src/modules/audio/openal/Source.cpp
+1 -1
View File
@@ -1488,7 +1488,7 @@ bool Source::getEffect(const char *name, std::map<Filter::Parameter, float> &par
return true;
}
bool Source::getEffectsList(std::vector<std::string> &list)
bool Source::getActiveEffects(std::vector<std::string> &list) const
{
if (effectmap.empty())
return false;
src/modules/audio/openal/Source.h
+1 -1
View File
@@ -152,7 +152,7 @@ public:
virtual bool setEffect(const char *effect, const std::map<Filter::Parameter, float> &params);
virtual bool unsetEffect(const char *effect);
virtual bool getEffect(const char *effect, std::map<Filter::Parameter, float> &params);
virtual bool getEffectsList(std::vector<std::string> &list);
virtual bool getActiveEffects(std::vector<std::string> &list) const;
virtual int getFreeBufferCount() const;
virtual bool queue(void *data, size_t length, int dataSampleRate, int dataBitDepth, int dataChannels);
src/modules/audio/wrap_Audio.cpp
+5 -6
View File
@@ -488,14 +488,13 @@ int w_getEffect(lua_State *L)
return 1;
}
int w_getEffectsList(lua_State *L)
int w_getActiveEffects(lua_State *L)
{
std::vector<std::string> list;
if (!instance()->getEffectsList(list))
return 0;
instance()->getActiveEffects(list);
lua_createtable(L, 0, list.size());
for (unsigned int i = 0; i < list.size(); i++)
lua_createtable(L, 0, (int) list.size());
for (int i = 0; i < (int) list.size(); i++)
{
lua_pushnumber(L, i + 1);
lua_pushstring(L, list[i].c_str());
@@ -559,7 +558,7 @@ static const luaL_Reg functions[] =
{ "getRecordingDevices", w_getRecordingDevices },
{ "setEffect", w_setEffect },
{ "getEffect", w_getEffect },
{ "getEffectsList", w_getEffectsList },
{ "getActiveEffects", w_getActiveEffects },
{ "getMaxSceneEffects", w_getMaxSceneEffects },
{ "getMaxSourceEffects", w_getMaxSourceEffects },
{ "isEffectsSupported", w_isEffectsSupported },
src/modules/audio/wrap_Source.cpp
+7 -7
View File
@@ -493,15 +493,15 @@ int w_Source_getEffect(lua_State *L)
return 1;
}
int w_Source_getEffectsList(lua_State *L)
int w_Source_getActiveEffects(lua_State *L)
{
Source *t = luax_checksource(L, 1);
std::vector<std::string> list;
if (!t->getEffectsList(list))
return 0;
lua_createtable(L, 0, list.size());
for (unsigned int i = 0; i < list.size(); i++)
std::vector<std::string> list;
t->getActiveEffects(list);
lua_createtable(L, 0, (int) list.size());
for (int i = 0; i < (int) list.size(); i++)
{
lua_pushnumber(L, i + 1);
lua_pushstring(L, list[i].c_str());
@@ -624,7 +624,7 @@ static const luaL_Reg w_Source_functions[] =
{ "getFilter", w_Source_getFilter },
{ "setEffect", w_Source_setEffect },
{ "getEffect", w_Source_getEffect },
{ "getEffectsList", w_Source_getEffectsList },
{ "getActiveEffects", w_Source_getActiveEffects },
{ "getFreeBufferCount", w_Source_getFreeBufferCount },
{ "queue", w_Source_queue },