From 545ac81d81b92bba22dbc3fe8fde8de7f9590d94 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 2 Dec 2024 19:41:51 +0200
Subject: [PATCH 1/2] Qt: Add SkyEmu duck icon (#657)

---
 CMakeLists.txt                 |   2 +-
 docs/img/skyemu_icon.png       | Bin 0 -> 15327 bytes
 include/frontend_settings.hpp  |   1 +
 src/frontend_settings.cpp      |   7 +++----
 src/panda_qt/config_window.cpp |   2 ++
 5 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 docs/img/skyemu_icon.png

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33faba5f..224fea7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -698,7 +698,7 @@ if(NOT BUILD_HYDRA_CORE AND NOT BUILD_LIBRETRO_CORE)
                 docs/img/rsob_icon.png docs/img/rstarstruck_icon.png docs/img/rpog_icon.png docs/img/rsyn_icon.png
                 docs/img/settings_icon.png docs/img/display_icon.png docs/img/speaker_icon.png
                 docs/img/sparkling_icon.png docs/img/battery_icon.png docs/img/sdcard_icon.png
-                docs/img/rnap_icon.png docs/img/rcow_icon.png
+                docs/img/rnap_icon.png docs/img/rcow_icon.png docs/img/skyemu_icon.png
         )
     else()
         set(FRONTEND_SOURCE_FILES src/panda_sdl/main.cpp src/panda_sdl/frontend_sdl.cpp src/panda_sdl/mappings.cpp)
