ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed wording

This commit is contained in:
Thomas Jentzsch 2019-07-25 16:49:02 +02:00
parent dc7697a4d4
commit d6e2c11275
1 changed files with 351 additions and 351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

702
src/gui/AudioDialog.cxx
View File

@ -1,351 +1,351 @@
//============================================================================ //============================================================================
// //
// SSSS tt lll lll // SSSS tt lll lll
// SS SS tt ll ll // SS SS tt ll ll
// SS tttttt eeee ll ll aaaa // SS tttttt eeee ll ll aaaa
// SSSS tt ee ee ll ll aa // SSSS tt ee ee ll ll aa
// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator" // SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
// SS SS tt ee ll ll aa aa // SS SS tt ee ll ll aa aa
// SSSS ttt eeeee llll llll aaaaa // SSSS ttt eeeee llll llll aaaaa
// //
// Copyright (c) 1995-2019 by Bradford W. Mott, Stephen Anthony // Copyright (c) 1995-2019 by Bradford W. Mott, Stephen Anthony
// and the Stella Team // and the Stella Team
// //
// See the file "License.txt" for information on usage and redistribution of // See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include <sstream> #include <sstream>
#include "bspf.hxx" #include "bspf.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "Cart.hxx" #include "Cart.hxx"
#include "CartDPC.hxx" #include "CartDPC.hxx"
#include "Control.hxx" #include "Control.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "Font.hxx" #include "Font.hxx"
#include "Menu.hxx" #include "Menu.hxx"
#include "OSystem.hxx" #include "OSystem.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "Sound.hxx" #include "Sound.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "AudioSettings.hxx" #include "AudioSettings.hxx"
#include "AudioDialog.hxx" #include "AudioDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent, AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent,
const GUI::Font& font) const GUI::Font& font)
: Dialog(osystem, parent, font, "Audio settings") : Dialog(osystem, parent, font, "Audio settings")
{ {
const int VBORDER = 10; const int VBORDER = 10;
const int HBORDER = 10; const int HBORDER = 10;
const int INDENT = 20; const int INDENT = 20;
const int VGAP = 4; const int VGAP = 4;
const int lineHeight = font.getLineHeight(), const int lineHeight = font.getLineHeight(),
fontWidth = font.getMaxCharWidth(); fontWidth = font.getMaxCharWidth();
int xpos, ypos; int xpos, ypos;
int lwidth = font.getStringWidth("Volume "), int lwidth = font.getStringWidth("Volume "),
pwidth; pwidth;
WidgetArray wid; WidgetArray wid;
VariantList items; VariantList items;
// Set real dimensions // Set real dimensions
_w = 48 * fontWidth + HBORDER * 2; _w = 48 * fontWidth + HBORDER * 2;
_h = 12 * (lineHeight + VGAP) + VBORDER + _th; _h = 12 * (lineHeight + VGAP) + VBORDER + _th;
xpos = HBORDER; ypos = VBORDER + _th; xpos = HBORDER; ypos = VBORDER + _th;
// Enable sound // Enable sound
mySoundEnableCheckbox = new CheckboxWidget(this, font, xpos, ypos, mySoundEnableCheckbox = new CheckboxWidget(this, font, xpos, ypos,
"Enable sound", kSoundEnableChanged); "Enable sound", kSoundEnableChanged);
wid.push_back(mySoundEnableCheckbox); wid.push_back(mySoundEnableCheckbox);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
xpos += INDENT; xpos += INDENT;
// Volume // Volume
myVolumeSlider = new SliderWidget(this, font, xpos, ypos, myVolumeSlider = new SliderWidget(this, font, xpos, ypos,
"Volume", lwidth, 0, 4 * fontWidth, "%"); "Volume", lwidth, 0, 4 * fontWidth, "%");
myVolumeSlider->setMinValue(1); myVolumeSlider->setMaxValue(100); myVolumeSlider->setMinValue(1); myVolumeSlider->setMaxValue(100);
myVolumeSlider->setTickmarkIntervals(4); myVolumeSlider->setTickmarkIntervals(4);
wid.push_back(myVolumeSlider); wid.push_back(myVolumeSlider);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
// Mode // Mode
items.clear(); items.clear();
VarList::push_back(items, "Low quality, medium lag", static_cast<int>(AudioSettings::Preset::lowQualityMediumLag)); VarList::push_back(items, "Low quality, medium lag", static_cast<int>(AudioSettings::Preset::lowQualityMediumLag));
VarList::push_back(items, "High quality, medium lag", static_cast<int>(AudioSettings::Preset::highQualityMediumLag)); VarList::push_back(items, "High quality, medium lag", static_cast<int>(AudioSettings::Preset::highQualityMediumLag));
VarList::push_back(items, "High quality, low lag", static_cast<int>(AudioSettings::Preset::highQualityLowLag)); VarList::push_back(items, "High quality, low lag", static_cast<int>(AudioSettings::Preset::highQualityLowLag));
VarList::push_back(items, "Ultra quality, minimal lag", static_cast<int>(AudioSettings::Preset::ultraQualityMinimalLag)); VarList::push_back(items, "Ultra quality, minimal lag", static_cast<int>(AudioSettings::Preset::ultraQualityMinimalLag));
VarList::push_back(items, "Custom", static_cast<int>(AudioSettings::Preset::custom)); VarList::push_back(items, "Custom", static_cast<int>(AudioSettings::Preset::custom));
myModePopup = new PopUpWidget(this, font, xpos, ypos, myModePopup = new PopUpWidget(this, font, xpos, ypos,
font.getStringWidth("Ultry quality, minimal lag"), lineHeight, font.getStringWidth("Ultry quality, minimal lag"), lineHeight,
items, "Mode", lwidth, kModeChanged); items, "Mode", lwidth, kModeChanged);
wid.push_back(myModePopup); wid.push_back(myModePopup);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
xpos += INDENT; xpos += INDENT;
// Fragment size // Fragment size
pwidth = font.getStringWidth("512 samples"); pwidth = font.getStringWidth("512 samples") + 7;
lwidth = font.getStringWidth("Resampling quality "); lwidth = font.getStringWidth("Resampling quality ");
items.clear(); items.clear();
VarList::push_back(items, "128 samples", 128); VarList::push_back(items, "128 samples", 128);
VarList::push_back(items, "256 samples", 256); VarList::push_back(items, "256 samples", 256);
VarList::push_back(items, "512 samples", 512); VarList::push_back(items, "512 samples", 512);
VarList::push_back(items, "1k samples", 1024); VarList::push_back(items, "1k samples", 1024);
VarList::push_back(items, "2k samples", 2048); VarList::push_back(items, "2k samples", 2048);
VarList::push_back(items, "4K samples", 4096); VarList::push_back(items, "4K samples", 4096);
myFragsizePopup = new PopUpWidget(this, font, xpos, ypos, myFragsizePopup = new PopUpWidget(this, font, xpos, ypos,
pwidth, lineHeight, pwidth, lineHeight,
items, "Fragment size", lwidth); items, "Fragment size", lwidth);
wid.push_back(myFragsizePopup); wid.push_back(myFragsizePopup);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
// Output frequency // Output frequency
items.clear(); items.clear();
VarList::push_back(items, "44100 Hz", 44100); VarList::push_back(items, "44100 Hz", 44100);
VarList::push_back(items, "48000 Hz", 48000); VarList::push_back(items, "48000 Hz", 48000);
VarList::push_back(items, "96000 Hz", 96000); VarList::push_back(items, "96000 Hz", 96000);
myFreqPopup = new PopUpWidget(this, font, xpos, ypos, myFreqPopup = new PopUpWidget(this, font, xpos, ypos,
pwidth, lineHeight, pwidth, lineHeight,
items, "Sample rate", lwidth); items, "Sample rate", lwidth);
wid.push_back(myFreqPopup); wid.push_back(myFreqPopup);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
// Resampling quality // Resampling quality
items.clear(); items.clear();
VarList::push_back(items, "Low", static_cast<int>(AudioSettings::ResamplingQuality::nearestNeightbour)); VarList::push_back(items, "Low", static_cast<int>(AudioSettings::ResamplingQuality::nearestNeightbour));
VarList::push_back(items, "High", static_cast<int>(AudioSettings::ResamplingQuality::lanczos_2)); VarList::push_back(items, "High", static_cast<int>(AudioSettings::ResamplingQuality::lanczos_2));
VarList::push_back(items, "Ultra", static_cast<int>(AudioSettings::ResamplingQuality::lanczos_3)); VarList::push_back(items, "Ultra", static_cast<int>(AudioSettings::ResamplingQuality::lanczos_3));
myResamplingPopup = new PopUpWidget(this, font, xpos, ypos, myResamplingPopup = new PopUpWidget(this, font, xpos, ypos,
pwidth, lineHeight, pwidth, lineHeight,
items, "Resampling quality ", lwidth); items, "Resampling quality ", lwidth);
wid.push_back(myResamplingPopup); wid.push_back(myResamplingPopup);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
// Param 1 // Param 1
int swidth = pwidth+23; int swidth = pwidth+23;
myHeadroomSlider = new SliderWidget(this, font, xpos, ypos, swidth, lineHeight, myHeadroomSlider = new SliderWidget(this, font, xpos, ypos, swidth, lineHeight,
"Headroom ", 0, kHeadroomChanged, 10 * fontWidth); "Headroom ", 0, kHeadroomChanged, 10 * fontWidth);
myHeadroomSlider->setMinValue(0); myHeadroomSlider->setMaxValue(AudioSettings::MAX_HEADROOM); myHeadroomSlider->setMinValue(0); myHeadroomSlider->setMaxValue(AudioSettings::MAX_HEADROOM);
myHeadroomSlider->setTickmarkIntervals(5); myHeadroomSlider->setTickmarkIntervals(5);
wid.push_back(myHeadroomSlider); wid.push_back(myHeadroomSlider);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
// Param 2 // Param 2
myBufferSizeSlider = new SliderWidget(this, font, xpos, ypos, swidth, lineHeight, myBufferSizeSlider = new SliderWidget(this, font, xpos, ypos, swidth, lineHeight,
"Buffer size ", 0, kBufferSizeChanged, 10 * fontWidth); "Buffer size ", 0, kBufferSizeChanged, 10 * fontWidth);
myBufferSizeSlider->setMinValue(0); myBufferSizeSlider->setMaxValue(AudioSettings::MAX_BUFFER_SIZE); myBufferSizeSlider->setMinValue(0); myBufferSizeSlider->setMaxValue(AudioSettings::MAX_BUFFER_SIZE);
myBufferSizeSlider->setTickmarkIntervals(5); myBufferSizeSlider->setTickmarkIntervals(5);
wid.push_back(myBufferSizeSlider); wid.push_back(myBufferSizeSlider);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
// Stereo sound // Stereo sound
xpos -= INDENT; xpos -= INDENT;
myStereoSoundCheckbox = new CheckboxWidget(this, font, xpos, ypos, myStereoSoundCheckbox = new CheckboxWidget(this, font, xpos, ypos,
"Stereo for all ROMs"); "Stereo for all ROMs");
wid.push_back(myStereoSoundCheckbox); wid.push_back(myStereoSoundCheckbox);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
myDpcPitch = new SliderWidget(this, font, xpos, ypos, myDpcPitch = new SliderWidget(this, font, xpos, ypos, swidth - 16, lineHeight,
"DPC Pitch ", 0, 0, 5 * fontWidth); "Pitfall II music pitch ", 0, 0, 5 * fontWidth);
myDpcPitch->setMinValue(10000); myDpcPitch->setMaxValue(30000); myDpcPitch->setMinValue(10000); myDpcPitch->setMaxValue(30000);
myDpcPitch->setStepValue(100); myDpcPitch->setStepValue(100);
myDpcPitch->setTickmarkIntervals(2); myDpcPitch->setTickmarkIntervals(2);
wid.push_back(myDpcPitch); wid.push_back(myDpcPitch);
// Add Defaults, OK and Cancel buttons // Add Defaults, OK and Cancel buttons
addDefaultsOKCancelBGroup(wid, font); addDefaultsOKCancelBGroup(wid, font);
addToFocusList(wid); addToFocusList(wid);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void AudioDialog::loadConfig() void AudioDialog::loadConfig()
{ {
AudioSettings& audioSettings = instance().audioSettings(); AudioSettings& audioSettings = instance().audioSettings();
// Enable sound // Enable sound
mySoundEnableCheckbox->setState(audioSettings.enabled()); mySoundEnableCheckbox->setState(audioSettings.enabled());
// Volume // Volume
myVolumeSlider->setValue(audioSettings.volume()); myVolumeSlider->setValue(audioSettings.volume());
// Stereo // Stereo
myStereoSoundCheckbox->setState(audioSettings.stereo()); myStereoSoundCheckbox->setState(audioSettings.stereo());
// DPC Pitch // DPC Pitch
myDpcPitch->setValue(audioSettings.dpcPitch()); myDpcPitch->setValue(audioSettings.dpcPitch());
// Preset / mode // Preset / mode
myModePopup->setSelected(static_cast<int>(audioSettings.preset())); myModePopup->setSelected(static_cast<int>(audioSettings.preset()));
updateSettingsWithPreset(instance().audioSettings()); updateSettingsWithPreset(instance().audioSettings());
updateEnabledState(); updateEnabledState();
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void AudioDialog::updateSettingsWithPreset(AudioSettings& audioSettings) void AudioDialog::updateSettingsWithPreset(AudioSettings& audioSettings)
{ {
// Fragsize // Fragsize
myFragsizePopup->setSelected(audioSettings.fragmentSize()); myFragsizePopup->setSelected(audioSettings.fragmentSize());
// Output frequency // Output frequency
myFreqPopup->setSelected(audioSettings.sampleRate()); myFreqPopup->setSelected(audioSettings.sampleRate());
// Headroom // Headroom
myHeadroomSlider->setValue(audioSettings.headroom()); myHeadroomSlider->setValue(audioSettings.headroom());
// Buffer size // Buffer size
myBufferSizeSlider->setValue(audioSettings.bufferSize()); myBufferSizeSlider->setValue(audioSettings.bufferSize());
// Resampling quality // Resampling quality
myResamplingPopup->setSelected(static_cast<int>(audioSettings.resamplingQuality())); myResamplingPopup->setSelected(static_cast<int>(audioSettings.resamplingQuality()));
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void AudioDialog::saveConfig() void AudioDialog::saveConfig()
{ {
AudioSettings& audioSettings = instance().audioSettings(); AudioSettings& audioSettings = instance().audioSettings();
// Enabled // Enabled
audioSettings.setEnabled(mySoundEnableCheckbox->getState()); audioSettings.setEnabled(mySoundEnableCheckbox->getState());
instance().sound().setEnabled(mySoundEnableCheckbox->getState()); instance().sound().setEnabled(mySoundEnableCheckbox->getState());
// Volume // Volume
audioSettings.setVolume(myVolumeSlider->getValue()); audioSettings.setVolume(myVolumeSlider->getValue());
instance().sound().setVolume(myVolumeSlider->getValue()); instance().sound().setVolume(myVolumeSlider->getValue());
// Stereo // Stereo
audioSettings.setStereo(myStereoSoundCheckbox->getState()); audioSettings.setStereo(myStereoSoundCheckbox->getState());
// DPC Pitch // DPC Pitch
audioSettings.setDpcPitch(myDpcPitch->getValue()); audioSettings.setDpcPitch(myDpcPitch->getValue());
// update if current cart is Pitfall II // update if current cart is Pitfall II
if (instance().hasConsole() && instance().console().cartridge().name() == "CartridgeDPC") if (instance().hasConsole() && instance().console().cartridge().name() == "CartridgeDPC")
{ {
CartridgeDPC& cart = static_cast<CartridgeDPC&>(instance().console().cartridge()); CartridgeDPC& cart = static_cast<CartridgeDPC&>(instance().console().cartridge());
cart.setDpcPitch(myDpcPitch->getValue()); cart.setDpcPitch(myDpcPitch->getValue());
} }
AudioSettings::Preset preset = static_cast<AudioSettings::Preset>(myModePopup->getSelectedTag().toInt()); AudioSettings::Preset preset = static_cast<AudioSettings::Preset>(myModePopup->getSelectedTag().toInt());
audioSettings.setPreset(preset); audioSettings.setPreset(preset);
if (preset == AudioSettings::Preset::custom) { if (preset == AudioSettings::Preset::custom) {
// Fragsize // Fragsize
audioSettings.setFragmentSize(myFragsizePopup->getSelectedTag().toInt()); audioSettings.setFragmentSize(myFragsizePopup->getSelectedTag().toInt());
audioSettings.setSampleRate(myFreqPopup->getSelectedTag().toInt()); audioSettings.setSampleRate(myFreqPopup->getSelectedTag().toInt());
audioSettings.setHeadroom(myHeadroomSlider->getValue()); audioSettings.setHeadroom(myHeadroomSlider->getValue());
audioSettings.setBufferSize(myBufferSizeSlider->getValue()); audioSettings.setBufferSize(myBufferSizeSlider->getValue());
audioSettings.setResamplingQuality(static_cast<AudioSettings::ResamplingQuality>(myResamplingPopup->getSelectedTag().toInt())); audioSettings.setResamplingQuality(static_cast<AudioSettings::ResamplingQuality>(myResamplingPopup->getSelectedTag().toInt()));
} }
// Only force a re-initialization when necessary, since it can // Only force a re-initialization when necessary, since it can
// be a time-consuming operation // be a time-consuming operation
if(instance().hasConsole()) if(instance().hasConsole())
instance().console().initializeAudio(); instance().console().initializeAudio();
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void AudioDialog::setDefaults() void AudioDialog::setDefaults()
{ {
mySoundEnableCheckbox->setState(AudioSettings::DEFAULT_ENABLED); mySoundEnableCheckbox->setState(AudioSettings::DEFAULT_ENABLED);
myVolumeSlider->setValue(AudioSettings::DEFAULT_VOLUME); myVolumeSlider->setValue(AudioSettings::DEFAULT_VOLUME);
myStereoSoundCheckbox->setState(AudioSettings::DEFAULT_STEREO); myStereoSoundCheckbox->setState(AudioSettings::DEFAULT_STEREO);
myDpcPitch->setValue(AudioSettings::DEFAULT_DPC_PITCH); myDpcPitch->setValue(AudioSettings::DEFAULT_DPC_PITCH);
myModePopup->setSelected(static_cast<int>(AudioSettings::DEFAULT_PRESET)); myModePopup->setSelected(static_cast<int>(AudioSettings::DEFAULT_PRESET));
if (AudioSettings::DEFAULT_PRESET == AudioSettings::Preset::custom) { if (AudioSettings::DEFAULT_PRESET == AudioSettings::Preset::custom) {
myResamplingPopup->setSelected(static_cast<int>(AudioSettings::DEFAULT_RESAMPLING_QUALITY)); myResamplingPopup->setSelected(static_cast<int>(AudioSettings::DEFAULT_RESAMPLING_QUALITY));
myFragsizePopup->setSelected(AudioSettings::DEFAULT_FRAGMENT_SIZE); myFragsizePopup->setSelected(AudioSettings::DEFAULT_FRAGMENT_SIZE);
myFreqPopup->setSelected(AudioSettings::DEFAULT_SAMPLE_RATE); myFreqPopup->setSelected(AudioSettings::DEFAULT_SAMPLE_RATE);
myHeadroomSlider->setValue(AudioSettings::DEFAULT_HEADROOM); myHeadroomSlider->setValue(AudioSettings::DEFAULT_HEADROOM);
myBufferSizeSlider->setValue(AudioSettings::DEFAULT_BUFFER_SIZE); myBufferSizeSlider->setValue(AudioSettings::DEFAULT_BUFFER_SIZE);
} }
else updatePreset(); else updatePreset();
updateEnabledState(); updateEnabledState();
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void AudioDialog::updateEnabledState() void AudioDialog::updateEnabledState()
{ {
bool active = mySoundEnableCheckbox->getState(); bool active = mySoundEnableCheckbox->getState();
AudioSettings::Preset preset = static_cast<AudioSettings::Preset>(myModePopup->getSelectedTag().toInt()); AudioSettings::Preset preset = static_cast<AudioSettings::Preset>(myModePopup->getSelectedTag().toInt());
bool userMode = preset == AudioSettings::Preset::custom; bool userMode = preset == AudioSettings::Preset::custom;
myVolumeSlider->setEnabled(active); myVolumeSlider->setEnabled(active);
myStereoSoundCheckbox->setEnabled(active); myStereoSoundCheckbox->setEnabled(active);
myModePopup->setEnabled(active); myModePopup->setEnabled(active);
// enable only for Pitfall II cart // enable only for Pitfall II cart
myDpcPitch->setEnabled(active && instance().hasConsole() && instance().console().cartridge().name() == "CartridgeDPC"); myDpcPitch->setEnabled(active && instance().hasConsole() && instance().console().cartridge().name() == "CartridgeDPC");
myFragsizePopup->setEnabled(active && userMode); myFragsizePopup->setEnabled(active && userMode);
myFreqPopup->setEnabled(active && userMode); myFreqPopup->setEnabled(active && userMode);
myResamplingPopup->setEnabled(active && userMode); myResamplingPopup->setEnabled(active && userMode);
myHeadroomSlider->setEnabled(active && userMode); myHeadroomSlider->setEnabled(active && userMode);
myBufferSizeSlider->setEnabled(active && userMode); myBufferSizeSlider->setEnabled(active && userMode);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void AudioDialog::updatePreset() void AudioDialog::updatePreset()
{ {
AudioSettings::Preset preset = static_cast<AudioSettings::Preset>(myModePopup->getSelectedTag().toInt()); AudioSettings::Preset preset = static_cast<AudioSettings::Preset>(myModePopup->getSelectedTag().toInt());
// Make a copy that does not affect the actual settings... // Make a copy that does not affect the actual settings...
AudioSettings audioSettings = instance().audioSettings(); AudioSettings audioSettings = instance().audioSettings();
audioSettings.setPersistent(false); audioSettings.setPersistent(false);
// ... and set the requested preset // ... and set the requested preset
audioSettings.setPreset(preset); audioSettings.setPreset(preset);
updateSettingsWithPreset(audioSettings); updateSettingsWithPreset(audioSettings);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void AudioDialog::handleCommand(CommandSender* sender, int cmd, void AudioDialog::handleCommand(CommandSender* sender, int cmd,
int data, int id) int data, int id)
{ {
switch(cmd) switch(cmd)
{ {
case GuiObject::kOKCmd: case GuiObject::kOKCmd:
saveConfig(); saveConfig();
close(); close();
break; break;
case GuiObject::kDefaultsCmd: case GuiObject::kDefaultsCmd:
setDefaults(); setDefaults();
break; break;
case kSoundEnableChanged: case kSoundEnableChanged:
updateEnabledState(); updateEnabledState();
break; break;
case kModeChanged: case kModeChanged:
updatePreset(); updatePreset();
updateEnabledState(); updateEnabledState();
break; break;
case kHeadroomChanged: case kHeadroomChanged:
{ {
std::ostringstream ss; std::ostringstream ss;
ss << std::fixed << std::setprecision(1) << (0.5 * myHeadroomSlider->getValue()) << " frames"; ss << std::fixed << std::setprecision(1) << (0.5 * myHeadroomSlider->getValue()) << " frames";
myHeadroomSlider->setValueLabel(ss.str()); myHeadroomSlider->setValueLabel(ss.str());
break; break;
} }
case kBufferSizeChanged: case kBufferSizeChanged:
{ {
std::ostringstream ss; std::ostringstream ss;
ss << std::fixed << std::setprecision(1) << (0.5 * myBufferSizeSlider->getValue()) << " frames"; ss << std::fixed << std::setprecision(1) << (0.5 * myBufferSizeSlider->getValue()) << " frames";
myBufferSizeSlider->setValueLabel(ss.str()); myBufferSizeSlider->setValueLabel(ss.str());
break; break;
} }
default: default:
Dialog::handleCommand(sender, cmd, data, 0); Dialog::handleCommand(sender, cmd, data, 0);
break; break;
} }
} }