From 5fc2190ce42e5d9ca90fb313e5f9f8232f271aee Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 28 Jul 2017 19:28:50 -0300 Subject: [PATCH] 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. --HG-- branch : minor --- src/modules/audio/Audio.h | 2 +- src/modules/audio/Source.h | 2 +- src/modules/audio/null/Audio.cpp | 2 +- src/modules/audio/null/Audio.h | 2 +- src/modules/audio/null/Source.cpp | 2 +- src/modules/audio/null/Source.h | 2 +- src/modules/audio/openal/Audio.cpp | 2 +- src/modules/audio/openal/Audio.h | 2 +- src/modules/audio/openal/Source.cpp | 2 +- src/modules/audio/openal/Source.h | 2 +- src/modules/audio/wrap_Audio.cpp | 11 +++++------ src/modules/audio/wrap_Source.cpp | 14 +++++++------- 12 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/modules/audio/Audio.h b/src/modules/audio/Audio.h index 50c31412b..019908ddc 100644 --- a/src/modules/audio/Audio.h +++ b/src/modules/audio/Audio.h @@ -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 &list) = 0; + virtual bool getActiveEffects(std::vector &list) const = 0; /** * Gets maximum number of scene EFX effects. diff --git a/src/modules/audio/Source.h b/src/modules/audio/Source.h index 593e78b91..a0ae66117 100644 --- a/src/modules/audio/Source.h +++ b/src/modules/audio/Source.h @@ -117,7 +117,7 @@ public: virtual bool setEffect(const char *effect, const std::map ¶ms) = 0; virtual bool unsetEffect(const char *effect) = 0; virtual bool getEffect(const char *effect, std::map ¶ms) = 0; - virtual bool getEffectsList(std::vector &list) = 0; + virtual bool getActiveEffects(std::vector &list) const = 0; virtual int getFreeBufferCount() const = 0; virtual bool queue(void *data, size_t length, int dataSampleRate, int dataBitDepth, int dataChannels) = 0; diff --git a/src/modules/audio/null/Audio.cpp b/src/modules/audio/null/Audio.cpp index 6cf33e963..afa402cb9 100644 --- a/src/modules/audio/null/Audio.cpp +++ b/src/modules/audio/null/Audio.cpp @@ -183,7 +183,7 @@ bool Audio::getEffect(const char *, std::map &) return false; } -bool Audio::getEffectsList(std::vector &list) +bool Audio::getActiveEffects(std::vector &) const { return false; } diff --git a/src/modules/audio/null/Audio.h b/src/modules/audio/null/Audio.h index 34f1f592a..41c4da8f7 100644 --- a/src/modules/audio/null/Audio.h +++ b/src/modules/audio/null/Audio.h @@ -81,7 +81,7 @@ public: bool setEffect(const char *, std::map ¶ms); bool unsetEffect(const char *); bool getEffect(const char *, std::map ¶ms); - bool getEffectsList(std::vector &list); + bool getActiveEffects(std::vector &list) const; int getMaxSceneEffects() const; int getMaxSourceEffects() const; bool isEFXsupported() const; diff --git a/src/modules/audio/null/Source.cpp b/src/modules/audio/null/Source.cpp index 1a1a8d655..ce2a99dc4 100644 --- a/src/modules/audio/null/Source.cpp +++ b/src/modules/audio/null/Source.cpp @@ -274,7 +274,7 @@ bool Source::getEffect(const char *, std::map &) return false; } -bool Source::getEffectsList(std::vector &) +bool Source::getActiveEffects(std::vector &) const { return false; } diff --git a/src/modules/audio/null/Source.h b/src/modules/audio/null/Source.h index b158f909e..20bd464e1 100644 --- a/src/modules/audio/null/Source.h +++ b/src/modules/audio/null/Source.h @@ -90,7 +90,7 @@ public: virtual bool setEffect(const char *effect, const std::map ¶ms); virtual bool unsetEffect(const char *effect); virtual bool getEffect(const char *effect, std::map ¶ms); - virtual bool getEffectsList(std::vector &list); + virtual bool getActiveEffects(std::vector &list) const; private: diff --git a/src/modules/audio/openal/Audio.cpp b/src/modules/audio/openal/Audio.cpp index 803da0a51..08864c311 100644 --- a/src/modules/audio/openal/Audio.cpp +++ b/src/modules/audio/openal/Audio.cpp @@ -543,7 +543,7 @@ bool Audio::getEffect(const char *name, std::map ¶ return true; } -bool Audio::getEffectsList(std::vector &list) +bool Audio::getActiveEffects(std::vector &list) const { if (effectmap.empty()) return false; diff --git a/src/modules/audio/openal/Audio.h b/src/modules/audio/openal/Audio.h index 9d9badb07..91299efc5 100644 --- a/src/modules/audio/openal/Audio.h +++ b/src/modules/audio/openal/Audio.h @@ -118,7 +118,7 @@ public: bool setEffect(const char *name, std::map ¶ms); bool unsetEffect(const char *name); bool getEffect(const char *name, std::map ¶ms); - bool getEffectsList(std::vector &list); + bool getActiveEffects(std::vector &list) const; int getMaxSceneEffects() const; int getMaxSourceEffects() const; bool isEFXsupported() const; diff --git a/src/modules/audio/openal/Source.cpp b/src/modules/audio/openal/Source.cpp index 6240b0942..cd89cec6f 100644 --- a/src/modules/audio/openal/Source.cpp +++ b/src/modules/audio/openal/Source.cpp @@ -1488,7 +1488,7 @@ bool Source::getEffect(const char *name, std::map &par return true; } -bool Source::getEffectsList(std::vector &list) +bool Source::getActiveEffects(std::vector &list) const { if (effectmap.empty()) return false; diff --git a/src/modules/audio/openal/Source.h b/src/modules/audio/openal/Source.h index 5d70c0ad9..ea213587d 100644 --- a/src/modules/audio/openal/Source.h +++ b/src/modules/audio/openal/Source.h @@ -152,7 +152,7 @@ public: virtual bool setEffect(const char *effect, const std::map ¶ms); virtual bool unsetEffect(const char *effect); virtual bool getEffect(const char *effect, std::map ¶ms); - virtual bool getEffectsList(std::vector &list); + virtual bool getActiveEffects(std::vector &list) const; virtual int getFreeBufferCount() const; virtual bool queue(void *data, size_t length, int dataSampleRate, int dataBitDepth, int dataChannels); diff --git a/src/modules/audio/wrap_Audio.cpp b/src/modules/audio/wrap_Audio.cpp index 2c7d32902..1fda94516 100644 --- a/src/modules/audio/wrap_Audio.cpp +++ b/src/modules/audio/wrap_Audio.cpp @@ -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 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 }, diff --git a/src/modules/audio/wrap_Source.cpp b/src/modules/audio/wrap_Source.cpp index 000ba69ad..6ce02a32d 100644 --- a/src/modules/audio/wrap_Source.cpp +++ b/src/modules/audio/wrap_Source.cpp @@ -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 list; - if (!t->getEffectsList(list)) - return 0; - lua_createtable(L, 0, list.size()); - for (unsigned int i = 0; i < list.size(); i++) + std::vector 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 },