summaryrefslogtreecommitdiff
path: root/src/yuzu
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuzu')
-rw-r--r--src/yuzu/configuration/config.cpp3
-rw-r--r--src/yuzu/configuration/configure_audio.cpp3
-rw-r--r--src/yuzu/configuration/configure_audio.ui10
-rw-r--r--src/yuzu/configuration/configure_gamelist.cpp103
-rw-r--r--src/yuzu/configuration/configure_gamelist.h7
-rw-r--r--src/yuzu/debugger/wait_tree.cpp58
-rw-r--r--src/yuzu/main.cpp2
7 files changed, 121 insertions, 65 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index c43e79e78..d229225b4 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -95,6 +95,8 @@ void Config::ReadValues() {
qt_config->beginGroup("Audio");
Settings::values.sink_id = qt_config->value("output_engine", "auto").toString().toStdString();
+ Settings::values.enable_audio_stretching =
+ qt_config->value("enable_audio_stretching", true).toBool();
Settings::values.audio_device_id =
qt_config->value("output_device", "auto").toString().toStdString();
Settings::values.volume = qt_config->value("volume", 1).toFloat();
@@ -230,6 +232,7 @@ void Config::SaveValues() {
qt_config->beginGroup("Audio");
qt_config->setValue("output_engine", QString::fromStdString(Settings::values.sink_id));
+ qt_config->setValue("enable_audio_stretching", Settings::values.enable_audio_stretching);
qt_config->setValue("output_device", QString::fromStdString(Settings::values.audio_device_id));
qt_config->setValue("volume", Settings::values.volume);
qt_config->endGroup();
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index fbb813f6c..6ea59f2a3 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -46,6 +46,8 @@ void ConfigureAudio::setConfiguration() {
}
ui->output_sink_combo_box->setCurrentIndex(new_sink_index);
+ ui->toggle_audio_stretching->setChecked(Settings::values.enable_audio_stretching);
+
// The device list cannot be pre-populated (nor listed) until the output sink is known.
updateAudioDevices(new_sink_index);
@@ -67,6 +69,7 @@ void ConfigureAudio::applyConfiguration() {
Settings::values.sink_id =
ui->output_sink_combo_box->itemText(ui->output_sink_combo_box->currentIndex())
.toStdString();
+ Settings::values.enable_audio_stretching = ui->toggle_audio_stretching->isChecked();
Settings::values.audio_device_id =
ui->audio_device_combo_box->itemText(ui->audio_device_combo_box->currentIndex())
.toStdString();
diff --git a/src/yuzu/configuration/configure_audio.ui b/src/yuzu/configuration/configure_audio.ui
index ef67890dc..a29a0e265 100644
--- a/src/yuzu/configuration/configure_audio.ui
+++ b/src/yuzu/configuration/configure_audio.ui
@@ -31,6 +31,16 @@
</item>
</layout>
</item>
+ <item>
+ <widget class="QCheckBox" name="toggle_audio_stretching">
+ <property name="toolTip">
+ <string>This post-processing effect adjusts audio speed to match emulation speed and helps prevent audio stutter. This however increases audio latency.</string>
+ </property>
+ <property name="text">
+ <string>Enable audio stretching</string>
+ </property>
+ </widget>
+ </item>
<item>
<layout class="QHBoxLayout">
<item>
diff --git a/src/yuzu/configuration/configure_gamelist.cpp b/src/yuzu/configuration/configure_gamelist.cpp
index 1ae3423cf..0be030434 100644
--- a/src/yuzu/configuration/configure_gamelist.cpp
+++ b/src/yuzu/configuration/configure_gamelist.cpp
@@ -2,47 +2,51 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/core.h"
+#include <array>
+#include <utility>
+
+#include "common/common_types.h"
#include "core/settings.h"
#include "ui_configure_gamelist.h"
-#include "ui_settings.h"
#include "yuzu/configuration/configure_gamelist.h"
+#include "yuzu/ui_settings.h"
+
+namespace {
+constexpr std::array<std::pair<u32, const char*>, 5> default_icon_sizes{{
+ std::make_pair(0, QT_TR_NOOP("None")),
+ std::make_pair(32, QT_TR_NOOP("Small (32x32)")),
+ std::make_pair(64, QT_TR_NOOP("Standard (64x64)")),
+ std::make_pair(128, QT_TR_NOOP("Large (128x128)")),
+ std::make_pair(256, QT_TR_NOOP("Full Size (256x256)")),
+}};
+
+constexpr std::array<const char*, 4> row_text_names{{
+ QT_TR_NOOP("Filename"),
+ QT_TR_NOOP("Filetype"),
+ QT_TR_NOOP("Title ID"),
+ QT_TR_NOOP("Title Name"),
+}};
+} // Anonymous namespace
ConfigureGameList::ConfigureGameList(QWidget* parent)
: QWidget(parent), ui(new Ui::ConfigureGameList) {
ui->setupUi(this);
- static const std::vector<std::pair<u32, std::string>> default_icon_sizes{
- std::make_pair(0, "None"), std::make_pair(32, "Small"),
- std::make_pair(64, "Standard"), std::make_pair(128, "Large"),
- std::make_pair(256, "Full Size"),
- };
-
- for (const auto& size : default_icon_sizes) {
- ui->icon_size_combobox->addItem(QString::fromStdString(size.second + " (" +
- std::to_string(size.first) + "x" +
- std::to_string(size.first) + ")"),
- size.first);
- }
-
- static const std::vector<std::string> row_text_names{
- "Filename",
- "Filetype",
- "Title ID",
- "Title Name",
- };
-
- for (size_t i = 0; i < row_text_names.size(); ++i) {
- ui->row_1_text_combobox->addItem(QString::fromStdString(row_text_names[i]),
- QVariant::fromValue(i));
- ui->row_2_text_combobox->addItem(QString::fromStdString(row_text_names[i]),
- QVariant::fromValue(i));
- }
+ InitializeIconSizeComboBox();
+ InitializeRowComboBoxes();
this->setConfiguration();
}
-ConfigureGameList::~ConfigureGameList() {}
+ConfigureGameList::~ConfigureGameList() = default;
+
+void ConfigureGameList::applyConfiguration() {
+ UISettings::values.show_unknown = ui->show_unknown->isChecked();
+ UISettings::values.icon_size = ui->icon_size_combobox->currentData().toUInt();
+ UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt();
+ UISettings::values.row_2_text_id = ui->row_2_text_combobox->currentData().toUInt();
+ Settings::Apply();
+}
void ConfigureGameList::setConfiguration() {
ui->show_unknown->setChecked(UISettings::values.show_unknown);
@@ -54,10 +58,39 @@ void ConfigureGameList::setConfiguration() {
ui->row_2_text_combobox->findData(UISettings::values.row_2_text_id));
}
-void ConfigureGameList::applyConfiguration() {
- UISettings::values.show_unknown = ui->show_unknown->isChecked();
- UISettings::values.icon_size = ui->icon_size_combobox->currentData().toUInt();
- UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt();
- UISettings::values.row_2_text_id = ui->row_2_text_combobox->currentData().toUInt();
- Settings::Apply();
+void ConfigureGameList::changeEvent(QEvent* event) {
+ if (event->type() == QEvent::LanguageChange) {
+ RetranslateUI();
+ return;
+ }
+
+ QWidget::changeEvent(event);
+}
+
+void ConfigureGameList::RetranslateUI() {
+ ui->retranslateUi(this);
+
+ for (int i = 0; i < ui->icon_size_combobox->count(); i++) {
+ ui->icon_size_combobox->setItemText(i, tr(default_icon_sizes[i].second));
+ }
+
+ for (int i = 0; i < ui->row_1_text_combobox->count(); i++) {
+ const QString name = tr(row_text_names[i]);
+
+ ui->row_1_text_combobox->setItemText(i, name);
+ ui->row_2_text_combobox->setItemText(i, name);
+ }
+}
+
+void ConfigureGameList::InitializeIconSizeComboBox() {
+ for (const auto& size : default_icon_sizes) {
+ ui->icon_size_combobox->addItem(size.second, size.first);
+ }
+}
+
+void ConfigureGameList::InitializeRowComboBoxes() {
+ for (size_t i = 0; i < row_text_names.size(); ++i) {
+ ui->row_1_text_combobox->addItem(row_text_names[i], QVariant::fromValue(i));
+ ui->row_2_text_combobox->addItem(row_text_names[i], QVariant::fromValue(i));
+ }
}
diff --git a/src/yuzu/configuration/configure_gamelist.h b/src/yuzu/configuration/configure_gamelist.h
index 94fba6373..ff7406c60 100644
--- a/src/yuzu/configuration/configure_gamelist.h
+++ b/src/yuzu/configuration/configure_gamelist.h
@@ -23,6 +23,11 @@ public:
private:
void setConfiguration();
-private:
+ void changeEvent(QEvent*) override;
+ void RetranslateUI();
+
+ void InitializeIconSizeComboBox();
+ void InitializeRowComboBoxes();
+
std::unique_ptr<Ui::ConfigureGameList> ui;
};
diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp
index 6c2cd967e..dc1023113 100644
--- a/src/yuzu/debugger/wait_tree.cpp
+++ b/src/yuzu/debugger/wait_tree.cpp
@@ -213,35 +213,35 @@ QString WaitTreeThread::GetText() const {
const auto& thread = static_cast<const Kernel::Thread&>(object);
QString status;
switch (thread.status) {
- case ThreadStatus::Running:
+ case Kernel::ThreadStatus::Running:
status = tr("running");
break;
- case ThreadStatus::Ready:
+ case Kernel::ThreadStatus::Ready:
status = tr("ready");
break;
- case ThreadStatus::WaitHLEEvent:
+ case Kernel::ThreadStatus::WaitHLEEvent:
status = tr("waiting for HLE return");
break;
- case ThreadStatus::WaitSleep:
+ case Kernel::ThreadStatus::WaitSleep:
status = tr("sleeping");
break;
- case ThreadStatus::WaitIPC:
+ case Kernel::ThreadStatus::WaitIPC:
status = tr("waiting for IPC reply");
break;
- case ThreadStatus::WaitSynchAll:
- case ThreadStatus::WaitSynchAny:
+ case Kernel::ThreadStatus::WaitSynchAll:
+ case Kernel::ThreadStatus::WaitSynchAny:
status = tr("waiting for objects");
break;
- case ThreadStatus::WaitMutex:
+ case Kernel::ThreadStatus::WaitMutex:
status = tr("waiting for mutex");
break;
- case ThreadStatus::WaitArb:
+ case Kernel::ThreadStatus::WaitArb:
status = tr("waiting for address arbiter");
break;
- case ThreadStatus::Dormant:
+ case Kernel::ThreadStatus::Dormant:
status = tr("dormant");
break;
- case ThreadStatus::Dead:
+ case Kernel::ThreadStatus::Dead:
status = tr("dead");
break;
}
@@ -254,23 +254,23 @@ QString WaitTreeThread::GetText() const {
QColor WaitTreeThread::GetColor() const {
const auto& thread = static_cast<const Kernel::Thread&>(object);
switch (thread.status) {
- case ThreadStatus::Running:
+ case Kernel::ThreadStatus::Running:
return QColor(Qt::GlobalColor::darkGreen);
- case ThreadStatus::Ready:
+ case Kernel::ThreadStatus::Ready:
return QColor(Qt::GlobalColor::darkBlue);
- case ThreadStatus::WaitHLEEvent:
- case ThreadStatus::WaitIPC:
+ case Kernel::ThreadStatus::WaitHLEEvent:
+ case Kernel::ThreadStatus::WaitIPC:
return QColor(Qt::GlobalColor::darkRed);
- case ThreadStatus::WaitSleep:
+ case Kernel::ThreadStatus::WaitSleep:
return QColor(Qt::GlobalColor::darkYellow);
- case ThreadStatus::WaitSynchAll:
- case ThreadStatus::WaitSynchAny:
- case ThreadStatus::WaitMutex:
- case ThreadStatus::WaitArb:
+ case Kernel::ThreadStatus::WaitSynchAll:
+ case Kernel::ThreadStatus::WaitSynchAny:
+ case Kernel::ThreadStatus::WaitMutex:
+ case Kernel::ThreadStatus::WaitArb:
return QColor(Qt::GlobalColor::red);
- case ThreadStatus::Dormant:
+ case Kernel::ThreadStatus::Dormant:
return QColor(Qt::GlobalColor::darkCyan);
- case ThreadStatus::Dead:
+ case Kernel::ThreadStatus::Dead:
return QColor(Qt::GlobalColor::gray);
default:
return WaitTreeItem::GetColor();
@@ -284,13 +284,13 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeThread::GetChildren() const {
QString processor;
switch (thread.processor_id) {
- case ThreadProcessorId::THREADPROCESSORID_DEFAULT:
+ case Kernel::ThreadProcessorId::THREADPROCESSORID_DEFAULT:
processor = tr("default");
break;
- case ThreadProcessorId::THREADPROCESSORID_0:
- case ThreadProcessorId::THREADPROCESSORID_1:
- case ThreadProcessorId::THREADPROCESSORID_2:
- case ThreadProcessorId::THREADPROCESSORID_3:
+ case Kernel::ThreadProcessorId::THREADPROCESSORID_0:
+ case Kernel::ThreadProcessorId::THREADPROCESSORID_1:
+ case Kernel::ThreadProcessorId::THREADPROCESSORID_2:
+ case Kernel::ThreadProcessorId::THREADPROCESSORID_3:
processor = tr("core %1").arg(thread.processor_id);
break;
default:
@@ -314,8 +314,8 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeThread::GetChildren() const {
else
list.push_back(std::make_unique<WaitTreeText>(tr("not waiting for mutex")));
- if (thread.status == ThreadStatus::WaitSynchAny ||
- thread.status == ThreadStatus::WaitSynchAll) {
+ if (thread.status == Kernel::ThreadStatus::WaitSynchAny ||
+ thread.status == Kernel::ThreadStatus::WaitSynchAll) {
list.push_back(std::make_unique<WaitTreeObjectList>(thread.wait_objects,
thread.IsSleepingOnWaitAll()));
}
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 05a4a55e8..22a317737 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -449,6 +449,8 @@ QStringList GMainWindow::GetUnsupportedGLExtensions() {
unsupported_ext.append("ARB_base_instance");
if (!GLAD_GL_ARB_texture_storage)
unsupported_ext.append("ARB_texture_storage");
+ if (!GLAD_GL_ARB_multi_bind)
+ unsupported_ext.append("ARB_multi_bind");
// Extensions required to support some texture formats.
if (!GLAD_GL_EXT_texture_compression_s3tc)
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-28 14:07:57 +0000