From a6dcaed415197a243b5af3353ea6371a5759a273 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 17 Jul 2019 20:02:08 +0200 Subject: DolphinQt: Move frame dumping settings to new group box --- .../Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp') diff --git a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp index 86aad9fc68..7ff340d8b2 100644 --- a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp @@ -66,13 +66,10 @@ void AdvancedWidget::CreateWidgets() m_load_custom_textures = new GraphicsBool(tr("Load Custom Textures"), Config::GFX_HIRES_TEXTURES); m_prefetch_custom_textures = new GraphicsBool(tr("Prefetch Custom Textures"), Config::GFX_CACHE_HIRES_TEXTURES); - m_use_fullres_framedumps = new GraphicsBool(tr("Internal Resolution Frame Dumps"), - Config::GFX_INTERNAL_RESOLUTION_FRAME_DUMPS); m_dump_efb_target = new GraphicsBool(tr("Dump EFB Target"), Config::GFX_DUMP_EFB_TARGET); m_disable_vram_copies = new GraphicsBool(tr("Disable EFB VRAM Copies"), Config::GFX_HACK_DISABLE_COPY_TO_VRAM); m_enable_freelook = new GraphicsBool(tr("Free Look"), Config::GFX_FREE_LOOK); - m_dump_use_ffv1 = new GraphicsBool(tr("Frame Dumps Use FFV1"), Config::GFX_USE_FFV1); utility_layout->addWidget(m_load_custom_textures, 0, 0); utility_layout->addWidget(m_prefetch_custom_textures, 0, 1); @@ -83,9 +80,18 @@ void AdvancedWidget::CreateWidgets() utility_layout->addWidget(m_dump_textures, 2, 0); utility_layout->addWidget(m_dump_efb_target, 2, 1); - utility_layout->addWidget(m_use_fullres_framedumps, 3, 0); + // Frame dumping + auto* dump_box = new QGroupBox(tr("Frame Dumping")); + auto* dump_layout = new QGridLayout(); + dump_box->setLayout(dump_layout); + + m_use_fullres_framedumps = new GraphicsBool(tr("Dump at Internal Resolution"), + Config::GFX_INTERNAL_RESOLUTION_FRAME_DUMPS); + m_dump_use_ffv1 = new GraphicsBool(tr("Use Lossless Codec (FFV1)"), Config::GFX_USE_FFV1); + + dump_layout->addWidget(m_use_fullres_framedumps, 0, 0); #if defined(HAVE_FFMPEG) - utility_layout->addWidget(m_dump_use_ffv1, 3, 1); + dump_layout->addWidget(m_dump_use_ffv1, 0, 1); #endif // Misc. @@ -120,6 +126,7 @@ void AdvancedWidget::CreateWidgets() main_layout->addWidget(debugging_box); main_layout->addWidget(utility_box); + main_layout->addWidget(dump_box); main_layout->addWidget(misc_box); main_layout->addWidget(experimental_box); main_layout->addStretch(); -- cgit v1.2.3 From 199c565bf5fec9ba0f239a4ec8585914c3df4b9d Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 17 Jul 2019 20:15:25 +0200 Subject: DolphinQt: Add the dumping bitrate setting to the graphics config Fixes https://bugs.dolphin-emu.org/issues/10250 --- Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp') diff --git a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp index 7ff340d8b2..f84885798f 100644 --- a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include #include "Core/Config/GraphicsSettings.h" @@ -16,6 +18,7 @@ #include "DolphinQt/Config/Graphics/GraphicsBool.h" #include "DolphinQt/Config/Graphics/GraphicsChoice.h" +#include "DolphinQt/Config/Graphics/GraphicsInteger.h" #include "DolphinQt/Config/Graphics/GraphicsWindow.h" #include "DolphinQt/Settings.h" @@ -88,10 +91,13 @@ void AdvancedWidget::CreateWidgets() m_use_fullres_framedumps = new GraphicsBool(tr("Dump at Internal Resolution"), Config::GFX_INTERNAL_RESOLUTION_FRAME_DUMPS); m_dump_use_ffv1 = new GraphicsBool(tr("Use Lossless Codec (FFV1)"), Config::GFX_USE_FFV1); + m_dump_bitrate = new GraphicsInteger(0, 1000000, Config::GFX_BITRATE_KBPS, 1000); dump_layout->addWidget(m_use_fullres_framedumps, 0, 0); #if defined(HAVE_FFMPEG) dump_layout->addWidget(m_dump_use_ffv1, 0, 1); + dump_layout->addWidget(new QLabel(tr("Bitrate (kbps):")), 1, 0); + dump_layout->addWidget(m_dump_bitrate, 1, 1); #endif // Misc. @@ -137,19 +143,22 @@ void AdvancedWidget::CreateWidgets() void AdvancedWidget::ConnectWidgets() { connect(m_load_custom_textures, &QCheckBox::toggled, this, &AdvancedWidget::SaveSettings); + connect(m_dump_use_ffv1, &QCheckBox::toggled, this, &AdvancedWidget::SaveSettings); connect(m_enable_prog_scan, &QCheckBox::toggled, this, &AdvancedWidget::SaveSettings); } void AdvancedWidget::LoadSettings() { m_prefetch_custom_textures->setEnabled(Config::Get(Config::GFX_HIRES_TEXTURES)); + m_dump_bitrate->setEnabled(!Config::Get(Config::GFX_USE_FFV1)); + m_enable_prog_scan->setChecked(Config::Get(Config::SYSCONF_PROGRESSIVE_SCAN)); } void AdvancedWidget::SaveSettings() { - const auto hires_enabled = Config::Get(Config::GFX_HIRES_TEXTURES); - m_prefetch_custom_textures->setEnabled(hires_enabled); + m_prefetch_custom_textures->setEnabled(Config::Get(Config::GFX_HIRES_TEXTURES)); + m_dump_bitrate->setEnabled(!Config::Get(Config::GFX_USE_FFV1)); Config::SetBase(Config::SYSCONF_PROGRESSIVE_SCAN, m_enable_prog_scan->isChecked()); } -- cgit v1.2.3