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

Aesthete: Bug #829: Adding missing exception guards to audio source wrapper.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Aesthete
2014-04-23 11:15:14 +10:00
parent a2473f860d
commit ba21f79966
1 changed files with 408 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/wrap_Source.cpp
+16 -16
View File
@@ -146,7 +146,7 @@ int w_Source_setPosition(lua_State *L)
v[0] = (float)luaL_checknumber(L, 2); v[0] = (float)luaL_checknumber(L, 2);
v[1] = (float)luaL_checknumber(L, 3); v[1] = (float)luaL_checknumber(L, 3);
v[2] = (float)luaL_optnumber(L, 4, 0); v[2] = (float)luaL_optnumber(L, 4, 0);
t->setPosition(v); EXCEPT_GUARD(t->setPosition(v);)
return 0; return 0;
} }
@@ -154,7 +154,7 @@ int w_Source_getPosition(lua_State *L)
{ {
Source *t = luax_checksource(L, 1); Source *t = luax_checksource(L, 1);
float v[3]; float v[3];
t->getPosition(v); EXCEPT_GUARD(t->getPosition(v);)
lua_pushnumber(L, v[0]); lua_pushnumber(L, v[0]);
lua_pushnumber(L, v[1]); lua_pushnumber(L, v[1]);
lua_pushnumber(L, v[2]); lua_pushnumber(L, v[2]);
@@ -168,7 +168,7 @@ int w_Source_setVelocity(lua_State *L)
v[0] = (float)luaL_checknumber(L, 2); v[0] = (float)luaL_checknumber(L, 2);
v[1] = (float)luaL_checknumber(L, 3); v[1] = (float)luaL_checknumber(L, 3);
v[2] = (float)luaL_optnumber(L, 4, 0); v[2] = (float)luaL_optnumber(L, 4, 0);
t->setVelocity(v); EXCEPT_GUARD(t->setVelocity(v);)
return 0; return 0;
} }
@@ -176,7 +176,7 @@ int w_Source_getVelocity(lua_State *L)
{ {
Source *t = luax_checksource(L, 1); Source *t = luax_checksource(L, 1);
float v[3]; float v[3];
t->getVelocity(v); EXCEPT_GUARD(t->getVelocity(v);)
lua_pushnumber(L, v[0]); lua_pushnumber(L, v[0]);
lua_pushnumber(L, v[1]); lua_pushnumber(L, v[1]);
lua_pushnumber(L, v[2]); lua_pushnumber(L, v[2]);
@@ -190,7 +190,7 @@ int w_Source_setDirection(lua_State *L)
v[0] = (float)luaL_checknumber(L, 2); v[0] = (float)luaL_checknumber(L, 2);
v[1] = (float)luaL_checknumber(L, 3); v[1] = (float)luaL_checknumber(L, 3);
v[2] = (float)luaL_optnumber(L, 4, 0); v[2] = (float)luaL_optnumber(L, 4, 0);
t->setDirection(v); EXCEPT_GUARD(t->setDirection(v);)
return 0; return 0;
} }
@@ -198,7 +198,7 @@ int w_Source_getDirection(lua_State *L)
{ {
Source *t = luax_checksource(L, 1); Source *t = luax_checksource(L, 1);
float v[3]; float v[3];
t->getDirection(v); EXCEPT_GUARD(t->getDirection(v);)
lua_pushnumber(L, v[0]); lua_pushnumber(L, v[0]);
lua_pushnumber(L, v[1]); lua_pushnumber(L, v[1]);
lua_pushnumber(L, v[2]); lua_pushnumber(L, v[2]);
@@ -211,7 +211,7 @@ int w_Source_setCone(lua_State *L)
float innerAngle = (float) luaL_checknumber(L, 2); float innerAngle = (float) luaL_checknumber(L, 2);
float outerAngle = (float) luaL_checknumber(L, 3); float outerAngle = (float) luaL_checknumber(L, 3);
float outerVolume = (float) luaL_optnumber(L, 4, 0.0); float outerVolume = (float) luaL_optnumber(L, 4, 0.0);
t->setCone(innerAngle, outerAngle, outerVolume); EXCEPT_GUARD(t->setCone(innerAngle, outerAngle, outerVolume);)
return 0; return 0;
} }
@@ -219,7 +219,7 @@ int w_Source_getCone(lua_State *L)
{ {
Source *t = luax_checksource(L, 1); Source *t = luax_checksource(L, 1);
float innerAngle, outerAngle, outerVolume; float innerAngle, outerAngle, outerVolume;
t->getCone(innerAngle, outerAngle, outerVolume); EXCEPT_GUARD(t->getCone(innerAngle, outerAngle, outerVolume);)
lua_pushnumber(L, innerAngle); lua_pushnumber(L, innerAngle);
lua_pushnumber(L, outerAngle); lua_pushnumber(L, outerAngle);
lua_pushnumber(L, outerVolume); lua_pushnumber(L, outerVolume);
@@ -229,14 +229,14 @@ int w_Source_getCone(lua_State *L)
int w_Source_setRelative(lua_State *L) int w_Source_setRelative(lua_State *L)
{ {
Source *t = luax_checksource(L, 1); Source *t = luax_checksource(L, 1);
t->setRelative(luax_toboolean(L, 2)); EXCEPT_GUARD(t->setRelative(luax_toboolean(L, 2));)
return 0; return 0;
} }
int w_Source_isRelative(lua_State *L) int w_Source_isRelative(lua_State *L)
{ {
Source *t = luax_checksource(L, 1); Source *t = luax_checksource(L, 1);
luax_pushboolean(L, t->isRelative()); EXCEPT_GUARD(luax_pushboolean(L, t->isRelative());)
return 1; return 1;
} }
@@ -302,16 +302,16 @@ int w_Source_setAttenuationDistances(lua_State *L)
float dmax = (float)luaL_checknumber(L, 3); float dmax = (float)luaL_checknumber(L, 3);
if (dref < .0f || dmax < .0f) if (dref < .0f || dmax < .0f)
return luaL_error(L, "Invalid distances: %f, %f. Must be > 0", dref, dmax); return luaL_error(L, "Invalid distances: %f, %f. Must be > 0", dref, dmax);
t->setReferenceDistance(dref); EXCEPT_GUARD(t->setReferenceDistance(dref);)
t->setMaxDistance(dmax); EXCEPT_GUARD(t->setMaxDistance(dmax);)
return 0; return 0;
} }
int w_Source_getAttenuationDistances(lua_State *L) int w_Source_getAttenuationDistances(lua_State *L)
{ {
Source *t = luax_checksource(L, 1); Source *t = luax_checksource(L, 1);
lua_pushnumber(L, t->getReferenceDistance()); EXCEPT_GUARD(lua_pushnumber(L, t->getReferenceDistance());)
lua_pushnumber(L, t->getMaxDistance()); EXCEPT_GUARD(lua_pushnumber(L, t->getMaxDistance());)
return 2; return 2;
} }
@@ -321,14 +321,14 @@ int w_Source_setRolloff(lua_State *L)
float rolloff = (float)luaL_checknumber(L, 2); float rolloff = (float)luaL_checknumber(L, 2);
if (rolloff < .0f) if (rolloff < .0f)
return luaL_error(L, "Invalid rolloff: %f. Must be > 0.", rolloff); return luaL_error(L, "Invalid rolloff: %f. Must be > 0.", rolloff);
t->setRolloffFactor(rolloff); EXCEPT_GUARD(t->setRolloffFactor(rolloff);)
return 0; return 0;
} }
int w_Source_getRolloff(lua_State *L) int w_Source_getRolloff(lua_State *L)
{ {
Source *t = luax_checksource(L, 1); Source *t = luax_checksource(L, 1);
lua_pushnumber(L, t->getRolloffFactor()); EXCEPT_GUARD(lua_pushnumber(L, t->getRolloffFactor());)
return 1; return 1;
} }