reverted video dialog and settings changes

src/emucore/Settings.cxx

@@ -49,7 +49,7 @@ Settings::Settings()
 
   // TIA specific options
   setPermanent("tia.zoom", "3");
-  setPermanent("tia.filter", "sharp");
+  setPermanent("tia.inter", "false");
   setPermanent("tia.aspectn", "100");
   setPermanent("tia.aspectp", "100");
   setPermanent("fullscreen", "false");
@@ -408,8 +408,8 @@ void Settings::usage() const
   #endif
     << "  -tia.zoom      <zoom>         Use the specified zoom level (windowed mode)\n"
     << "                                 for TIA image\n"
-    << "  -tia.filter    <none|sharp    Filter mode for scaled TIA image\n"
-    << "                  soft>\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"
     << "                                 mode\n"
     << "  -tia.aspectp   <number>       Scale TIA width by the given percentage in PAL\n"

src/emucore/TIASurface.cxx

@@ -28,13 +28,9 @@
 namespace {
   FrameBuffer::ScalingInterpolation interpolationModeFromSettings(const Settings& settings)
   {
-    const string setting = settings.getString("tia.filter");
-
-    if (setting == "sharp") return FrameBuffer::ScalingInterpolation::sharp;
-    if (setting == "soft") return FrameBuffer::ScalingInterpolation::blur;
-    if (setting == "none") return FrameBuffer::ScalingInterpolation::none;
-
-    return FrameBuffer::ScalingInterpolation::sharp;
+    return settings.getBool("tia.inter") ?
+      FrameBuffer::ScalingInterpolation::blur :
+      FrameBuffer::ScalingInterpolation::sharp;
   }
 }
 
@@ -298,7 +294,7 @@ string TIASurface::effectsInfo() const
       break;
   }
 
-  buf << ", filter=" << myOSystem.settings().getString("tia.filter");
+  buf << ", inter=" << myOSystem.settings().getBool("tia.inter") ? "enabled" : "disabled";
 
   return buf.str();
 }

src/gui/VideoDialog.cxx

@@ -123,15 +123,9 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
   wid.push_back(myTIAPalette);
   ypos += lineHeight + VGAP;
 
-  // TIA Filter
-  items.clear();
-  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;
+  // TIA interpolation
+  myTIAInterpolate = new CheckboxWidget(myTab, font, xpos, ypos + 1, "Interpolation ");
+  wid.push_back(myTIAInterpolate);  ypos += lineHeight + VGAP;
 
 
   // TIA zoom levels (will be dynamically filled later)
@@ -355,8 +349,8 @@ void VideoDialog::loadConfig()
   myTIAPalette->setSelected(
     instance().settings().getString("palette"), "standard");
 
-  // TIA Filter
-  myTIAFilter->setSelected(instance().settings().getString("tia.filter"), "none");
+  // TIA interpolation
+  myTIAInterpolate->setState(instance().settings().getBool("tia.inter"));
 
   // Aspect ratio setting (NTSC and PAL)
   myNAspectRatio->setValue(instance().settings().getInt("tia.aspectn"));
@@ -428,8 +422,8 @@ void VideoDialog::saveConfig()
   instance().settings().setValue("palette",
     myTIAPalette->getSelectedTag().toString());
 
-  // TIA Filter
-  instance().settings().setValue("tia.filter", myTIAFilter->getSelectedTag().toString());
+  // TIA interpolation
+  instance().settings().setValue("tia.inter", myTIAInterpolate->getState());
 
   // Aspect ratio setting (NTSC and PAL)
   instance().settings().setValue("tia.aspectn", myNAspectRatio->getValueLabel());
@@ -510,7 +504,7 @@ void VideoDialog::setDefaults()
       myRenderer->setSelectedIndex(0);
       myTIAZoom->setValue(300);
       myTIAPalette->setSelected("standard", "");
-      myTIAFilter->setSelected("none", "");
+      myTIAInterpolate->setState(false);
       myNAspectRatio->setValue(91);
       myPAspectRatio->setValue(109);
       mySpeed->setValue(0);

src/gui/VideoDialog.hxx

@@ -57,7 +57,7 @@ class VideoDialog : public Dialog
     PopUpWidget*      myRenderer;
     SliderWidget*     myTIAZoom;
     PopUpWidget*      myTIAPalette;
-    PopUpWidget*      myTIAFilter;
+    CheckboxWidget* myTIAInterpolate;
     SliderWidget*     myNAspectRatio;
     SliderWidget*     myPAspectRatio;
     SliderWidget*     mySpeed;