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

Minor code style cleanup. Fix a couple compiler warnings.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-12-03 17:23:46 -04:00
parent 7d68a72d5f
commit 8e2d9c5138
3 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/openal/Filter.cpp
+27 -26
View File
@@ -84,18 +84,19 @@ bool Filter::setParams(Type type, const std::vector<float> &params)
#ifdef ALC_EXT_EFX #ifdef ALC_EXT_EFX
switch (type) switch (type)
{ {
case TYPE_LOWPASS: case TYPE_LOWPASS:
alFilteri(filter, AL_FILTER_TYPE, AL_FILTER_LOWPASS); alFilteri(filter, AL_FILTER_TYPE, AL_FILTER_LOWPASS);
break; break;
case TYPE_HIGHPASS: case TYPE_HIGHPASS:
alFilteri(filter, AL_FILTER_TYPE, AL_FILTER_HIGHPASS); alFilteri(filter, AL_FILTER_TYPE, AL_FILTER_HIGHPASS);
break; break;
case TYPE_BANDPASS: case TYPE_BANDPASS:
alFilteri(filter, AL_FILTER_TYPE, AL_FILTER_BANDPASS); alFilteri(filter, AL_FILTER_TYPE, AL_FILTER_BANDPASS);
break; break;
case TYPE_MAX_ENUM: case TYPE_MAX_ENUM:
break; break;
} }
//failed to make filter specific type - not supported etc. //failed to make filter specific type - not supported etc.
if (alGetError() != AL_NO_ERROR) if (alGetError() != AL_NO_ERROR)
{ {
@@ -105,21 +106,21 @@ bool Filter::setParams(Type type, const std::vector<float> &params)
switch (type) switch (type)
{ {
case TYPE_LOWPASS: case TYPE_LOWPASS:
alFilterf(filter, AL_LOWPASS_GAIN, clampf(params[0], AL_LOWPASS_MIN_GAIN, AL_LOWPASS_MAX_GAIN)); alFilterf(filter, AL_LOWPASS_GAIN, clampf(params[0], AL_LOWPASS_MIN_GAIN, AL_LOWPASS_MAX_GAIN));
alFilterf(filter, AL_LOWPASS_GAINHF, clampf(params[1], AL_LOWPASS_MIN_GAINHF, AL_LOWPASS_MAX_GAINHF)); alFilterf(filter, AL_LOWPASS_GAINHF, clampf(params[1], AL_LOWPASS_MIN_GAINHF, AL_LOWPASS_MAX_GAINHF));
break; break;
case TYPE_HIGHPASS: case TYPE_HIGHPASS:
alFilterf(filter, AL_HIGHPASS_GAIN, clampf(params[0], AL_HIGHPASS_MIN_GAIN, AL_HIGHPASS_MAX_GAIN)); alFilterf(filter, AL_HIGHPASS_GAIN, clampf(params[0], AL_HIGHPASS_MIN_GAIN, AL_HIGHPASS_MAX_GAIN));
alFilterf(filter, AL_HIGHPASS_GAINLF, clampf(params[1], AL_HIGHPASS_MIN_GAINLF, AL_HIGHPASS_MAX_GAINLF)); alFilterf(filter, AL_HIGHPASS_GAINLF, clampf(params[1], AL_HIGHPASS_MIN_GAINLF, AL_HIGHPASS_MAX_GAINLF));
break; break;
case TYPE_BANDPASS: case TYPE_BANDPASS:
alFilterf(filter, AL_BANDPASS_GAIN, clampf(params[0], AL_BANDPASS_MIN_GAIN, AL_BANDPASS_MAX_GAIN)); alFilterf(filter, AL_BANDPASS_GAIN, clampf(params[0], AL_BANDPASS_MIN_GAIN, AL_BANDPASS_MAX_GAIN));
alFilterf(filter, AL_BANDPASS_GAINLF, clampf(params[1], AL_BANDPASS_MIN_GAINLF, AL_BANDPASS_MAX_GAINLF)); alFilterf(filter, AL_BANDPASS_GAINLF, clampf(params[1], AL_BANDPASS_MIN_GAINLF, AL_BANDPASS_MAX_GAINLF));
alFilterf(filter, AL_BANDPASS_GAINHF, clampf(params[2], AL_BANDPASS_MIN_GAINHF, AL_BANDPASS_MAX_GAINHF)); alFilterf(filter, AL_BANDPASS_GAINHF, clampf(params[2], AL_BANDPASS_MIN_GAINHF, AL_BANDPASS_MAX_GAINHF));
break; break;
case TYPE_MAX_ENUM: case TYPE_MAX_ENUM:
break; break;
} }
#endif #endif
src/modules/audio/openal/Filter.h
+1
View File
@@ -29,6 +29,7 @@
#else #else
#include <OpenAL-Soft/alc.h> #include <OpenAL-Soft/alc.h>
#include <OpenAL-Soft/al.h> #include <OpenAL-Soft/al.h>
#include <OpenAL-Soft/alext.h>
#endif #endif
#else #else
#include <AL/alc.h> #include <AL/alc.h>
src/modules/audio/wrap_Source.cpp
+2 -2
View File
@@ -347,7 +347,7 @@ int w_Source_setFilter(lua_State *L)
else if (lua_gettop(L) > 2) else if (lua_gettop(L) > 2)
{ {
const char *ftypestr = luaL_checkstring(L, 2); const char *ftypestr = luaL_checkstring(L, 2);
if (ftypestr && !Filter::getConstant(ftypestr, type)) if (!Filter::getConstant(ftypestr, type))
return luaL_error(L, "Invalid filter type: %s", ftypestr); return luaL_error(L, "Invalid filter type: %s", ftypestr);
unsigned int count = Filter::getParameterCount(type); unsigned int count = Filter::getParameterCount(type);
@@ -363,7 +363,7 @@ int w_Source_setFilter(lua_State *L)
} }
lua_rawgeti(L, 2, 1); lua_rawgeti(L, 2, 1);
const char *ftypestr = luaL_checkstring(L, -1); const char *ftypestr = luaL_checkstring(L, -1);
if (ftypestr && !Filter::getConstant(ftypestr, type)) if (!Filter::getConstant(ftypestr, type))
return luaL_error(L, "Invalid filter type: %s", ftypestr); return luaL_error(L, "Invalid filter type: %s", ftypestr);
lua_pop(L, 1); lua_pop(L, 1);