stash

Author: Desdaemon

src/audio.h

@@ -119,6 +119,11 @@ struct AudioInterface {
 	 */
 	virtual void BGM_Pitch(int pitch) = 0;
 
+	/**
+	 * Adjusts the balance of the currently playing background music.
+	 */
+	virtual void BGM_Balance(int balance) = 0;
+
 	/**
 	 * @return Type of music being played.
 	 */
@@ -174,6 +179,7 @@ struct EmptyAudio : public AudioInterface {
 	void BGM_Fade(int) override {}
 	void BGM_Volume(int) override {}
 	void BGM_Pitch(int) override {};
+	void BGM_Balance(int) override {}
 	std::string BGM_GetType() const override { return {}; };
 	void SE_Play(std::unique_ptr<AudioSeCache>, int, int, int) override {}
 	void SE_Stop() override {}

src/audio_decoder.cpp

@@ -17,6 +17,7 @@
 
 // Headers
 #include <cassert>
+#include <cmath>
 #include <cstdint>
 #include <cstring>
 #include "audio_decoder.h"
@@ -226,13 +227,20 @@ int AudioDecoder::GetSamplesizeForFormat(AudioDecoderBase::Format format) {
 }
 
 void AudioDecoder::SetLogVolume() {
+	float base_gain = AdjustVolume(volume);
 	int balance = GetBalance();
-	float left_gain = 1.f, right_gain = 1.f;
+	float left_gain = 1.f, right_gain = 1.f, atten_db;
 	if (balance <= 50) {
-		right_gain = balance / 50.f;
+		atten_db = -6.0f * ((balance - 50) / 10.f);
+		// right_gain = balance / 50.f;
+		right_gain = powf(10.0f, atten_db / 20.0f);
 	} else {
-		left_gain = (100 - balance) / 50.f;
+		atten_db = -6.0f * ((50 - balance) / 10.f);
+		// left_gain = (100 - balance) / 50.f;
+		left_gain = std::powf(10.0f, atten_db / 20.0f);
 	}
-	log_volume.left_volume = AdjustVolume(volume * left_gain);
-	log_volume.right_volume = AdjustVolume(volume * right_gain);
-}
+	log_volume.left_volume = base_gain * left_gain;
+	log_volume.right_volume = base_gain * right_gain;
+	// log_volume.left_volume = AdjustVolume(volume * left_gain);
+	// log_volume.right_volume = AdjustVolume(volume * right_gain);
+}

src/audio_decoder_base.cpp

@@ -26,7 +26,8 @@
 float AudioDecoderBase::AdjustVolume(float volume) {
 	// Adjust to RPG_RT (Direct Sound) volume scale
 	if (volume > 0) {
-		return 100.0f * std::pow(10.0f, (-100 + volume) / 60.0f);
+		// return 100.0f * std::pow(10.0f, (-100 + volume) / 60.0f);
+		return 100.0f * std::pow(10.0f, -(35.0f / 20.0f) * (1.0f - volume / 100.0f));
 	}
 	return 0.0f;
 }

src/audio_generic.cpp

@@ -151,6 +151,14 @@ void GenericAudio::BGM_Pitch(int pitch) {
 	UnlockMutex();
 }
 
+void GenericAudio::BGM_Balance(int balance) {
+	LockMutex();
+	for (auto& BGM_Channel : BGM_Channels) {
+		BGM_Channel.SetBalance(balance);
+	}
+	UnlockMutex();
+}
+
 std::string GenericAudio::BGM_GetType() const {
 	std::string type;
 
@@ -545,6 +553,14 @@ void GenericAudio::BgmChannel::SetPitch(int pitch) {
 	}
 }
 
+void GenericAudio::BgmChannel::SetBalance(int balance) {
+	if (midi_out_used) {
+		instance->midi_thread->GetMidiOut().SetBalance(balance);
+	} else if (decoder) {
+		decoder->SetBalance(balance);
+	}
+}
+
 bool GenericAudio::BgmChannel::IsUsed() const {
 	return decoder || midi_out_used;
 }

src/audio_generic.h

@@ -53,6 +53,7 @@ class GenericAudio : public AudioInterface {
 	void BGM_Fade(int fade) override;
 	void BGM_Volume(int volume) override;
 	void BGM_Pitch(int pitch) override;
+	void BGM_Balance(int balance) override;
 	std::string BGM_GetType() const override;
 
 	void SE_Play(std::unique_ptr<AudioSeCache> se, int volume, int pitch, int balance) override;
@@ -84,6 +85,7 @@ class GenericAudio : public AudioInterface {
 		void SetFade(int fade);
 		void SetVolume(int volume);
 		void SetPitch(int pitch);
+		void SetBalance(int balance);
 		bool IsUsed() const;
 	};
 	struct SeChannel {

src/game_system.cpp

@@ -93,6 +93,12 @@ void Game_System::BgmPlay(lcf::rpg::Music const& bgm) {
 		Output::Debug("BGM {} has invalid tempo {}", bgm.name, bgm.tempo);
 	}
 
+	if (bgm.balance < 0 || bgm.balance > 100) {
+		data.current_music.balance = Utils::Clamp<int32_t>(bgm.balance, 0, 100);
+
+		Output::Debug("BGM {} has invalid balance {}", bgm.name, bgm.balance);
+	}
+
 	// (OFF) means play nothing
 	if (!bgm.name.empty() && bgm.name != "(OFF)") {
 		// Same music: Only adjust volume and speed
@@ -107,6 +113,11 @@ void Game_System::BgmPlay(lcf::rpg::Music const& bgm) {
 					Audio().BGM_Pitch(data.current_music.tempo);
 				}
 			}
+			if (previous_music.balance != data.current_music.balance) {
+				if (!bgm_pending) {
+					Audio().BGM_Balance(data.current_music.balance);
+				}
+			}
 		} else {
 			Audio().BGM_Stop();
 			bgm_pending = true;
@@ -164,6 +175,7 @@ void Game_System::SePlay(const lcf::rpg::Sound& se, bool stop_sounds) {
 
 	int32_t volume = se.volume;
 	int32_t tempo = se.tempo;
+	int32_t balance = se.balance;
 
 	// Validate
 	if (volume < 0 || volume > 100) {
@@ -177,10 +189,16 @@ void Game_System::SePlay(const lcf::rpg::Sound& se, bool stop_sounds) {
 		tempo = Utils::Clamp<int32_t>(se.tempo, 10, 400);
 	}
 
+	if (balance < 0 || balance > 100) {
+		Output::Debug("SE {} has invalid balance {}", se.name, balance);
+		balance = Utils::Clamp<int32_t>(se.balance, 0, 100);
+	}
+
 	FileRequestAsync* request = AsyncHandler::RequestFile("Sound", se.name);
 	lcf::rpg::Sound se_adj = se;
 	se_adj.volume = volume;
 	se_adj.tempo = tempo;
+	se_adj.balance = balance;
 	se_request_ids[se.name] = request->Bind(&Game_System::OnSeReady, this, se_adj, stop_sounds);
 	if (EndsWith(se.name, ".script")) {
 		// Is a Ineluki Script File

src/platform/3ds/audio.cpp

@@ -207,6 +207,13 @@ void CtrAudio::BGM_Pitch(int pitch) {
 	}
 }
 
+void CtrAudio::BGM_Balance(int balance) {
+	if (!bgm.decoder)
+		return;
+
+	bgm.decoder->SetBalance(balance);
+}
+
 std::string CtrAudio::BGM_GetType() const {
 	if (bgm.decoder) {
 		return bgm.decoder->GetType();

src/platform/3ds/audio.h

@@ -43,6 +43,7 @@ class CtrAudio final : public AudioInterface {
 	void BGM_Fade(int fade) override;
 	void BGM_Volume(int volume) override;
 	void BGM_Pitch(int pitch) override;
+	void BGM_Balance(int balance) override;
 	std::string BGM_GetType() const override;
 	void SE_Play(std::unique_ptr<AudioSeCache> se, int volume, int pitch, int balance) override;
 	void SE_Stop() override;