Remove dead code from FrameManager (temporarily disables jitter).

src/emucore/tia/frame-manager/FrameManager.cxx

@@ -41,7 +41,8 @@ enum Metrics: uInt32 {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 FrameManager::FrameManager() :
-  myHeight(0)
+  myHeight(0),
+  myYStart(0)
 {
   onLayoutChange();
 }
@@ -49,14 +50,11 @@ FrameManager::FrameManager() :
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FrameManager::onReset()
 {
-  myVblankManager.reset();
-
   myState = State::waitForVsyncStart;
   myLineInState = 0;
   myTotalFrames = 0;
   myVsyncLines = 0;
   myY = 0;
-  myFramePending = false;
 
   myStableFrameLines = -1;
   myStableFrameHeightCountdown = 0;
@@ -85,8 +83,7 @@ void FrameManager::onNextLine()
       break;
 
     case State::waitForFrameStart:
-      if (myVblankManager.nextLine(myTotalFrames <= Metrics::initialGarbageFrames))
+      if (myLineInState >= myYStart) setState(State::frame);
-        setState(State::frame);
       break;
 
     case State::frame:
@@ -107,7 +104,7 @@ void FrameManager::onNextLine()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Int32 FrameManager::missingScanlines() const
 {
-  if (myLastY == ystart() + myY)
+  if (myLastY == myYStart + myY)
     return 0;
   else {
     return myHeight - myY;
@@ -117,28 +114,8 @@ Int32 FrameManager::missingScanlines() const
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FrameManager::onSetVsync()
 {
-#ifdef TIA_FRAMEMANAGER_DEBUG_LOG
+  if (myState == State::waitForVsyncEnd) setState(State::waitForFrameStart);
-  (cout << "vsync " << !myVsync << " -> " << myVsync << ": state " << int(myState) << " @ " << myLineInState << "\n").flush();
+  else setState(State::waitForVsyncEnd);
-#endif
-
-  switch (myState)
-  {
-    case State::waitForVsyncStart:
-    case State::waitForFrameStart:
-      if (myVsync) setState(State::waitForVsyncEnd);
-      break;
-
-    case State::waitForVsyncEnd:
-      if (!myVsync) setState(State::waitForFrameStart);
-      break;
-
-    case State::frame:
-      if (myVsync) setState(State::waitForVsyncEnd);
-      break;
-
-    default:
-      throw runtime_error("frame manager: invalid state");
-  }
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -146,21 +123,14 @@ void FrameManager::setState(FrameManager::State state)
 {
   if (myState == state) return;
 
-#ifdef TIA_FRAMEMANAGER_DEBUG_LOG
-  (cout << "state change " << myState << " -> " << state << " @ " << myLineInState << "\n").flush();
-#endif // TIA_FRAMEMANAGER_DEBUG_LOG
-
   myState = state;
   myLineInState = 0;
 
   switch (myState) {
     case State::waitForFrameStart:
-      if (myFramePending) finalizeFrame();
+      finalizeFrame();
       notifyFrameStart();
 
-      myVblankManager.start();
-      myFramePending = true;
-
       myVsyncLines = 0;
       break;
 
@@ -204,6 +174,7 @@ void FrameManager::finalizeFrame()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FrameManager::handleJitter(Int32 scanlineDifference)
 {
+  /*
   if (
     (uInt32)abs(scanlineDifference) < Metrics::minDeltaForJitter ||
     !myJitterEnabled ||
@@ -211,16 +182,13 @@ void FrameManager::handleJitter(Int32 scanlineDifference)
   ) return;
 
   myVblankManager.setJitter(scanlineDifference);
+  */
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // TODO: kill this with fire once frame manager refactoring is complete
 void FrameManager::onLayoutChange()
 {
-#ifdef TIA_FRAMEMANAGER_DEBUG_LOG
-  (cout << "TV mode switched to " << int(layout()) << "\n").flush();
-#endif // TIA_FRAMEMANAGER_DEBUG_LOG
-
   switch (layout())
   {
     case FrameLayout::ntsc:
@@ -242,23 +210,6 @@ void FrameManager::onLayoutChange()
   myFrameLines = Metrics::vsync + myVblankLines + myKernelLines + myOverscanLines;
   if (myFixedHeight == 0)
     myHeight = myKernelLines + Metrics::visibleOverscan;
-
-  myVblankManager.setVblankLines(myVblankLines);
-}
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void FrameManager::onSetVblank()
-{
-  #ifdef TIA_FRAMEMANAGER_DEBUG_LOG
-    (cout << "vblank change " << !myVblank << " -> " << myVblank << "@" << myLineInState << "\n").flush();
-  #endif // TIA_FRAMEMANAGER_DEBUG_LOG
-
-  if (myState == State::waitForFrameStart) {
-    if (myVblankManager.setVblankDuringVblank(myVblank, myTotalFrames <= Metrics::initialGarbageFrames)) {
-      setState(State::frame);
-    }
-  } else
-    myVblankManager.setVblank(myVblank);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -271,9 +222,11 @@ void FrameManager::setFixedHeight(uInt32 height)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FrameManager::enableJitter(bool enabled)
 {
+  /*
   myJitterEnabled = enabled;
 
   if (!enabled) myVblankManager.setJitter(0);
+  */
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -284,14 +237,11 @@ void FrameManager::updateIsRendering() {
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool FrameManager::onSave(Serializer& out) const
 {
-  if (!myVblankManager.save(out)) return false;
-
   out.putInt(uInt32(myState));
   out.putInt(myLineInState);
   out.putInt(myVsyncLines);
   out.putInt(myY);
   out.putInt(myLastY);
-  out.putBool(myFramePending);
 
   out.putInt(myVblankLines);
   out.putInt(myKernelLines);
@@ -311,14 +261,11 @@ bool FrameManager::onSave(Serializer& out) const
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool FrameManager::onLoad(Serializer& in)
 {
-  if (!myVblankManager.load(in)) return false;
-
   myState = State(in.getInt());
   myLineInState = in.getInt();
   myVsyncLines = in.getInt();
   myY = in.getInt();
   myLastY = in.getInt();
-  myFramePending = in.getBool();
 
   myVblankLines = in.getInt();
   myKernelLines = in.getInt();

src/emucore/tia/frame-manager/FrameManager.hxx

@@ -19,7 +19,6 @@
 #define TIA_FRAME_MANAGER
 
 #include "AbstractFrameManager.hxx"
-#include "VblankManager.hxx"
 #include "TIAConstants.hxx"
 #include "bspf.hxx"
 
@@ -30,7 +29,7 @@ class FrameManager: public AbstractFrameManager {
 
   public:
 
-    void setJitterFactor(uInt8 factor) override { myVblankManager.setJitterFactor(factor); }
+    void setJitterFactor(uInt8 factor) override { }
 
     bool jitterEnabled() const override { return myJitterEnabled; }
 
@@ -46,14 +45,12 @@ class FrameManager: public AbstractFrameManager {
 
     Int32 missingScanlines() const override;
 
-    void setYstart(uInt32 ystart) override { myVblankManager.setYstart(ystart); }
+    void setYstart(uInt32 ystart) override { myYStart = ystart; }
 
-    uInt32 ystart() const override { return myVblankManager.ystart(); }
+    uInt32 ystart() const override { return myYStart; }
 
     void setLayout(FrameLayout mode) override { layout(mode); }
 
-    void onSetVblank() override;
-
     void onSetVsync() override;
 
     void onNextLine() override;
@@ -93,13 +90,10 @@ class FrameManager: public AbstractFrameManager {
 
   private:
 
-    VblankManager myVblankManager;
-
     State myState;
     uInt32 myLineInState;
     uInt32 myVsyncLines;
     uInt32 myY, myLastY;
-    bool myFramePending;
 
     uInt32 myVblankLines;
     uInt32 myKernelLines;
@@ -107,6 +101,7 @@ class FrameManager: public AbstractFrameManager {
     uInt32 myFrameLines;
     uInt32 myHeight;
     uInt32 myFixedHeight;
+    uInt32 myYStart;
 
     bool myJitterEnabled;