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

Merge default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-07-28 19:14:54 -03:00
parent b19a8ab67e 3dfe3808c6
commit 19b4079ecc
12 changed files with 116 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/wrap_Audio.cpp
+15
View File
@@ -25,6 +25,9 @@
#include "null/Audio.h"
#include "common/runtime.h"
#ifdef LOVE_IOS
#include "common/ios.h"
#endif
// C++
#include <iostream>
@@ -519,6 +522,17 @@ int w_isEffectsSupported(lua_State *L)
return 1;
}
#ifdef LOVE_IOS
int w_setMixMode(lua_State *L)
{
love::ios::setAudioMixWithOthers(lua_toboolean(L, 1));
#else
int w_setMixMode(lua_State *)
{
#endif
return 0;
}
// List of functions to wrap.
static const luaL_Reg functions[] =
{
@@ -549,6 +563,7 @@ static const luaL_Reg functions[] =
{ "getMaxSceneEffects", w_getMaxSceneEffects },
{ "getMaxSourceEffects", w_getMaxSourceEffects },
{ "isEffectsSupported", w_isEffectsSupported },
{ "setMixMode", w_setMixMode },
{ 0, 0 }
};