From 71e1a035dd966623c1a1dbcec75b152f5e15ec9a Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Fri, 6 Jun 2025 14:06:59 +0200
Subject: [PATCH] =?UTF-8?q?sembla=20que=20ja=20funciona=20la=20configuraci?=
 =?UTF-8?q?=C3=B3=20d'audio:=20encendre=20i=20apagar,=20volumen=20i=20mast?=
 =?UTF-8?q?er=20volumen.=20No=20tinc=20temps=20de=20fer=20mes=20proves?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/audio.cpp | 31 +++++++++++++++++++++----------
 source/audio.h   |  4 ++++
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/source/audio.cpp b/source/audio.cpp
index 1f31a11..1917461 100644
--- a/source/audio.cpp
+++ b/source/audio.cpp
@@ -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);
-}
\ No newline at end of file
+
+    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();
+    }
+}
diff --git a/source/audio.h b/source/audio.h
index 6900af0..ab9553e 100644
--- a/source/audio.h
+++ b/source/audio.h
@@ -50,6 +50,10 @@ private:
     bool sound_enabled_ = true; // Estado de los efectos de sonido
     bool music_enabled_ = true; // Estado de la música
 
+    // -- Variables de backup ---
+    std::string music_name_; // Última pista de música que se ha reproducido
+    bool music_loop_;        // Parametros de la última pista de música reproducida
+
     // --- Patrón Singleton ---
     Audio();                                  // Constructor privado
     ~Audio();                                 // Destructor privado