Hook up a couple more sounds. Unfortunately clickable back buttons no…

…w play both back and confirm sounds...
hrydgard · Aug 2, 2020 · d3ec52b · d3ec52b
1 parent c746e7b
commit d3ec52b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp
@@ -367,7 +367,7 @@ int BackgroundAudio::Play() {
 		}
 	}
 
-	// Mix in menu sound effects
+	// Mix in menu sound effects. Terribly slow mixer but meh.
 	if (!plays_.empty()) {
 		for (int i = 0; i < sz * 2; i += 2) {
 			std::vector<PlayInstance>::iterator iter = plays_.begin();

diff --git a/ext/native/ui/root.cpp b/ext/native/ui/root.cpp
@@ -147,7 +147,7 @@ void SetSoundCallback(std::function<void(UISound)> func) {
 
 void PlayUISound(UISound sound) {
 	if (soundCallback) {
-		soundCallback(UISound::SELECT);
+		soundCallback(sound);
 	}
 }
 

diff --git a/ext/native/ui/root.h b/ext/native/ui/root.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <functional>
+
 #include "ui/ui_context.h"
 #include "input/input_state.h"
 

diff --git a/ext/native/ui/ui_screen.cpp b/ext/native/ui/ui_screen.cpp
@@ -157,6 +157,10 @@ bool UIScreen::key(const KeyInput &key) {
 }
 
 void UIScreen::TriggerFinish(DialogResult result) {
+	switch (result) {
+	case DialogResult::DR_BACK: UI::PlayUISound(UI::UISound::BACK); break;
+	case DialogResult::DR_OK: UI::PlayUISound(UI::UISound::CONFIRM); break;
+	}
 	screenManager()->finishDialog(this, result);
 }
 

diff --git a/ext/native/ui/view.cpp b/ext/native/ui/view.cpp
@@ -217,6 +217,7 @@ void Clickable::Click() {
 	UI::EventParams e{};
 	e.v = this;
 	OnClick.Trigger(e);
+	UI::PlayUISound(UI::UISound::CONFIRM);
 };
 
 void Clickable::FocusChanged(int focusFlags) {