Settings: remove aspect in favor of scanlines adjust.

src/emucore/FrameBuffer.cxx

@@ -932,14 +932,6 @@ void FrameBuffer::setAvailableVidModes(uInt32 baseWidth, uInt32 baseHeight)
     uInt32 minZoom = supportedTIAMinZoom();
     myTIAMaxZoom = maxZoomForScreen(baseWidth, baseHeight,
                      myAbsDesktopSize.w, myAbsDesktopSize.h);
-
-  #if 0  // FIXME - does this apply any longer??
-    // Aspect ratio
-    uInt32 aspect = myOSystem.settings().getInt(
-        myOSystem.console().tia().frameLayout() == FrameLayout::ntsc ?
-        "tia.aspectn" : "tia.aspectp");
-  #endif
-
     // Determine all zoom levels
     for(float zoom = minZoom; zoom <= myTIAMaxZoom; zoom += ZOOM_STEPS)
     {

src/emucore/Settings.cxx

@@ -50,8 +50,8 @@ Settings::Settings()
   // TIA specific options
   setPermanent("tia.zoom", "3");
   setPermanent("tia.inter", "false");
-  setPermanent("tia.aspectn", "100");
+  setPermanent("tia.adjustscanlines.ntsc", "0");
-  setPermanent("tia.aspectp", "100");
+  setPermanent("tia.adjustscanlines.pal", "0");
   setPermanent("fullscreen", "false");
   setPermanent("tia.fs_stretch", "false");
   setPermanent("tia.fs_overscan", "0");
@@ -255,10 +255,10 @@ void Settings::validate()
   f = getFloat("speed");
   if (f <= 0) setValue("speed", "1.0");
 
-  i = getInt("tia.aspectn");
+  i = getInt("tia.adjustscanlines.ntsc");
-  if(i < 80 || i > 120)  setValue("tia.aspectn", "90");
+  if(i < -50 || i > 50)  setValue("tia.adjustscanlines.ntsc", "90");
-  i = getInt("tia.aspectp");
+  i = getInt("tia.adjustscanlines.pal");
-  if(i < 80 || i > 120)  setValue("tia.aspectp", "100");
+  if(i < -50 || i > 50)  setValue("tia.adjustscanlines.pal", "100");
 
   s = getString("tia.dbgcolors");
   sort(s.begin(), s.end());
@@ -410,10 +410,8 @@ void Settings::usage() const
     << "                                 for TIA image\n"
     << "  -tia.inter     <1|0>          Enable interpolated (smooth) scaling for TIA\n"
     << "                                 image\n"
-    << "  -tia.aspectn   <number>       Scale TIA width by the given percentage in NTS\n"
+    << "  -tia.adjustscanlines.ntsc <number> Adjust the visible number if TIA scanlines on NTSC\n"
-    << "                                 mode\n"
+    << "  -tia.adjustscanlines.pal  <number> Adjust the visible number if TIA scanlines on PAL\n"
-    << "  -tia.aspectp   <number>       Scale TIA width by the given percentage in PAL\n"
-    << "                                 mode\n"
     << "  -tia.fs_stretch <1|0>         Stretch TIA image to fill fullscreen mode\n"
     << "  -tia.fs_overscan <0-10>       Add overscan to TIA image in fill fullscreen mode\n"
     << "  -tia.dbgcolors <string>       Debug colors to use for each object (see manual\n"

src/gui/VideoDialog.cxx

@@ -86,7 +86,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
             fontWidth    = font.getMaxCharWidth(),
             buttonHeight = font.getLineHeight() + 4;
   int xpos, ypos, tabID;
-  int lwidth = font.getStringWidth("TIA Palette "),
+  int lwidth = font.getStringWidth("NTSC scanlines adjust "),
     pwidth = font.getStringWidth("XXXXxXXXX"),
     swidth = font.getMaxCharWidth() * 10 - 2;
 
@@ -94,7 +94,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
   VariantList items;
 
   // Set real dimensions
-  setSize(55 * fontWidth + HBORDER * 2, 14 * (lineHeight + VGAP) + 14 + _th, max_w, max_h);
+  setSize(65 * fontWidth + HBORDER * 2, 14 * (lineHeight + VGAP) + 14 + _th, max_w, max_h);
 
   // The tab widget
   xpos = 2;  ypos = 4;
@@ -136,23 +136,23 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
   ypos += lineHeight + VGAP;
 
   // Aspect ratio (NTSC mode)
-  myNAspectRatio =
+  myAdjustScanlinesNTSC =
     new SliderWidget(myTab, font, xpos, ypos-1, swidth, lineHeight,
-                     "NTSC aspect ", lwidth, 0,
+                     "NTSC scanlines adjust ", lwidth, 0,
-                     fontWidth * 4, "%");
+                     fontWidth * 4, "");
-  myNAspectRatio->setMinValue(80); myNAspectRatio->setMaxValue(120);
+  myAdjustScanlinesNTSC->setMinValue(-50); myAdjustScanlinesNTSC->setMaxValue(50);
-  myNAspectRatio->setTickmarkIntervals(2);
+  myAdjustScanlinesNTSC->setTickmarkIntervals(2);
-  wid.push_back(myNAspectRatio);
+  wid.push_back(myAdjustScanlinesNTSC);
   ypos += lineHeight + VGAP;
 
   // Aspect ratio (PAL mode)
