mirror of https://github.com/stella-emu/stella.git
prepare VideoDialog for new filter mode
This commit is contained in:
parent
3aaeead676
commit
9aa027f4fd
|
@ -46,7 +46,7 @@ Settings::Settings()
|
||||||
|
|
||||||
// TIA specific options
|
// TIA specific options
|
||||||
setPermanent("tia.zoom", "3");
|
setPermanent("tia.zoom", "3");
|
||||||
setPermanent("tia.inter", "false");
|
setPermanent("tia.filter", "sharp");
|
||||||
setPermanent("tia.aspectn", "100");
|
setPermanent("tia.aspectn", "100");
|
||||||
setPermanent("tia.aspectp", "100");
|
setPermanent("tia.aspectp", "100");
|
||||||
setPermanent("fullscreen", "false");
|
setPermanent("fullscreen", "false");
|
||||||
|
@ -403,8 +403,8 @@ void Settings::usage() const
|
||||||
#endif
|
#endif
|
||||||
<< " -tia.zoom <zoom> Use the specified zoom level (windowed mode)\n"
|
<< " -tia.zoom <zoom> Use the specified zoom level (windowed mode)\n"
|
||||||
<< " for TIA image\n"
|
<< " for TIA image\n"
|
||||||
<< " -tia.inter <1|0> Enable interpolated (smooth) scaling for TIA\n"
|
<< " -tia.filter <none|sharp Filter mode for scaled TIA image\n"
|
||||||
<< " image\n"
|
<< " soft>\n"
|
||||||
<< " -tia.aspectn <number> Scale TIA width by the given percentage in NTS\n"
|
<< " -tia.aspectn <number> Scale TIA width by the given percentage in NTS\n"
|
||||||
<< " mode\n"
|
<< " mode\n"
|
||||||
<< " -tia.aspectp <number> Scale TIA width by the given percentage in PAL\n"
|
<< " -tia.aspectp <number> Scale TIA width by the given percentage in PAL\n"
|
||||||
|
|
|
@ -119,18 +119,24 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
|
||||||
VarList::push_back(items, "Z26", "z26");
|
VarList::push_back(items, "Z26", "z26");
|
||||||
VarList::push_back(items, "User", "user");
|
VarList::push_back(items, "User", "user");
|
||||||
myTIAPalette = new PopUpWidget(myTab, font, xpos, ypos, pwidth,
|
myTIAPalette = new PopUpWidget(myTab, font, xpos, ypos, pwidth,
|
||||||
lineHeight, items, "TIA palette ", lwidth);
|
lineHeight, items, "Palette ", lwidth);
|
||||||
wid.push_back(myTIAPalette);
|
wid.push_back(myTIAPalette);
|
||||||
ypos += lineHeight + VGAP;
|
ypos += lineHeight + VGAP;
|
||||||
|
|
||||||
// TIA interpolation
|
// TIA Filter
|
||||||
myTIAInterpolate = new CheckboxWidget(myTab, font, xpos, ypos + 1, "TIA interpolation ");
|
items.clear();
|
||||||
wid.push_back(myTIAInterpolate);
|
VarList::push_back(items, "None", "none");
|
||||||
|
VarList::push_back(items, "Sharp", "sharp");
|
||||||
|
VarList::push_back(items, "Soft", "soft");
|
||||||
|
myTIAFilter = new PopUpWidget(myTab, font, xpos, ypos, pwidth,
|
||||||
|
lineHeight, items, "Filter ", lwidth);
|
||||||
|
wid.push_back(myTIAFilter);
|
||||||
ypos += lineHeight + VGAP;
|
ypos += lineHeight + VGAP;
|
||||||
|
|
||||||
|
|
||||||
// TIA zoom levels (will be dynamically filled later)
|
// TIA zoom levels (will be dynamically filled later)
|
||||||
myTIAZoom = new SliderWidget(myTab, font, xpos, ypos - 1, swidth, lineHeight,
|
myTIAZoom = new SliderWidget(myTab, font, xpos, ypos - 1, swidth, lineHeight,
|
||||||
"TIA zoom", lwidth, 0, fontWidth * 4, "%");
|
"Zoom ", lwidth, 0, fontWidth * 4, "%");
|
||||||
myTIAZoom->setMinValue(200); myTIAZoom->setStepValue(FrameBuffer::ZOOM_STEPS * 100);
|
myTIAZoom->setMinValue(200); myTIAZoom->setStepValue(FrameBuffer::ZOOM_STEPS * 100);
|
||||||
wid.push_back(myTIAZoom);
|
wid.push_back(myTIAZoom);
|
||||||
ypos += lineHeight + VGAP;
|
ypos += lineHeight + VGAP;
|
||||||
|
@ -349,8 +355,8 @@ void VideoDialog::loadConfig()
|
||||||
myTIAPalette->setSelected(
|
myTIAPalette->setSelected(
|
||||||
instance().settings().getString("palette"), "standard");
|
instance().settings().getString("palette"), "standard");
|
||||||
|
|
||||||
// TIA interpolation
|
// TIA Filter
|
||||||
myTIAInterpolate->setState(instance().settings().getBool("tia.inter"));
|
myTIAFilter->setSelected(instance().settings().getString("tia.filter"), "none");
|
||||||
|
|
||||||
// Aspect ratio setting (NTSC and PAL)
|
// Aspect ratio setting (NTSC and PAL)
|
||||||
myNAspectRatio->setValue(instance().settings().getInt("tia.aspectn"));
|
myNAspectRatio->setValue(instance().settings().getInt("tia.aspectn"));
|
||||||
|
@ -422,8 +428,8 @@ void VideoDialog::saveConfig()
|
||||||
instance().settings().setValue("palette",
|
instance().settings().setValue("palette",
|
||||||
myTIAPalette->getSelectedTag().toString());
|
myTIAPalette->getSelectedTag().toString());
|
||||||
|
|
||||||
// TIA interpolation
|
// TIA Filter
|
||||||
instance().settings().setValue("tia.inter", myTIAInterpolate->getState());
|
instance().settings().setValue("tia.filter", myTIAFilter->getSelectedTag().toString());
|
||||||
|
|
||||||
// Aspect ratio setting (NTSC and PAL)
|
// Aspect ratio setting (NTSC and PAL)
|
||||||
instance().settings().setValue("tia.aspectn", myNAspectRatio->getValueLabel());
|
instance().settings().setValue("tia.aspectn", myNAspectRatio->getValueLabel());
|
||||||
|
@ -501,7 +507,7 @@ void VideoDialog::setDefaults()
|
||||||
myRenderer->setSelectedIndex(0);
|
myRenderer->setSelectedIndex(0);
|
||||||
myTIAZoom->setValue(300);
|
myTIAZoom->setValue(300);
|
||||||
myTIAPalette->setSelected("standard", "");
|
myTIAPalette->setSelected("standard", "");
|
||||||
myTIAInterpolate->setState(false);
|
myTIAFilter->setSelected("none", "");
|
||||||
myNAspectRatio->setValue(91);
|
myNAspectRatio->setValue(91);
|
||||||
myPAspectRatio->setValue(109);
|
myPAspectRatio->setValue(109);
|
||||||
mySpeed->setValue(0);
|
mySpeed->setValue(0);
|
||||||
|
|
|
@ -57,7 +57,7 @@ class VideoDialog : public Dialog
|
||||||
PopUpWidget* myRenderer;
|
PopUpWidget* myRenderer;
|
||||||
SliderWidget* myTIAZoom;
|
SliderWidget* myTIAZoom;
|
||||||
PopUpWidget* myTIAPalette;
|
PopUpWidget* myTIAPalette;
|
||||||
CheckboxWidget* myTIAInterpolate;
|
PopUpWidget* myTIAFilter;
|
||||||
SliderWidget* myNAspectRatio;
|
SliderWidget* myNAspectRatio;
|
||||||
SliderWidget* myPAspectRatio;
|
SliderWidget* myPAspectRatio;
|
||||||
SliderWidget* mySpeed;
|
SliderWidget* mySpeed;
|
||||||
|
|
Loading…
Reference in New Issue