~aleteoryx/muditaos: [BH-2067] Fix volume change during relaxation pause

5cc0a3b077391e9a434e6639f99e1249e88c25ea — Maciej Gibowicz 1 year, 4 months ago 6a8f79e

[BH-2067] Fix volume change during relaxation pause

When the user changed the volume during pause, the fade out started at
the wrong level.

patch browse .tar.gz

2 files changed, 3 insertions(+), 3 deletions(-)

M products/BellHybrid/services/audio/ServiceAudio.cpp
M products/BellHybrid/services/audio/VolumeFade.cpp

M products/BellHybrid/services/audio/ServiceAudio.cpp => products/BellHybrid/services/audio/ServiceAudio.cpp +1 -1

@@ 400,7 400,7 @@ namespace service
     {
         auto retCode = audio::RetCode::InvokedInIncorrectState;
 
-        if (!volumeFade->IsActive()) {
+        if (volumeFade->IsActive()) {
             volumeFade->Resume();
         }

M products/BellHybrid/services/audio/VolumeFade.cpp => products/BellHybrid/services/audio/VolumeFade.cpp +2 -2

@@ 101,7 101,7 @@ namespace audio
             if (setVolumeCallback != nullptr) {
                 setVolumeCallback(currentVolume);
             }
-            if (IsActive()) {
+            if (timerHandle.isActive()) {
                 RestartWaitingTimer();
             }
         }


@@ 120,7 120,7 @@ namespace audio
 
     bool VolumeFade::IsActive()
     {
-        return timerHandle.isActive();
+        return phase != Phase::Idle;
     }
 
     bool VolumeFade::IsFadePhaseActive()