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

actually rename that setting

Browse Source
This commit is contained in:
Nadia Holmquist Pedersen
2023-06-24 16:34:23 +02:00
parent 74b166cba3
commit 4b32fb802c
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/NDS.cpp
View File

@ -674,10 +674,10 @@ void Reset()
degradeAudio = false; degradeAudio = false;
} }
int bitrate = Platform::GetConfigInt(Platform::AudioBitrate); int bitDepth = Platform::GetConfigInt(Platform::AudioBitDepth);
if (bitrate == 1) // Always 10-bit if (bitDepth == 1) // Always 10-bit
degradeAudio = true; degradeAudio = true;
else if (bitrate == 2) // Always 16-bit else if (bitDepth == 2) // Always 16-bit
degradeAudio = false; degradeAudio = false;
SPU::SetDegrade10Bit(degradeAudio); SPU::SetDegrade10Bit(degradeAudio);

2
src/Platform.h
View File

@ -82,7 +82,7 @@ enum ConfigEntry
Firm_Message, Firm_Message,
Firm_MAC, Firm_MAC,
AudioBitrate, AudioBitDepth,
}; };
int GetConfigInt(ConfigEntry entry); int GetConfigInt(ConfigEntry entry);

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

@ -40,7 +40,7 @@ AudioSettingsDialog::AudioSettingsDialog(QWidget* parent, bool emuActive) : QDia
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
oldInterp = Config::AudioInterp; oldInterp = Config::AudioInterp;
oldBitrate = Config::AudioBitrate; oldBitDepth = Config::AudioBitDepth;
oldVolume = Config::AudioVolume; oldVolume = Config::AudioVolume;
oldDSiSync = Config::DSiVolumeSync; oldDSiSync = Config::DSiVolumeSync;
@ -50,10 +50,10 @@ AudioSettingsDialog::AudioSettingsDialog(QWidget* parent, bool emuActive) : QDia
ui->cbInterpolation->addItem("Cubic"); ui->cbInterpolation->addItem("Cubic");
ui->cbInterpolation->setCurrentIndex(Config::AudioInterp); ui->cbInterpolation->setCurrentIndex(Config::AudioInterp);
ui->cbBitrate->addItem("Automatic"); ui->cbBitDepth->addItem("Automatic");
ui->cbBitrate->addItem("10-bit"); ui->cbBitDepth->addItem("10-bit");
ui->cbBitrate->addItem("16-bit"); ui->cbBitDepth->addItem("16-bit");
ui->cbBitrate->setCurrentIndex(Config::AudioBitrate); ui->cbBitDepth->setCurrentIndex(Config::AudioBitDepth);
bool state = ui->slVolume->blockSignals(true); bool state = ui->slVolume->blockSignals(true);
ui->slVolume->setValue(Config::AudioVolume); ui->slVolume->setValue(Config::AudioVolume);
@ -90,7 +90,7 @@ AudioSettingsDialog::AudioSettingsDialog(QWidget* parent, bool emuActive) : QDia
{ {
ui->lblInstanceNum->setText(QString("Configuring settings for instance %1").arg(inst+1)); ui->lblInstanceNum->setText(QString("Configuring settings for instance %1").arg(inst+1));
ui->cbInterpolation->setEnabled(false); ui->cbInterpolation->setEnabled(false);
ui->cbBitrate->setEnabled(false); ui->cbBitDepth->setEnabled(false);
for (QAbstractButton* btn : grpMicMode->buttons()) for (QAbstractButton* btn : grpMicMode->buttons())
btn->setEnabled(false); btn->setEnabled(false);
ui->txtMicWavPath->setEnabled(false); ui->txtMicWavPath->setEnabled(false);
@ -133,19 +133,19 @@ void AudioSettingsDialog::on_AudioSettingsDialog_accepted()
void AudioSettingsDialog::on_AudioSettingsDialog_rejected() void AudioSettingsDialog::on_AudioSettingsDialog_rejected()
{ {
Config::AudioInterp = oldInterp; Config::AudioInterp = oldInterp;
Config::AudioBitrate = oldBitrate; Config::AudioBitDepth = oldBitDepth;
Config::AudioVolume = oldVolume; Config::AudioVolume = oldVolume;
Config::DSiVolumeSync = oldDSiSync; Config::DSiVolumeSync = oldDSiSync;
closeDlg(); closeDlg();
} }
void AudioSettingsDialog::on_cbBitrate_currentIndexChanged(int idx) void AudioSettingsDialog::on_cbBitDepth_currentIndexChanged(int idx)
{ {
// prevent a spurious change // prevent a spurious change
if (ui->cbBitrate->count() < 3) return; if (ui->cbBitDepth->count() < 3) return;
Config::AudioBitrate = ui->cbBitrate->currentIndex(); Config::AudioBitDepth = ui->cbBitDepth->currentIndex();
emit updateAudioSettings(); emit updateAudioSettings();
} }

4
src/frontend/qt_sdl/AudioSettingsDialog.h
View File

@ -62,7 +62,7 @@ private slots:
void on_AudioSettingsDialog_rejected(); void on_AudioSettingsDialog_rejected();
void on_cbInterpolation_currentIndexChanged(int idx); void on_cbInterpolation_currentIndexChanged(int idx);
void on_cbBitrate_currentIndexChanged(int idx); void on_cbBitDepth_currentIndexChanged(int idx);
void on_slVolume_valueChanged(int val); void on_slVolume_valueChanged(int val);
void on_chkSyncDSiVolume_clicked(bool checked); void on_chkSyncDSiVolume_clicked(bool checked);
void onChangeMicMode(int mode); void onChangeMicMode(int mode);
@ -72,7 +72,7 @@ private:
Ui::AudioSettingsDialog* ui; Ui::AudioSettingsDialog* ui;
int oldInterp; int oldInterp;
int oldBitrate; int oldBitDepth;
int oldVolume; int oldVolume;
bool oldDSiSync; bool oldDSiSync;
QButtonGroup* grpMicMode; QButtonGroup* grpMicMode;

8
src/frontend/qt_sdl/AudioSettingsDialog.ui
View File

@ -86,14 +86,14 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Bitrate:</string> <string>Bit depth:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="cbBitrate"> <widget class="QComboBox" name="cbBitDepth">
<property name="whatsThis"> <property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bitrate of audio playback. If set to &quot;Automatic&quot; this will be 10-bit for DS mode and 16-bit for DSi mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bit depth of audio playback. If set to &quot;Automatic&quot; this will be 10-bit for DS mode and 16-bit for DSi mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -190,7 +190,7 @@
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>cbInterpolation</tabstop> <tabstop>cbInterpolation</tabstop>
<tabstop>cbBitrate</tabstop> <tabstop>cbBitDepth</tabstop>
<tabstop>slVolume</tabstop> <tabstop>slVolume</tabstop>
<tabstop>chkSyncDSiVolume</tabstop> <tabstop>chkSyncDSiVolume</tabstop>
<tabstop>rbMicNone</tabstop> <tabstop>rbMicNone</tabstop>

4
src/frontend/qt_sdl/Config.cpp
View File

@ -116,7 +116,7 @@ bool DirectLAN;
bool SavestateRelocSRAM; bool SavestateRelocSRAM;
int AudioInterp; int AudioInterp;
int AudioBitrate; int AudioBitDepth;
int AudioVolume; int AudioVolume;
bool DSiVolumeSync; bool DSiVolumeSync;
int MicInputType; int MicInputType;
@ -296,7 +296,7 @@ ConfigEntry ConfigFile[] =
{"SavStaRelocSRAM", 1, &SavestateRelocSRAM, false, false}, {"SavStaRelocSRAM", 1, &SavestateRelocSRAM, false, false},
{"AudioInterp", 0, &AudioInterp, 0, false}, {"AudioInterp", 0, &AudioInterp, 0, false},
{"AudioBitrate", 0, &AudioBitrate, 0, false}, {"AudioBitDepth", 0, &AudioBitDepth, 0, false},
{"AudioVolume", 0, &AudioVolume, 256, true}, {"AudioVolume", 0, &AudioVolume, 256, true},
{"DSiVolumeSync", 0, &DSiVolumeSync, 0, true}, {"DSiVolumeSync", 0, &DSiVolumeSync, 0, true},
{"MicInputType", 0, &MicInputType, 1, false}, {"MicInputType", 0, &MicInputType, 1, false},

2
src/frontend/qt_sdl/Config.h
View File

@ -173,7 +173,7 @@ extern bool DirectLAN;
extern bool SavestateRelocSRAM; extern bool SavestateRelocSRAM;
extern int AudioInterp; extern int AudioInterp;
extern int AudioBitrate; extern int AudioBitDepth;
extern int AudioVolume; extern int AudioVolume;
extern bool DSiVolumeSync; extern bool DSiVolumeSync;
extern int MicInputType; extern int MicInputType;

2
src/frontend/qt_sdl/Platform.cpp
View File

@ -191,7 +191,7 @@ int GetConfigInt(ConfigEntry entry)
case Firm_BirthdayDay: return Config::FirmwareBirthdayDay; case Firm_BirthdayDay: return Config::FirmwareBirthdayDay;
case Firm_Color: return Config::FirmwareFavouriteColour; case Firm_Color: return Config::FirmwareFavouriteColour;
case AudioBitrate: return Config::AudioBitrate; case AudioBitDepth: return Config::AudioBitDepth;
} }
return 0; return 0;

4
src/frontend/qt_sdl/main.cpp
View File

@ -2905,10 +2905,10 @@ void MainWindow::onUpdateAudioSettings()
{ {
SPU::SetInterpolation(Config::AudioInterp); SPU::SetInterpolation(Config::AudioInterp);
if (Config::AudioBitrate == 0) if (Config::AudioBitDepth == 0)
SPU::SetDegrade10Bit(NDS::ConsoleType == 0); SPU::SetDegrade10Bit(NDS::ConsoleType == 0);
else else
SPU::SetDegrade10Bit(Config::AudioBitrate == 1); SPU::SetDegrade10Bit(Config::AudioBitDepth == 1);
} }
void MainWindow::onAudioSettingsFinished(int res) void MainWindow::onAudioSettingsFinished(int res)