From 524548a08ab808597346d32638872fcf0c8892bc Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Wed, 15 Nov 2017 23:41:15 +0100
Subject: [PATCH 1/2] attempt to remove warnings

---
 src/common/RewindManager.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/RewindManager.cxx b/src/common/RewindManager.cxx
index ab3f2cd6d..c162266db 100644
--- a/src/common/RewindManager.cxx
+++ b/src/common/RewindManager.cxx
@@ -185,11 +185,11 @@ string RewindManager::getMessage(RewindState& state)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 string RewindManager::getUnitString(Int64 cycles)
 {
-  const uInt64 scanlines = myOSystem.console().tia().scanlinesLastFrame();
+  const Int64 scanlines = myOSystem.console().tia().scanlinesLastFrame();
   const bool isNTSC = scanlines <= 285; // TODO: replace magic number
-  const uInt64 NTSC_FREQ = 1193182; // ~76*262*60
-  const uInt64 PAL_FREQ = 1182298; // ~76*312*50
-  const uInt64 freq = isNTSC ? NTSC_FREQ : PAL_FREQ; // = cycles/second
+  const Int64 NTSC_FREQ = 1193182; // ~76*262*60
+  const Int64 PAL_FREQ = 1182298; // ~76*312*50
+  const Int64 freq = isNTSC ? NTSC_FREQ : PAL_FREQ; // = cycles/second
 
   string unit;
   Int64 diffUnit;

From 64c6e97db302d0110d76e0ca21cd96a994994a33 Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Thu, 16 Nov 2017 14:49:41 +0100
Subject: [PATCH 2/2] RewindManager::getUnitString() refactored

---
 src/common/RewindManager.cxx | 46 ++++++++++++------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/src/common/RewindManager.cxx b/src/common/RewindManager.cxx
index c162266db..9a06bce88 100644
--- a/src/common/RewindManager.cxx
+++ b/src/common/RewindManager.cxx
@@ -191,41 +191,25 @@ string RewindManager::getUnitString(Int64 cycles)
   const Int64 PAL_FREQ = 1182298; // ~76*312*50
   const Int64 freq = isNTSC ? NTSC_FREQ : PAL_FREQ; // = cycles/second
 
-  string unit;
-  Int64 diffUnit;
+  // TODO: do we need hours here? don't think so
+  const Int32 NUM_UNITS = 5;
+  const string UNIT_NAMES[NUM_UNITS] = { "cycle", "scanline", "frame", "second", "minute" };
+  const Int64 UNIT_CYCLES[NUM_UNITS + 1] = { 1, 76, 76 * scanlines, freq, freq * 60, (Int64)1 << 63 };
+
   stringstream result;
+  Int32 i;
 
   cycles = abs(cycles);
-  // use the lower unit up to twice the next unit, except for an exact match of the next unit
-  // TODO: does the latter make sense, e.g. for ROMs with changing scanlines?
-  if(cycles < 76 * 2 && cycles % 76 != 0)
-  {
-    unit = "cycle";
-    diffUnit = cycles;
-  }
-  else if(cycles < 76 * scanlines * 2 && cycles % (76 * scanlines) != 0)
-  {
-    unit = "scanline";
-    diffUnit = cycles / 76;
-  }
-  else if(cycles < freq * 2 && cycles % freq != 0)
-  {
-    unit = "frame";
-    diffUnit = cycles / (76 * scanlines);
-  }
-  else if(cycles < freq * 60 * 2 && cycles % (freq * 60) != 0)
-  {
-    unit = "second";
-    diffUnit = cycles / freq;
-  }
-  else
-  {
-    unit = "minute";
-    diffUnit = cycles / (freq * 60);
-  } // TODO: do we need hours here? don't think so
 
-  result << diffUnit << " " << unit;
-  if(diffUnit != 1)
+  for(i = 0; i < NUM_UNITS - 1; ++i)
+  {
+    // use the lower unit up to twice the next unit, except for an exact match of the next unit
+    // TODO: does the latter make sense, e.g. for ROMs with changing scanlines?
+    if(cycles < UNIT_CYCLES[i + 1] * 2 && cycles % UNIT_CYCLES[i + 1] != 0)
+      break;
+  }
+  result << cycles / UNIT_CYCLES[i] << " " << UNIT_NAMES[i];
+  if(cycles / UNIT_CYCLES[i] != 1)
     result << "s";
 
   return result.str();