From 1ecb8852dee1f6b081cd2c402e97284f2c8e20e1 Mon Sep 17 00:00:00 2001
From: Christian Speckner <christian.speckner@mayflower.de>
Date: Wed, 31 May 2017 00:01:11 +0200
Subject: [PATCH] Use console timing instead of frame layout in order to
 determine clock in paddle reader.

---
 src/emucore/tia/PaddleReader.cxx | 18 +++++++++---------
 src/emucore/tia/PaddleReader.hxx |  8 ++++----
 src/emucore/tia/TIA.cxx          |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/emucore/tia/PaddleReader.cxx b/src/emucore/tia/PaddleReader.cxx
index 3709912ce..142a19d42 100644
--- a/src/emucore/tia/PaddleReader.cxx
+++ b/src/emucore/tia/PaddleReader.cxx
@@ -42,7 +42,7 @@ void PaddleReader::reset(double timestamp)
   myValue = 0;
   myTimestamp = timestamp;
 
-  setLayout(FrameLayout::ntsc);
+  setConsoleTiming(ConsoleTiming::ntsc);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -71,10 +71,10 @@ uInt8 PaddleReader::inpt(double timestamp)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void PaddleReader::update(double value, double timestamp, FrameLayout layout)
+void PaddleReader::update(double value, double timestamp, ConsoleTiming consoleTiming)
 {
-  if (layout != myLayout) {
-    setLayout(layout);
+  if (consoleTiming != myConsoleTiming) {
+    setConsoleTiming(consoleTiming);
   }
 
   if (value != myValue) {
@@ -84,11 +84,11 @@ void PaddleReader::update(double value, double timestamp, FrameLayout layout)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void PaddleReader::setLayout(FrameLayout layout)
+void PaddleReader::setConsoleTiming(ConsoleTiming consoleTiming)
 {
-  myLayout = layout;
+  myConsoleTiming = consoleTiming;
 
-  myClockFreq = myLayout == FrameLayout::ntsc ? 60 * 228 * 262 : 50 * 228 * 312;
+  myClockFreq = myConsoleTiming == ConsoleTiming::ntsc ? 60 * 228 * 262 : 50 * 228 * 312;
   myUThresh = USUPP * (1. - exp(-TRIPPOINT_LINES * 228 / myClockFreq  / (RPOT + R0) / C));
 }
 
@@ -117,7 +117,7 @@ bool PaddleReader::save(Serializer& out) const
     out.putDouble(myValue);
     out.putDouble(myTimestamp);
 
-    out.putInt(int(myLayout));
+    out.putInt(int(myConsoleTiming));
     out.putDouble(myClockFreq);
 
     out.putBool(myIsDumped);
@@ -145,7 +145,7 @@ bool PaddleReader::load(Serializer& in)
     myValue = in.getDouble();
     myTimestamp = in.getDouble();
 
-    myLayout = FrameLayout(in.getInt());
+    myConsoleTiming = ConsoleTiming(in.getInt());
     myClockFreq = in.getDouble();
 
     myIsDumped = in.getBool();
diff --git a/src/emucore/tia/PaddleReader.hxx b/src/emucore/tia/PaddleReader.hxx
index 464a112c7..00238a4fe 100644
--- a/src/emucore/tia/PaddleReader.hxx
+++ b/src/emucore/tia/PaddleReader.hxx
@@ -19,8 +19,8 @@
 #define TIA_PADDLE_READER
 
 #include "bspf.hxx"
-#include "FrameLayout.hxx"
 #include "Serializable.hxx"
+#include "Console.hxx"
 
 class PaddleReader : public Serializable
 {
@@ -37,7 +37,7 @@ class PaddleReader : public Serializable
 
     uInt8 inpt(double timestamp);
 
-    void update(double value, double timestamp, FrameLayout layout);
+    void update(double value, double timestamp, ConsoleTiming consoleTiming);
 
     /**
       Serializable methods (see that class for more information).
@@ -48,7 +48,7 @@ class PaddleReader : public Serializable
 
   private:
 
-    void setLayout(FrameLayout layout);
+    void setConsoleTiming(ConsoleTiming timing);
 
     void updateCharge(double timestamp);
 
@@ -60,7 +60,7 @@ class PaddleReader : public Serializable
     double myValue;
     double myTimestamp;
 
-    FrameLayout myLayout;
+    ConsoleTiming myConsoleTiming;
     double myClockFreq;
 
     bool myIsDumped;
diff --git a/src/emucore/tia/TIA.cxx b/src/emucore/tia/TIA.cxx
index 6f597418b..0914bfd7b 100644
--- a/src/emucore/tia/TIA.cxx
+++ b/src/emucore/tia/TIA.cxx
@@ -1399,7 +1399,7 @@ void TIA::updatePaddle(uInt8 idx)
   myPaddleReaders[idx].update(
     (resistance == Controller::maximumResistance ? -1 : double(resistance)) / Paddles::MAX_RESISTANCE,
     myTimestamp,
-    myFrameManager.layout()
+    consoleTiming()
   );
 }