jaildesigner-jailgames/coffee_crisis_arcade_edition
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 13 Wiki Activity

Options: creat namespace

Browse Source
This commit is contained in:
Sergio
2025-06-14 17:43:53 +02:00
parent 23e8f90274
commit c748070ba5
18 changed files with 542 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/audio.cpp
View File

@@ -29,7 +29,7 @@ Audio::Audio()
SDL_LogInfo(SDL_LOG_CATEGORY_TEST, "\n** SDL_AUDIO: INITIALIZING\n");
JA_Init(48000, SDL_AUDIO_S16LE, 2);
enable(options.audio.enabled);
enable(Options::audio.enabled);
SDL_LogInfo(SDL_LOG_CATEGORY_TEST, "** SDL_AUDIO: INITIALIZATION COMPLETE\n");
}
@@ -104,7 +104,7 @@ void Audio::setSoundVolume(int sound_volume)
if (sound_enabled_)
{
sound_volume = std::clamp(sound_volume, 0, 100);
const float CONVERTED_VOLUME = (sound_volume / 100.0f) * (options.audio.volume / 100.0f);
const float CONVERTED_VOLUME = (sound_volume / 100.0f) * (Options::audio.volume / 100.0f);
JA_SetSoundVolume(CONVERTED_VOLUME);
}
}
@@ -115,7 +115,7 @@ void Audio::setMusicVolume(int music_volume)
if (music_enabled_)
{
music_volume = std::clamp(music_volume, 0, 100);
const float CONVERTED_VOLUME = (music_volume / 100.0f) * (options.audio.volume / 100.0f);
const float CONVERTED_VOLUME = (music_volume / 100.0f) * (Options::audio.volume / 100.0f);
JA_SetMusicVolume(CONVERTED_VOLUME);
}
}
@@ -123,7 +123,7 @@ void Audio::setMusicVolume(int music_volume)
// Aplica la configuración
void Audio::applySettings()
{
enable(options.audio.enabled);
enable(Options::audio.enabled);
}
// Establecer estado general
@@ -131,15 +131,6 @@ void Audio::enable(bool value)
{
enabled_ = value;
switch (enabled_)
{
case true:
setSoundVolume(options.audio.sound.volume);
setMusicVolume(options.audio.music.volume);
break;
case false:
setSoundVolume(0);
setMusicVolume(0);
break;
}
setSoundVolume(enabled_ ? Options::audio.sound.volume : 0);
setMusicVolume(enabled_ ? Options::audio.music.volume : 0);
}