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

Add vararg versions of love.audio.play/pause/stop (fixes #1295)

Browse Source 
The table versions existed already, I guess I forgot about varargs

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2017-07-27 17:40:56 +02:00
parent d578c35f4a
commit 9ee11409c5
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/wrap_Audio.cpp
+26 -4
View File
@@ -115,16 +115,34 @@ static std::vector<Source*> readSourceList(lua_State *L, int n)
return sources; return sources;
} }
static std::vector<Source*> readSourceVararg(lua_State *L, int i)
{
const int top = lua_gettop(L);
if (i < 0)
i += top + 1;
int items = top - i + 1;
std::vector<Source*> sources(items);
for (int pos = 0; i <= top; i++, pos++)
sources[pos] = luax_checksource(L, i);
return sources;
}
int w_play(lua_State *L) int w_play(lua_State *L)
{ {
if (lua_istable(L, 1)) if (lua_istable(L, 1))
{
luax_pushboolean(L, instance()->play(readSourceList(L, 1))); luax_pushboolean(L, instance()->play(readSourceList(L, 1)));
return 1; else if (lua_gettop(L) > 1)
luax_pushboolean(L, instance()->play(readSourceVararg(L, 1)));
else
{
Source *s = luax_checksource(L, 1);
luax_pushboolean(L, instance()->play(s));
} }
Source *s = luax_checksource(L, 1);
luax_pushboolean(L, instance()->play(s));
return 1; return 1;
} }
@@ -134,6 +152,8 @@ int w_stop(lua_State *L)
instance()->stop(); instance()->stop();
else if (lua_istable(L, 1)) else if (lua_istable(L, 1))
instance()->stop(readSourceList(L, 1)); instance()->stop(readSourceList(L, 1));
else if (lua_gettop(L) > 1)
instance()->stop(readSourceVararg(L, 1));
else else
{ {
Source *s = luax_checksource(L, 1); Source *s = luax_checksource(L, 1);
@@ -158,6 +178,8 @@ int w_pause(lua_State *L)
} }
else if (lua_istable(L, 1)) else if (lua_istable(L, 1))
instance()->pause(readSourceList(L, 1)); instance()->pause(readSourceList(L, 1));
else if (lua_gettop(L) > 1)
instance()->pause(readSourceVararg(L, 1));
else else
{ {
Source *s = luax_checksource(L, 1); Source *s = luax_checksource(L, 1);