-  myPAspectRatio =
+  myAdjustScanlinesPAL =
     new SliderWidget(myTab, font, xpos, ypos-1, swidth, lineHeight,
-                     "PAL aspect ", lwidth, 0,
+                     "PAL scanlines adjust ", lwidth, 0,
-                     fontWidth * 4, "%");
+                     fontWidth * 4, "");
-  myPAspectRatio->setMinValue(80); myPAspectRatio->setMaxValue(120);
+  myAdjustScanlinesPAL->setMinValue(-50); myAdjustScanlinesPAL->setMaxValue(50);
-  myPAspectRatio->setTickmarkIntervals(2);
+  myAdjustScanlinesPAL->setTickmarkIntervals(2);
-  wid.push_back(myPAspectRatio);
+  wid.push_back(myAdjustScanlinesPAL);
   ypos += lineHeight + VGAP;
 
   // Speed
@@ -353,8 +353,8 @@ void VideoDialog::loadConfig()
   myTIAInterpolate->setState(instance().settings().getBool("tia.inter"));
 
   // Aspect ratio setting (NTSC and PAL)
-  myNAspectRatio->setValue(instance().settings().getInt("tia.aspectn"));
+  myAdjustScanlinesNTSC->setValue(instance().settings().getInt("tia.adjustscanlines.ntsc"));
-  myPAspectRatio->setValue(instance().settings().getInt("tia.aspectp"));
+  myAdjustScanlinesPAL->setValue(instance().settings().getInt("tia.adjustscanlines.pal"));
 
   // Emulation speed
   int speed = mapSpeed(instance().settings().getFloat("speed"));
@@ -426,8 +426,8 @@ void VideoDialog::saveConfig()
   instance().settings().setValue("tia.inter", myTIAInterpolate->getState());
 
   // Aspect ratio setting (NTSC and PAL)
-  instance().settings().setValue("tia.aspectn", myNAspectRatio->getValueLabel());
+  instance().settings().setValue("tia.adjustscanlines.ntsc", myAdjustScanlinesNTSC->getValueLabel());
-  instance().settings().setValue("tia.aspectp", myPAspectRatio->getValueLabel());
+  instance().settings().setValue("tia.adjustscanlines.pal", myAdjustScanlinesPAL->getValueLabel());
 
   // Speed
   int speedup = mySpeed->getValue();
@@ -505,8 +505,8 @@ void VideoDialog::setDefaults()
       myTIAZoom->setValue(300);
       myTIAPalette->setSelected("standard", "");
       myTIAInterpolate->setState(false);
-      myNAspectRatio->setValue(91);
+      myAdjustScanlinesNTSC->setValue(0);
-      myPAspectRatio->setValue(109);
+      myAdjustScanlinesPAL->setValue(0);
       mySpeed->setValue(0);
 
       myFullscreen->setState(false);

src/gui/VideoDialog.hxx

@@ -58,8 +58,8 @@ class VideoDialog : public Dialog
     SliderWidget*     myTIAZoom{nullptr};
     PopUpWidget*      myTIAPalette{nullptr};
     CheckboxWidget*   myTIAInterpolate{nullptr};
-    SliderWidget*     myNAspectRatio{nullptr};
+    SliderWidget*     myAdjustScanlinesNTSC{nullptr};
-    SliderWidget*     myPAspectRatio{nullptr};
+    SliderWidget*     myAdjustScanlinesPAL{nullptr};
     SliderWidget*     mySpeed{nullptr};
 
     CheckboxWidget*   myFullscreen{nullptr};

src/libretro/StellaLIBRETRO.cxx

@@ -90,8 +90,8 @@ bool StellaLIBRETRO::create(bool logging)
 
   settings.setValue("tia.zoom", 1);
   settings.setValue("tia.inter", false);
-  settings.setValue("tia.aspectn", 100);
+  settings.setValue("tia.adjustscanlines.ntsc", 0);
-  settings.setValue("tia.aspectp", 100);
+  settings.setValue("tia.adjustscanlines.ntsc", 0);
 
   //fastscbios
   // Fast loading of Supercharger BIOS