Browse Source

Rename SoundData:getBits to getBitDepth (resolve #636)

Bart van Strien 12 years ago
parent
commit
882313551c

+ 1 - 1
src/modules/audio/openal/Source.cpp

@@ -52,7 +52,7 @@ Source::Source(Pool *pool, love::sound::SoundData *soundData)
 	, toLoop(0)
 {
 	alGenBuffers(1, buffers);
-	ALenum fmt = getFormat(soundData->getChannels(), soundData->getBits());
+	ALenum fmt = getFormat(soundData->getChannels(), soundData->getBitDepth());
 	alBufferData(buffers[0], fmt, soundData->getData(), soundData->getSize(), soundData->getSampleRate());
 
 	static float z[3] = {0, 0, 0};

+ 1 - 1
src/modules/sound/SoundData.cpp

@@ -137,7 +137,7 @@ int SoundData::getChannels() const
 	return channels;
 }
 
-int SoundData::getBits() const
+int SoundData::getBitDepth() const
 {
 	return bits;
 }

+ 1 - 1
src/modules/sound/SoundData.h

@@ -46,7 +46,7 @@ public:
 	int getSize() const;
 
 	virtual int getChannels() const;
-	virtual int getBits() const;
+	virtual int getBitDepth() const;
 	virtual int getSampleRate() const;
 	virtual int getSampleCount() const;
 

+ 3 - 3
src/modules/sound/wrap_SoundData.cpp

@@ -39,10 +39,10 @@ int w_SoundData_getChannels(lua_State *L)
 	return 1;
 }
 
-int w_SoundData_getBits(lua_State *L)
+int w_SoundData_getBitDepth(lua_State *L)
 {
 	SoundData *t = luax_checksounddata(L, 1);
-	lua_pushinteger(L, t->getBits());
+	lua_pushinteger(L, t->getBitDepth());
 	return 1;
 }
 
@@ -105,7 +105,7 @@ static const luaL_Reg functions[] =
 	{ "getSize", w_Data_getSize },
 
 	{ "getChannels", w_SoundData_getChannels },
-	{ "getBits", w_SoundData_getBits },
+	{ "getBitDepth", w_SoundData_getBitDepth },
 	{ "getSampleRate", w_SoundData_getSampleRate },
 	{ "getSampleCount", w_SoundData_getSampleCount },
 	{ "getDuration", w_SoundData_getDuration },

+ 1 - 1
src/modules/sound/wrap_SoundData.h

@@ -33,7 +33,7 @@ namespace sound
 SoundData *luax_checksounddata(lua_State *L, int idx);
 int w_getSize(lua_State *L);
 int w_getChannels(lua_State *L);
-int w_getBits(lua_State *L);
+int w_getBitDepth(lua_State *L);
 int w_getSampleRate(lua_State *L);
 int w_getSampleCount(lua_State *L);
 int w_getDuration(lua_State *L);