[Scummvm-git-logs] scummvm master -> a879214a79a4cee630c2444a4367fe17c50f249f

[mduggan]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f02b975c40 TETRAEDGE: Add more search paths to support iOS versions
a879214a79 TETRAEDGE: Implement channel volume control functions


Commit: f02b975c400c580577a998fd02828879d5b1d08d
    https://github.com/scummvm/scummvm/commit/f02b975c400c580577a998fd02828879d5b1d08d
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-03-20T10:19:02+09:00

Commit Message:
TETRAEDGE: Add more search paths to support iOS versions

Changed paths:
    engines/tetraedge/te/te_core.cpp


diff --git a/engines/tetraedge/te/te_core.cpp b/engines/tetraedge/te/te_core.cpp
index 864e4bd56b3..99be35c6159 100644
--- a/engines/tetraedge/te/te_core.cpp
+++ b/engines/tetraedge/te/te_core.cpp
@@ -171,15 +171,20 @@ Common::FSNode TeCore::findFile(const Common::Path &path) const {
 		"Part3-Full-Part1",
 		"HD",
 		"HD/PC-MacOSX-Xbox360-PS3",
-		"PC-PS3-Android-MacOSX-iPhone-iPad",	// for iOS Syb 1
-		"Android-iPhone-iPad",					// for iOS Syb 1
-		"Android-iPhone-iPad/HD",				// for iOS Syb 1
-		"HD/Android-iPhone-iPad",				// for iOS Syb 1
-		"iPhone-iPad",							// for iOS Syb 1
-		"iPhone-iPad/HD",						// for iOS Syb 1
-		"iPhone-iPad/HD/Freemium",				// for iOS Syb 1
-		"Android-MacOSX-iPhone-iPad",			// for iOS Syb 1
-		"Freemium-BUKAFree/HD"					// for iOS Syb 1
+		"PC-PS3-Android-MacOSX-iPhone-iPad",	// iOS Syb 1
+		"Android-iPhone-iPad",					// iOS Syb 1
+		"Android-iPhone-iPad/HD",				// iOS Syb 1
+		"HD/Android-iPhone-iPad",				// iOS Syb 1
+		"iPhone-iPad",							// iOS Syb 1
+		"iPhone-iPad/HD",						// iOS Syb 1
+		"iPhone-iPad/HD/Freemium",				// iOS Syb 1
+		"Android-MacOSX-iPhone-iPad",			// iOS Syb 1
+		"Freemium-BUKAFree/HD",					// iOS Syb 1
+		"Part3-Full",							// iOS Syb 1 paid
+		"DefaultDistributor-Freemium",			// iOS Syb 1 paid
+		"iPhone-iPad/DefaultDistributor",		// iOS Syb 1 paid
+		"Android-iPhone-iPad/iPhone-iPad",		// iOS Syb 2
+		"PC-MacOSX-Android-iPhone-iPad"			// iOS Syb 2
 	};
 
 	const Common::Path langs[] = {
@@ -188,6 +193,7 @@ Common::FSNode TeCore::findFile(const Common::Path &path) const {
 		"en",
 		"de-es-fr-it-en",
 		"en-es-fr-de-it",
+		"es-en-fr-de-it",
 		"de-en-es-fr-it"
 	};
 


Commit: a879214a79a4cee630c2444a4367fe17c50f249f
    https://github.com/scummvm/scummvm/commit/a879214a79a4cee630c2444a4367fe17c50f249f
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-03-20T10:21:08+09:00

Commit Message:
TETRAEDGE: Implement channel volume control functions

Changed paths:
    engines/tetraedge/te/te_sound_manager.cpp
    engines/tetraedge/te/te_sound_manager.h


diff --git a/engines/tetraedge/te/te_sound_manager.cpp b/engines/tetraedge/te/te_sound_manager.cpp
index 91bf2574769..77ae632916e 100644
--- a/engines/tetraedge/te/te_sound_manager.cpp
+++ b/engines/tetraedge/te/te_sound_manager.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "common/file.h"
+#include "common/config-manager.h"
 
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
@@ -76,10 +77,24 @@ void TeSoundManager::stopFreeSound(const Common::String &name) {
 }
 
 void TeSoundManager::setChannelVolume(const Common::String &channel, float vol) {
-	//int channelId = channel.hash();
-	//Audio::Mixer *mixer = g_system->getMixer();
-	//mixer->setChannelVolume(handle, vol * 255);
-	// TODO: store channel volume here.
+	if (channel == "dialog") {
+		ConfMan.setInt("speech_volume", (int)(vol * 255));
+	} else if (channel == "music") {
+		ConfMan.setInt("music_volume", (int)(vol * 255));
+	} else {
+		ConfMan.setInt("sfx_volume", (int)(vol * 255));
+	}
+	g_engine->syncSoundSettings();
+}
+
+float TeSoundManager::getChannelVolume(const Common::String &channel) {
+	if (channel == "dialog") {
+		return ConfMan.getInt("speech_volume") / 255.0f;
+	} else if (channel == "music") {
+		return ConfMan.getInt("music_volume") / 255.0f;
+	} else {
+		return ConfMan.getInt("sfx_volume") / 255.0f;
+	}
 }
 
 void TeSoundManager::update() {
diff --git a/engines/tetraedge/te/te_sound_manager.h b/engines/tetraedge/te/te_sound_manager.h
index 75288ca7c51..60faacd8407 100644
--- a/engines/tetraedge/te/te_sound_manager.h
+++ b/engines/tetraedge/te/te_sound_manager.h
@@ -38,6 +38,7 @@ public:
 	void stopFreeSound(const Common::String &channel);
 
 	void setChannelVolume(const Common::String &channel, float vol);
+	float getChannelVolume(const Common::String &channel);
 	void update();
 
 	Common::Array<TeMusic *> &musics() { return _musics; }