diff --git a/autogen/lua_definitions/structs.lua b/autogen/lua_definitions/structs.lua index 5441e7424..b2347ff93 100644 --- a/autogen/lua_definitions/structs.lua +++ b/autogen/lua_definitions/structs.lua @@ -1197,7 +1197,6 @@ --- @class ModAudio --- @field public filepath string --- @field public isStream boolean ---- @field public baseVolume number --- @field public loaded boolean --- @class ModFs diff --git a/docs/lua/structs.md b/docs/lua/structs.md index 79c6d19ff..3692c80b3 100644 --- a/docs/lua/structs.md +++ b/docs/lua/structs.md @@ -1745,7 +1745,6 @@ | ----- | ---- | ------ | | filepath | `string` | read-only | | isStream | `boolean` | read-only | -| baseVolume | `number` | | | loaded | `boolean` | read-only | [:arrow_up_small:](#) diff --git a/src/pc/lua/smlua_cobject_autogen.c b/src/pc/lua/smlua_cobject_autogen.c index 35a3ce52d..e02890ad9 100644 --- a/src/pc/lua/smlua_cobject_autogen.c +++ b/src/pc/lua/smlua_cobject_autogen.c @@ -1482,12 +1482,11 @@ static struct LuaObjectField sModFields[LUA_MOD_FIELD_COUNT] = { { "size", LVT_U64, offsetof(struct Mod, size), true, LOT_NONE, 1, sizeof(size_t) }, }; -#define LUA_MOD_AUDIO_FIELD_COUNT 4 +#define LUA_MOD_AUDIO_FIELD_COUNT 3 static struct LuaObjectField sModAudioFields[LUA_MOD_AUDIO_FIELD_COUNT] = { - { "baseVolume", LVT_F32, offsetof(struct ModAudio, baseVolume), false, LOT_NONE, 1, sizeof(f32) }, - { "filepath", LVT_STRING_P, offsetof(struct ModAudio, filepath), true, LOT_NONE, 1, sizeof(const char*) }, - { "isStream", LVT_BOOL, offsetof(struct ModAudio, isStream), true, LOT_NONE, 1, sizeof(bool) }, - { "loaded", LVT_BOOL, offsetof(struct ModAudio, loaded), true, LOT_NONE, 1, sizeof(bool) }, + { "filepath", LVT_STRING_P, offsetof(struct ModAudio, filepath), true, LOT_NONE, 1, sizeof(const char*) }, + { "isStream", LVT_BOOL, offsetof(struct ModAudio, isStream), true, LOT_NONE, 1, sizeof(bool) }, + { "loaded", LVT_BOOL, offsetof(struct ModAudio, loaded), true, LOT_NONE, 1, sizeof(bool) }, }; #define LUA_MOD_FS_FIELD_COUNT 15 diff --git a/src/pc/lua/utils/smlua_audio_utils.c b/src/pc/lua/utils/smlua_audio_utils.c index ad60f84c6..d176b470a 100644 --- a/src/pc/lua/utils/smlua_audio_utils.c +++ b/src/pc/lua/utils/smlua_audio_utils.c @@ -397,7 +397,6 @@ void audio_stream_play(struct ModAudio* audio, bool restart, f32 volume) { if (!audio_sanity_check(audio, true, "play")) { return; } ma_sound_set_volume(&audio->sound, volume); - audio->baseVolume = volume; if (restart || !ma_sound_is_playing(&audio->sound)) { ma_sound_seek_to_pcm_frame(&audio->sound, 0); } ma_sound_start(&audio->sound); } @@ -483,14 +482,13 @@ void audio_stream_set_frequency(struct ModAudio* audio, f32 freq) { f32 audio_stream_get_volume(struct ModAudio* audio) { if (!audio_sanity_check(audio, true, "get stream volume from")) { return 0; } - return audio->baseVolume; + return ma_sound_get_volume(&audio->sound); } void audio_stream_set_volume(struct ModAudio* audio, f32 volume) { if (!audio_sanity_check(audio, true, "set stream volume for")) { return; } ma_sound_set_volume(&audio->sound, volume); - audio->baseVolume = volume; } // void audio_stream_set_speed(struct ModAudio* audio, f32 initial_freq, f32 speed, bool pitch) { @@ -625,7 +623,6 @@ void audio_sample_play(struct ModAudio* audio, Vec3f position, f32 volume) { f32 intensity = sound_get_level_intensity(dist); ma_sound_set_volume(sound, volume * intensity); ma_sound_set_pan(sound, pan); - audio->baseVolume = volume; ma_sound_start(sound); } diff --git a/src/pc/lua/utils/smlua_audio_utils.h b/src/pc/lua/utils/smlua_audio_utils.h index b6ce585db..e843742b2 100644 --- a/src/pc/lua/utils/smlua_audio_utils.h +++ b/src/pc/lua/utils/smlua_audio_utils.h @@ -36,7 +36,6 @@ struct ModAudio { u32 bufferSize; struct ModAudioSampleCopies* sampleCopiesTail; bool isStream; - f32 baseVolume; bool loaded; };