Fix feedback sound setting

refs #25
fredemmott · Feb 16, 2021 · b9411a4 · b9411a4
1 parent b08fbfa
commit b9411a4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/Sources/BaseMuteAction.cpp b/Sources/BaseMuteAction.cpp
@@ -90,6 +90,7 @@ void BaseMuteAction::SendToPlugin(const nlohmann::json& payload) {
 void BaseMuteAction::SettingsDidChange(
   const MuteActionSettings& old_settings,
   const MuteActionSettings& new_settings) {
+  mFeedbackSounds = new_settings.feedbackSounds;
   if (old_settings.deviceID == new_settings.deviceID) {
     return;
   }
@@ -129,6 +130,10 @@ void BaseMuteAction::SettingsDidChange(
     }));
 }
 
+bool BaseMuteAction::FeedbackSoundsEnabled() const {
+  return mFeedbackSounds;
+}
+
 void BaseMuteAction::RealDeviceDidChange() {
   const auto device(GetRealDeviceID());
   mMuteUnmuteCallbackHandle = std::move(AddAudioDeviceMuteUnmuteCallback(

diff --git a/Sources/BaseMuteAction.h b/Sources/BaseMuteAction.h
@@ -43,11 +43,13 @@ class BaseMuteAction : public ESDActionWithExternalState<MuteActionSettings> {
   virtual void MuteStateDidChange(bool isMuted) = 0;
   virtual void KeyUp() final override;
   std::string GetRealDeviceID() const;
+  virtual bool FeedbackSoundsEnabled() const;
 
  private:
   std::string mRealDeviceID;
   std::unique_ptr<MuteCallbackHandle> mMuteUnmuteCallbackHandle;
   std::unique_ptr<DefaultChangeCallbackHandle> mDefaultChangeCallbackHandle;
+  bool mFeedbackSounds;
 
   void RealDeviceDidChange();
 };
diff --git a/Sources/MuteAction.cpp b/Sources/MuteAction.cpp
@@ -25,7 +25,9 @@ void MuteAction::DoAction() {
     return;
   }
   MuteAudioDevice(GetRealDeviceID());
-  PlayFeedbackSound();
+  if (FeedbackSoundsEnabled()) {
+    PlayFeedbackSound();
+  }
 }
 
 void MuteAction::PlayFeedbackSound() {

diff --git a/Sources/ToggleMuteAction.cpp b/Sources/ToggleMuteAction.cpp
@@ -28,9 +28,13 @@ void ToggleMuteAction::DoAction() {
   const auto device(GetRealDeviceID());
   if (IsAudioDeviceMuted(device)) {
     UnmuteAudioDevice(device);
-    UnmuteAction::PlayFeedbackSound();
+    if (FeedbackSoundsEnabled()) {
+      UnmuteAction::PlayFeedbackSound();
+    }
   } else {
     MuteAudioDevice(device);
-    MuteAction::PlayFeedbackSound();
+    if (FeedbackSoundsEnabled()) {
+      MuteAction::PlayFeedbackSound();
+    }
   }
 }
diff --git a/Sources/UnmuteAction.cpp b/Sources/UnmuteAction.cpp
@@ -28,7 +28,9 @@ void UnmuteAction::DoAction() {
     return;
   }
   UnmuteAudioDevice(device);
-  PlayFeedbackSound();
+  if (FeedbackSoundsEnabled()) {
+    PlayFeedbackSound();
+  }
 }
 
 void UnmuteAction::PlayFeedbackSound() {