sembla que ja funciona la configuració d'audio: encendre i apagar, volumen i master volumen. No tinc temps de fer mes proves

This commit is contained in:
2025-06-06 14:06:59 +02:00
parent 5af75f74d1
commit 71e1a035dd
2 changed files with 25 additions and 10 deletions

View File

@@ -43,6 +43,9 @@ Audio::~Audio() { JA_Quit(); }
// Reproduce la música
void Audio::playMusic(const std::string &name, const int loop)
{
music_name_ = name;
music_loop_ = loop;
if (enabled_ && music_enabled_)
{
JA_PlayMusic(Resource::get()->getMusic(name), loop);
@@ -95,24 +98,24 @@ void Audio::fadeOutMusic(int milliseconds)
}
// Establece el volumen de los sonidos
void Audio::setSoundVolume(int volume)
void Audio::setSoundVolume(int sound_volume)
{
if (enabled_ && sound_enabled_)
{
volume = std::clamp(volume, 0, 100);
const int COVERTED_VOLUME = static_cast<int>((volume / 100.0) * 128);
JA_SetSoundVolume(COVERTED_VOLUME);
sound_volume = std::clamp(sound_volume, 0, 100);
const float CONVERTED_VOLUME = (sound_volume / 100.0f) * (options.audio.volume / 100.0f);
JA_SetSoundVolume(CONVERTED_VOLUME);
}
}
// Establece el volumen de la música
void Audio::setMusicVolume(int volume)
void Audio::setMusicVolume(int music_volume)
{
if (enabled_ && music_enabled_)
{
volume = std::clamp(volume, 0, 100);
const int COVERTED_VOLUME = static_cast<int>((volume / 100.0) * 128);
JA_SetMusicVolume(COVERTED_VOLUME);
music_volume = std::clamp(music_volume, 0, 100);
const float CONVERTED_VOLUME = (music_volume / 100.0f) * (options.audio.volume / 100.0f);
JA_SetMusicVolume(CONVERTED_VOLUME);
}
}
@@ -121,5 +124,13 @@ void Audio::applySettings()
{
setSoundVolume(options.audio.sound.volume);
setMusicVolume(options.audio.music.volume);
enable(options.audio.enabled);
}
bool const PREVIOUS_ENABLED = enabled_; // Guarda el estado actual
enable(options.audio.enabled); // Modifica enabled_
// Solo ejecuta la acción si el estado ha cambiado
if (PREVIOUS_ENABLED != enabled_)
{
enabled_ ? JA_PlayMusic(Resource::get()->getMusic(music_name_), music_loop_) : JA_StopMusic();
}
}