forgot to save before committing...

This commit is contained in:
thrust26 2021-04-12 22:45:24 +02:00
parent 6bd4987b22
commit bdf2fe4401
1 changed files with 17 additions and 15 deletions

View File

@ -544,12 +544,14 @@ void VideoAudioDialog::addAudioTab()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void VideoAudioDialog::loadConfig() void VideoAudioDialog::loadConfig()
{ {
Settings& settings = instance().settings();
// Display tab // Display tab
// Renderer settings // Renderer settings
myRenderer->setSelected(instance().settings().getString("video"), "default"); myRenderer->setSelected(settings.getString("video"), "default");
// TIA interpolation // TIA interpolation
myTIAInterpolate->setState(instance().settings().getBool("tia.inter")); myTIAInterpolate->setState(settings.getBool("tia.inter"));
// TIA zoom levels // TIA zoom levels
// These are dynamically loaded, since they depend on the size of // These are dynamically loaded, since they depend on the size of
@ -560,30 +562,30 @@ void VideoAudioDialog::loadConfig()
myTIAZoom->setMinValue(minZoom * 100); myTIAZoom->setMinValue(minZoom * 100);
myTIAZoom->setMaxValue(maxZoom * 100); myTIAZoom->setMaxValue(maxZoom * 100);
myTIAZoom->setTickmarkIntervals((maxZoom - minZoom) * 2); // every ~50% myTIAZoom->setTickmarkIntervals((maxZoom - minZoom) * 2); // every ~50%
myTIAZoom->setValue(instance().settings().getFloat("tia.zoom") * 100); myTIAZoom->setValue(settings.getFloat("tia.zoom") * 100);
// Fullscreen // Fullscreen
myFullscreen->setState(instance().settings().getBool("fullscreen")); myFullscreen->setState(settings.getBool("fullscreen"));
// Fullscreen stretch setting // Fullscreen stretch setting
myUseStretch->setState(instance().settings().getBool("tia.fs_stretch")); myUseStretch->setState(settings.getBool("tia.fs_stretch"));
#ifdef ADAPTABLE_REFRESH_SUPPORT #ifdef ADAPTABLE_REFRESH_SUPPORT
// Adapt refresh rate // Adapt refresh rate
myRefreshAdapt->setState(instance().settings().getBool("tia.fs_refresh")); myRefreshAdapt->setState(settings.getBool("tia.fs_refresh"));
#endif #endif
// Fullscreen overscan setting // Fullscreen overscan setting
myTVOverscan->setValue(instance().settings().getInt("tia.fs_overscan")); myTVOverscan->setValue(settings.getInt("tia.fs_overscan"));
handleFullScreenChange(); handleFullScreenChange();
// Aspect ratio correction // Aspect ratio correction
myCorrectAspect->setState(instance().settings().getBool("tia.correct_aspect")); myCorrectAspect->setState(settings.getBool("tia.correct_aspect"));
// Aspect ratio setting (NTSC and PAL) // Aspect ratio setting (NTSC and PAL)
myVSizeAdjust->setValue(instance().settings().getInt("tia.vsizeadjust")); myVSizeAdjust->setValue(settings.getInt("tia.vsizeadjust"));
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Palettes tab // Palettes tab
// TIA Palette // TIA Palette
myPalette = instance().settings().getString("palette"); myPalette = settings.getString("palette");
myTIAPalette->setSelected(myPalette, PaletteHandler::SETTING_STANDARD); myTIAPalette->setSelected(myPalette, PaletteHandler::SETTING_STANDARD);
// Palette adjustables // Palette adjustables
@ -608,22 +610,22 @@ void VideoAudioDialog::loadConfig()
// TV Effects tab // TV Effects tab
// TV Mode // TV Mode
myTVMode->setSelected( myTVMode->setSelected(
instance().settings().getString("tv.filter"), "0"); settings.getString("tv.filter"), "0");
int preset = instance().settings().getInt("tv.filter"); int preset = settings.getInt("tv.filter");
handleTVModeChange(NTSCFilter::Preset(preset)); handleTVModeChange(NTSCFilter::Preset(preset));
// TV Custom adjustables // TV Custom adjustables
loadTVAdjustables(NTSCFilter::Preset::CUSTOM); loadTVAdjustables(NTSCFilter::Preset::CUSTOM);
// TV phosphor mode // TV phosphor mode
myTVPhosphor->setState(instance().settings().getString("tv.phosphor") == "always"); myTVPhosphor->setState(settings.getString("tv.phosphor") == "always");
// TV phosphor blend // TV phosphor blend
myTVPhosLevel->setValue(instance().settings().getInt("tv.phosblend")); myTVPhosLevel->setValue(settings.getInt("tv.phosblend"));
handlePhosphorChange(); handlePhosphorChange();
// TV scanline intensity and interpolation // TV scanline intensity and interpolation
myTVScanIntense->setValue(instance().settings().getInt("tv.scanlines")); myTVScanIntense->setValue(settings.getInt("tv.scanlines"));
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Audio tab // Audio tab