piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-27 00:00:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge doublemelon (#2067)

Browse Source 
non-exhaustive (but exhausting) list of changes:

* base laid for multiple window support, but will likely require more work to work correctly
* encapsulation of frontend state for proper multi-instance support
* (JIT still needs a fix for the NDS::Current workaround but we can get there later)
* new, more flexible configuration system
This commit is contained in:
Arisotura
2024-06-15 13:52:47 +02:00
committed by GitHub
parent 8e9b88d01d
commit 25a7b1ca1d
111 changed files with 16802 additions and 5042 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
src/frontend/qt_sdl/AudioSettingsDialog.cpp
View File

@ -16,7 +16,6 @@
with melonDS. If not, see http://www.gnu.org/licenses/.
*/
#include <stdio.h>
#include <SDL2/SDL.h>
#include <QFileDialog>
@ -25,7 +24,6 @@
#include "Config.h"
#include "NDS.h"
#include "DSi.h"
#include "DSi_I2C.h"
#include "AudioSettingsDialog.h"
#include "ui_AudioSettingsDialog.h"
@ -34,47 +32,56 @@
using namespace melonDS;
AudioSettingsDialog* AudioSettingsDialog::currentDlg = nullptr;
extern std::string EmuDirectory;
AudioSettingsDialog::AudioSettingsDialog(QWidget* parent, bool emuActive, EmuThread* emuThread) : QDialog(parent), ui(new Ui::AudioSettingsDialog), emuThread(emuThread)
AudioSettingsDialog::AudioSettingsDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AudioSettingsDialog)
{
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
oldInterp = Config::AudioInterp;
oldBitDepth = Config::AudioBitDepth;
oldVolume = Config::AudioVolume;
oldDSiSync = Config::DSiVolumeSync;
emuInstance = ((MainWindow*)parent)->getEmuInstance();
auto& cfg = emuInstance->getGlobalConfig();
auto& instcfg = emuInstance->getLocalConfig();
bool emuActive = emuInstance->getEmuThread()->emuIsActive();
oldInterp = cfg.GetInt("Audio.Interpolation");
oldBitDepth = cfg.GetInt("Audio.BitDepth");
oldVolume = instcfg.GetInt("Audio.Volume");
oldDSiSync = instcfg.GetBool("Audio.DSiVolumeSync");
volume = oldVolume;
dsiSync = oldDSiSync;
ui->cbInterpolation->addItem("None");
ui->cbInterpolation->addItem("Linear");
ui->cbInterpolation->addItem("Cosine");
ui->cbInterpolation->addItem("Cubic");
ui->cbInterpolation->addItem("Gaussian (SNES)");
ui->cbInterpolation->setCurrentIndex(Config::AudioInterp);
ui->cbInterpolation->setCurrentIndex(oldInterp);
ui->cbBitDepth->addItem("Automatic");
ui->cbBitDepth->addItem("10-bit");
ui->cbBitDepth->addItem("16-bit");
ui->cbBitDepth->setCurrentIndex(Config::AudioBitDepth);
ui->cbBitDepth->setCurrentIndex(oldBitDepth);
bool state = ui->slVolume->blockSignals(true);
ui->slVolume->setValue(Config::AudioVolume);
ui->slVolume->setValue(oldVolume);
ui->slVolume->blockSignals(state);
ui->chkSyncDSiVolume->setChecked(Config::DSiVolumeSync);
ui->chkSyncDSiVolume->setChecked(oldDSiSync);
// Setup volume slider accordingly
if (emuActive && emuThread->NDS->ConsoleType == 1)
if (emuActive && emuInstance->getNDS()->ConsoleType == 1)
{
on_chkSyncDSiVolume_clicked(Config::DSiVolumeSync);
on_chkSyncDSiVolume_clicked(oldDSiSync);
}
else
{
ui->chkSyncDSiVolume->setEnabled(false);
}
bool isext = (Config::MicInputType == 1);
int mictype = cfg.GetInt("Mic.InputType");
bool isext = (mictype == micInputType_External);
ui->cbMic->setEnabled(isext);
const int count = SDL_GetNumAudioDevices(true);
@ -82,12 +89,14 @@ AudioSettingsDialog::AudioSettingsDialog(QWidget* parent, bool emuActive, EmuThr
{
ui->cbMic->addItem(SDL_GetAudioDeviceName(i, true));
}
if (Config::MicDevice == "" && count > 0)
QString micdev = cfg.GetQString("Mic.Device");
if (micdev == "" && count > 0)
{
Config::MicDevice = SDL_GetAudioDeviceName(0, true);
micdev = SDL_GetAudioDeviceName(0, true);
}
ui->cbMic->setCurrentText(QString::fromStdString(Config::MicDevice));
ui->cbMic->setCurrentText(micdev);
grpMicMode = new QButtonGroup(this);
grpMicMode->addButton(ui->rbMicNone, micInputType_Silence);
@ -95,15 +104,15 @@ AudioSettingsDialog::AudioSettingsDialog(QWidget* parent, bool emuActive, EmuThr
grpMicMode->addButton(ui->rbMicNoise, micInputType_Noise);
grpMicMode->addButton(ui->rbMicWav, micInputType_Wav);
connect(grpMicMode, SIGNAL(buttonClicked(int)), this, SLOT(onChangeMicMode(int)));
grpMicMode->button(Config::MicInputType)->setChecked(true);
grpMicMode->button(mictype)->setChecked(true);
ui->txtMicWavPath->setText(QString::fromStdString(Config::MicWavPath));
ui->txtMicWavPath->setText(cfg.GetQString("Mic.WavPath"));
bool iswav = (Config::MicInputType == micInputType_Wav);
bool iswav = (mictype == micInputType_Wav);
ui->txtMicWavPath->setEnabled(iswav);
ui->btnMicWavBrowse->setEnabled(iswav);
int inst = Platform::InstanceID();
int inst = emuInstance->getInstanceID();
if (inst > 0)
{
ui->lblInstanceNum->setText(QString("Configuring settings for instance %1").arg(inst+1));
@ -126,26 +135,30 @@ AudioSettingsDialog::~AudioSettingsDialog()
void AudioSettingsDialog::onSyncVolumeLevel()
{
if (Config::DSiVolumeSync && emuThread->NDS->ConsoleType == 1)
if (dsiSync && emuInstance->getNDS()->ConsoleType == 1)
{
auto& dsi = static_cast<DSi&>(*emuThread->NDS);
auto dsi = static_cast<DSi*>(emuInstance->getNDS());
volume = dsi->I2C.GetBPTWL()->GetVolumeLevel();
bool state = ui->slVolume->blockSignals(true);
ui->slVolume->setValue(dsi.I2C.GetBPTWL()->GetVolumeLevel());
ui->slVolume->setValue(volume);
ui->slVolume->blockSignals(state);
}
}
void AudioSettingsDialog::onConsoleReset()
{
on_chkSyncDSiVolume_clicked(Config::DSiVolumeSync);
ui->chkSyncDSiVolume->setEnabled(emuThread->NDS->ConsoleType == 1);
on_chkSyncDSiVolume_clicked(dsiSync);
ui->chkSyncDSiVolume->setEnabled(emuInstance->getNDS()->ConsoleType == 1);
}
void AudioSettingsDialog::on_AudioSettingsDialog_accepted()
{
Config::MicDevice = ui->cbMic->currentText().toStdString();
Config::MicInputType = grpMicMode->checkedId();
Config::MicWavPath = ui->txtMicWavPath->text().toStdString();
auto& cfg = emuInstance->getGlobalConfig();
cfg.SetQString("Mic.Device", ui->cbMic->currentText());
cfg.SetInt("Mic.InputType", grpMicMode->checkedId());
cfg.SetQString("Mic.WavPath", ui->txtMicWavPath->text());
Config::Save();
closeDlg();
@ -153,10 +166,15 @@ void AudioSettingsDialog::on_AudioSettingsDialog_accepted()
void AudioSettingsDialog::on_AudioSettingsDialog_rejected()
{
Config::AudioInterp = oldInterp;
Config::AudioBitDepth = oldBitDepth;
Config::AudioVolume = oldVolume;
Config::DSiVolumeSync = oldDSiSync;
auto& cfg = emuInstance->getGlobalConfig();
auto& instcfg = emuInstance->getLocalConfig();
cfg.SetInt("Audio.Interpolation", oldInterp);
cfg.SetInt("Audio.BitDepth", oldBitDepth);
instcfg.SetInt("Audio.Volume", oldVolume);
instcfg.SetBool("Audio.DSiVolumeSync", oldDSiSync);
emit updateAudioVolume(oldVolume, oldDSiSync);
emit updateAudioSettings();
closeDlg();
}
@ -166,7 +184,8 @@ void AudioSettingsDialog::on_cbBitDepth_currentIndexChanged(int idx)
// prevent a spurious change
if (ui->cbBitDepth->count() < 3) return;
Config::AudioBitDepth = ui->cbBitDepth->currentIndex();
auto& cfg = emuInstance->getGlobalConfig();
cfg.SetInt("Audio.BitDepth", ui->cbBitDepth->currentIndex());
emit updateAudioSettings();
}
@ -176,45 +195,56 @@ void AudioSettingsDialog::on_cbInterpolation_currentIndexChanged(int idx)
// prevent a spurious change
if (ui->cbInterpolation->count() < 5) return;
Config::AudioInterp = ui->cbInterpolation->currentIndex();
auto& cfg = emuInstance->getGlobalConfig();
cfg.SetInt("Audio.Interpolation", ui->cbInterpolation->currentIndex());
emit updateAudioSettings();
}
void AudioSettingsDialog::on_slVolume_valueChanged(int val)
{
if (Config::DSiVolumeSync && emuThread->NDS->ConsoleType == 1)
auto& cfg = emuInstance->getLocalConfig();
if (dsiSync && emuInstance->getNDS()->ConsoleType == 1)
{
auto& dsi = static_cast<DSi&>(*emuThread->NDS);
dsi.I2C.GetBPTWL()->SetVolumeLevel(val);
auto dsi = static_cast<DSi*>(emuInstance->getNDS());
dsi->I2C.GetBPTWL()->SetVolumeLevel(val);
return;
}
Config::AudioVolume = val;
volume = val;
cfg.SetInt("Audio.Volume", val);
emit updateAudioVolume(val, dsiSync);
}
void AudioSettingsDialog::on_chkSyncDSiVolume_clicked(bool checked)
{
Config::DSiVolumeSync = checked;
dsiSync = checked;
auto& cfg = emuInstance->getLocalConfig();
cfg.SetBool("Audio.DSiVolumeSync", dsiSync);
bool state = ui->slVolume->blockSignals(true);
if (Config::DSiVolumeSync && emuThread->NDS->ConsoleType == 1)
if (dsiSync && emuInstance->getNDS()->ConsoleType == 1)
{
auto& dsi = static_cast<DSi&>(*emuThread->NDS);
auto dsi = static_cast<DSi*>(emuInstance->getNDS());
ui->slVolume->setMaximum(31);
ui->slVolume->setValue(dsi.I2C.GetBPTWL()->GetVolumeLevel());
ui->slVolume->setValue(dsi->I2C.GetBPTWL()->GetVolumeLevel());
ui->slVolume->setPageStep(4);
ui->slVolume->setTickPosition(QSlider::TicksBelow);
}
else
{
Config::AudioVolume = oldVolume;
volume = oldVolume;
cfg.SetInt("Audio.Volume", oldVolume);
ui->slVolume->setMaximum(256);
ui->slVolume->setValue(Config::AudioVolume);
ui->slVolume->setValue(oldVolume);
ui->slVolume->setPageStep(16);
ui->slVolume->setTickPosition(QSlider::NoTicks);
}
ui->slVolume->blockSignals(state);
emit updateAudioVolume(volume, dsiSync);
}
void AudioSettingsDialog::onChangeMicMode(int mode)
@ -230,7 +260,7 @@ void AudioSettingsDialog::on_btnMicWavBrowse_clicked()
{
QString file = QFileDialog::getOpenFileName(this,
"Select WAV file...",
QString::fromStdString(EmuDirectory),
emuDirectory,
"WAV files (*.wav);;Any file (*.*)");
if (file.isEmpty()) return;