diff --git a/docs/img/skyemu_icon.png b/docs/img/skyemu_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5f3b9d4ca4f285e0b79f0c859514efb4e6de977
GIT binary patch
literal 15327
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
UExbyGfq{X+)78&qol`;+0DC_-Z2$lO

literal 0
HcmV?d00001

diff --git a/include/frontend_settings.hpp b/include/frontend_settings.hpp
index aaf9eaf0..1a78ab66 100644
--- a/include/frontend_settings.hpp
+++ b/include/frontend_settings.hpp
@@ -19,6 +19,7 @@ struct FrontendSettings {
 		Rsyn = 1,
 		Rnap = 2,
 		Rcow = 3,
+		SkyEmu = 4,
 	};
 
 	Theme theme = Theme::Dark;
diff --git a/src/frontend_settings.cpp b/src/frontend_settings.cpp
index 16bae361..498ba500 100644
--- a/src/frontend_settings.cpp
+++ b/src/frontend_settings.cpp
@@ -38,10 +38,8 @@ FrontendSettings::WindowIcon FrontendSettings::iconFromString(std::string inStri
 	std::transform(inString.begin(), inString.end(), inString.begin(), [](unsigned char c) { return std::tolower(c); });
 
 	static const std::unordered_map<std::string, WindowIcon> map = {
-		{"rpog", WindowIcon::Rpog},
-		{"rsyn", WindowIcon::Rsyn},
-		{"rcow", WindowIcon::Rcow},
-		{"rnap", WindowIcon::Rnap},
+		{"rpog", WindowIcon::Rpog}, {"rsyn", WindowIcon::Rsyn},     {"rcow", WindowIcon::Rcow},
+		{"rnap", WindowIcon::Rnap}, {"skyemu", WindowIcon::SkyEmu},
 	};
 
 	if (auto search = map.find(inString); search != map.end()) {
@@ -57,6 +55,7 @@ const char* FrontendSettings::iconToString(WindowIcon icon) {
 		case WindowIcon::Rsyn: return "rsyn";
 		case WindowIcon::Rcow: return "rcow";
 		case WindowIcon::Rnap: return "rnap";
+		case WindowIcon::SkyEmu: return "skyemu";
 
 		case WindowIcon::Rpog:
 		default: return "rpog";
diff --git a/src/panda_qt/config_window.cpp b/src/panda_qt/config_window.cpp
index 92fa0741..60ec3ed2 100644
--- a/src/panda_qt/config_window.cpp
+++ b/src/panda_qt/config_window.cpp
@@ -85,6 +85,7 @@ ConfigWindow::ConfigWindow(ConfigCallback configCallback, MainWindowCallback win
 	iconSelect->addItem(tr("Happy panda (colourful)"));
 	iconSelect->addItem(tr("Sleepy panda"));
 	iconSelect->addItem(tr("Cow panda"));
+	iconSelect->addItem(tr("The penguin from SkyEmu"));
 	iconSelect->setCurrentIndex(static_cast<int>(config.frontendSettings.icon));
 
 	connect(iconSelect, &QComboBox::currentIndexChanged, this, [&](int index) {
@@ -398,6 +399,7 @@ void ConfigWindow::setIcon(WindowIcon icon) {
 		case WindowIcon::Rsyn: updateIcon(":/docs/img/rsyn_icon.png"); break;
 		case WindowIcon::Rnap: updateIcon(":/docs/img/rnap_icon.png"); break;
 		case WindowIcon::Rcow: updateIcon(":/docs/img/rcow_icon.png"); break;
+		case WindowIcon::SkyEmu: updateIcon(":/docs/img/skyemu_icon.png"); break;
 
 		case WindowIcon::Rpog:
 		default: updateIcon(":/docs/img/rpog_icon.png"); break;

From 5f822b32d501b3ec3a9c66a188feccdbf32c46cd Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 3 Dec 2024 14:16:57 +0200
Subject: [PATCH 2/2] Add volume curve setting (#658)

* Add volume curve setting

* Qt: Add missing translations
---
 include/config.hpp                  | 14 +++++++++++++-
 src/config.cpp                      | 27 +++++++++++++++++++++++++++
 src/core/audio/miniaudio_device.cpp |  6 ++++++
 src/panda_qt/cheats_window.cpp      |  4 ++--
 src/panda_qt/config_window.cpp      | 10 ++++++++++
 src/panda_qt/patch_window.cpp       |  2 +-
 src/panda_qt/text_editor.cpp        |  2 +-
 7 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/include/config.hpp b/include/config.hpp
index 7361a40d..6041286d 100644
--- a/include/config.hpp
+++ b/include/config.hpp
@@ -1,12 +1,21 @@
 #pragma once
 #include <filesystem>
+#include <string>
 
 #include "audio/dsp_core.hpp"
-#include "renderer.hpp"
 #include "frontend_settings.hpp"
+#include "renderer.hpp"
 
 struct AudioDeviceConfig {
+	// Audio curve to use for volumes between 0-100
+	enum class VolumeCurve : int {
+		Cubic = 0,   // Samples are scaled by volume ^ 3
+		Linear = 1,  // Samples are scaled by volume
+	};
+
 	float volumeRaw = 1.0f;
+	VolumeCurve volumeCurve = VolumeCurve::Cubic;
+
 	bool muteAudio = false;
 
 	float getVolume() const {
@@ -16,6 +25,9 @@ struct AudioDeviceConfig {
 
 		return volumeRaw;
 	}
+
+	static VolumeCurve volumeCurveFromString(std::string inString);
+	static const char* volumeCurveToString(VolumeCurve curve);
 };
 
 // Remember to initialize every field here to its default value otherwise bad things will happen
diff --git a/src/config.cpp b/src/config.cpp
index a8c88a68..fd4d969d 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -1,5 +1,7 @@
 #include "config.hpp"
 
+#include <algorithm>
+#include <cctype>
 #include <cmath>
 #include <fstream>
 #include <map>
@@ -105,6 +107,7 @@ void EmulatorConfig::load() {
 			// Our volume ranges from 0.0 (muted) to 2.0 (boosted, using a logarithmic scale). 1.0 is the "default" volume, ie we don't adjust the PCM
 			// samples at all.
 			audioDeviceConfig.volumeRaw = float(std::clamp(toml::find_or<toml::floating>(audio, "AudioVolume", 1.0), 0.0, 2.0));
+			audioDeviceConfig.volumeCurve = AudioDeviceConfig::volumeCurveFromString(toml::find_or<std::string>(audio, "VolumeCurve", "cubic"));
 		}
 	}
 
@@ -188,6 +191,7 @@ void EmulatorConfig::save() {
 	data["Audio"]["EnableAACAudio"] = aacEnabled;
 	data["Audio"]["MuteAudio"] = audioDeviceConfig.muteAudio;
 	data["Audio"]["AudioVolume"] = double(audioDeviceConfig.volumeRaw);
+	data["Audio"]["VolumeCurve"] = std::string(AudioDeviceConfig::volumeCurveToString(audioDeviceConfig.volumeCurve));
 	data["Audio"]["PrintDSPFirmware"] = printDSPFirmware;
 
 	data["Battery"]["ChargerPlugged"] = chargerPlugged;
@@ -203,3 +207,26 @@ void EmulatorConfig::save() {
 	file << data;
 	file.close();
 }
+
+AudioDeviceConfig::VolumeCurve AudioDeviceConfig::volumeCurveFromString(std::string inString) {
+	// Transform to lower-case to make the setting case-insensitive
+	std::transform(inString.begin(), inString.end(), inString.begin(), [](unsigned char c) { return std::tolower(c); });
+
+	if (inString == "cubic") {
+		return VolumeCurve::Cubic;
+	} else if (inString == "linear") {
+		return VolumeCurve::Linear;
+	}
+
+	// Default to cubic curve
+	return VolumeCurve::Cubic;
+}
+
+const char* AudioDeviceConfig::volumeCurveToString(AudioDeviceConfig::VolumeCurve curve) {
+	switch (curve) {
+		case VolumeCurve::Linear: return "linear";
+
+		case VolumeCurve::Cubic:
+		default: return "cubic";
+	}
+}
\ No newline at end of file
diff --git a/src/core/audio/miniaudio_device.cpp b/src/core/audio/miniaudio_device.cpp
index b513450e..550fb039 100644
--- a/src/core/audio/miniaudio_device.cpp
+++ b/src/core/audio/miniaudio_device.cpp
@@ -134,6 +134,12 @@ void MiniAudioDevice::init(Samples& samples, bool safe) {
 			} else {
 				// If our volume is in [0.0, 1.0) then just multiply by the volume. No need to clamp, since there is no danger of our samples wrapping
 				// around due to overflow
+
+				// If we're applying cubic volume curve, raise volume to the power of 3
+				if (self->audioSettings.volumeCurve == AudioDeviceConfig::VolumeCurve::Cubic) {
+					audioVolume = audioVolume * audioVolume * audioVolume;
+				}
+
 				for (usize i = 0; i < samplesWritten; i += 2) {
 					s16 l = s16(float(sample[0]) * audioVolume);
 					s16 r = s16(float(sample[1]) * audioVolume);
diff --git a/src/panda_qt/cheats_window.cpp b/src/panda_qt/cheats_window.cpp
index 2d7e6b4c..2485c677 100644
--- a/src/panda_qt/cheats_window.cpp
+++ b/src/panda_qt/cheats_window.cpp
@@ -69,7 +69,7 @@ void CheatEntryWidget::editClicked() {
 }
 
 CheatEditDialog::CheatEditDialog(Emulator* emu, CheatEntryWidget& cheatEntry) : QDialog(), emu(emu), cheatEntry(cheatEntry) {
-	setWindowTitle("Edit Cheat");
+	setWindowTitle(tr("Edit Cheat"));
 
 	setAttribute(Qt::WA_DeleteOnClose);
 	setModal(true);
@@ -161,7 +161,7 @@ void CheatEditDialog::rejected() {
 
 CheatsWindow::CheatsWindow(Emulator* emu, const std::filesystem::path& cheatPath, QWidget* parent)
 	: QWidget(parent, Qt::Window), emu(emu), cheatPath(cheatPath) {
-	setWindowTitle("Cheats");
+	setWindowTitle(tr("Cheats"));
 	mainWindow = static_cast<MainWindow*>(parent);
 
 	QVBoxLayout* layout = new QVBoxLayout;
diff --git a/src/panda_qt/config_window.cpp b/src/panda_qt/config_window.cpp
index 60ec3ed2..99b38b24 100644
--- a/src/panda_qt/config_window.cpp
+++ b/src/panda_qt/config_window.cpp
@@ -240,6 +240,16 @@ ConfigWindow::ConfigWindow(ConfigCallback configCallback, MainWindowCallback win
 	connectCheckbox(muteAudio, config.audioDeviceConfig.muteAudio);
 	audioLayout->addRow(muteAudio);
 
+	QComboBox* volumeCurveType = new QComboBox;
+	volumeCurveType->addItem(tr("Cubic"));
+	volumeCurveType->addItem(tr("Linear"));
+	volumeCurveType->setCurrentIndex(static_cast<int>(config.audioDeviceConfig.volumeCurve));
+	connect(volumeCurveType, &QComboBox::currentIndexChanged, this, [&](int index) {
+		config.audioDeviceConfig.volumeCurve = static_cast<AudioDeviceConfig::VolumeCurve>(index);
+		updateConfig();
+	});
+	audioLayout->addRow(tr("Volume curve"), volumeCurveType);
+
 	QSpinBox* volumeRaw = new QSpinBox();
 	volumeRaw->setRange(0, 200);
 	volumeRaw->setValue(config.audioDeviceConfig.volumeRaw * 100);
diff --git a/src/panda_qt/patch_window.cpp b/src/panda_qt/patch_window.cpp
index 6ba73e84..6096d89a 100644
--- a/src/panda_qt/patch_window.cpp
+++ b/src/panda_qt/patch_window.cpp
@@ -12,7 +12,7 @@
 #include "io_file.hpp"
 
 PatchWindow::PatchWindow(QWidget* parent) : QWidget(parent, Qt::Window) {
-	setWindowTitle("ROM patcher");
+	setWindowTitle(tr("ROM patcher"));
 
 	QVBoxLayout* layout = new QVBoxLayout;
 	layout->setContentsMargins(6, 6, 6, 6);
diff --git a/src/panda_qt/text_editor.cpp b/src/panda_qt/text_editor.cpp
index 24febd0d..7ac1d5f2 100644
--- a/src/panda_qt/text_editor.cpp
+++ b/src/panda_qt/text_editor.cpp
@@ -9,7 +9,7 @@ using namespace Zep;
 
 TextEditorWindow::TextEditorWindow(QWidget* parent, const std::string& filename, const std::string& initialText)
 	: QDialog(parent), zepWidget(this, qApp->applicationDirPath().toStdString(), fontSize) {
-	setWindowTitle("Lua Editor");
+	setWindowTitle(tr("Lua Editor"));
 	resize(600, 600);
 
 	// Register our extensions