diff --git a/src/api/l_audio.c b/src/api/l_audio.c index cd64c800..00c7d2ac 100644 --- a/src/api/l_audio.c +++ b/src/api/l_audio.c @@ -202,7 +202,7 @@ static int l_lovrAudioGetSpatializer(lua_State *L) { return 1; } -static int l_lovrAudioGetSampleRate(lua_State *L) { +static uint32_t l_lovrAudioGetSampleRate(lua_State *L) { lua_pushnumber(L, lovrAudioGetSampleRate()); return 1; } @@ -319,7 +319,7 @@ int luaopen_lovr_audio(lua_State* L) { spatializer = lua_tostring(L, -1); lua_pop(L, 1); - lua_getfield(L, -1, "sampleRate"); + lua_getfield(L, -1, "samplerate"); int userSampleRate = luaL_optnumber(L, -1, 0); if (userSampleRate > 0) sampleRate = userSampleRate; diff --git a/src/modules/audio/audio.c b/src/modules/audio/audio.c index 5d276072..7c6dc660 100644 --- a/src/modules/audio/audio.c +++ b/src/modules/audio/audio.c @@ -52,7 +52,7 @@ static struct { float leftovers[BUFFER_SIZE * 2]; float absorption[3]; ma_data_converter playbackConverter; - int sampleRate; + uint32_t sampleRate; } state; static const ma_format miniaudioFormats[] = { @@ -227,7 +227,7 @@ static Spatializer* spatializers[] = { // Entry -bool lovrAudioInit(const char* spatializer, int sampleRate) { +bool lovrAudioInit(const char* spatializer, uint32_t sampleRate) { if (state.initialized) return false; state.sampleRate = sampleRate; @@ -406,7 +406,7 @@ const char* lovrAudioGetSpatializer() { return state.spatializer->name; } -int lovrAudioGetSampleRate() { +uint32_t lovrAudioGetSampleRate() { return state.sampleRate; } diff --git a/src/modules/audio/audio.h b/src/modules/audio/audio.h index 4877d586..39ceee58 100644 --- a/src/modules/audio/audio.h +++ b/src/modules/audio/audio.h @@ -59,7 +59,7 @@ typedef enum { typedef void AudioDeviceCallback(const void* id, size_t size, const char* name, bool isDefault, void* userdata); -bool lovrAudioInit(const char* spatializer, int sampleRate); +bool lovrAudioInit(const char* spatializer, uint32_t sampleRate); void lovrAudioDestroy(void); void lovrAudioEnumerateDevices(AudioType type, AudioDeviceCallback* callback, void* userdata); bool lovrAudioSetDevice(AudioType type, void* id, size_t size, struct Sound* sink, AudioShareMode shareMode); @@ -72,7 +72,7 @@ void lovrAudioGetPose(float position[4], float orientation[4]); void lovrAudioSetPose(float position[4], float orientation[4]); bool lovrAudioSetGeometry(float* vertices, uint32_t* indices, uint32_t vertexCount, uint32_t indexCount, AudioMaterial material); const char* lovrAudioGetSpatializer(void); -int lovrAudioGetSampleRate(); +uint32_t lovrAudioGetSampleRate(); void lovrAudioGetAbsorption(float absorption[3]); void lovrAudioSetAbsorption(float absorption[3]);