1 files changed, 15 insertions, 13 deletions

diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp
index 4863bef..f0c3f00 100644
--- a/src/adlmidi_midiplay.cpp
+++ b/src/adlmidi_midiplay.cpp
@@ -158,24 +158,24 @@ uint64_t MIDIplay::ReadVarLen(size_t tk)
 }
 
 
-double MIDIplay::Tick(double s, double granularity)
+long double MIDIplay::Tick(long double s, long double granularity)
 {
     if(CurrentPosition.began)
         CurrentPosition.wait -= s;
 
     int AntiFreezeCounter = 10000;//Limit 10000 loops to avoid freezing
 
-    while((CurrentPosition.wait <= granularity * 0.5) && (AntiFreezeCounter > 0))
+    while((CurrentPosition.wait <= granularity * 0.5l) && (AntiFreezeCounter > 0))
     {
         //std::fprintf(stderr, "wait = %g...\n", CurrentPosition.wait);
         ProcessEvents();
 
-        if(CurrentPosition.wait <= 0.0)
+        if(CurrentPosition.wait <= 0.0l)
             AntiFreezeCounter--;
     }
 
     if(AntiFreezeCounter <= 0)
-        CurrentPosition.wait += 1.0;/* Add extra 1 second when over 10000 events
+        CurrentPosition.wait += 1.0l;/* Add extra 1 second when over 10000 events
 
                                            with zero delay are been detected */
 
@@ -405,13 +405,15 @@ void MIDIplay::ProcessEvents()
     }
 
     // Find shortest delay from all track
-    long shortest = -1;
+    uint64_t shortest = 0;
+    bool     shortest_no = true;
 
     for(size_t tk = 0; tk < TrackCount; ++tk)
-        if(CurrentPosition.track[tk].status >= 0
-           && (shortest == -1
-               || CurrentPosition.track[tk].delay < shortest))
+        if((CurrentPosition.track[tk].status >= 0) && (shortest_no || CurrentPosition.track[tk].delay < shortest))
+        {
             shortest = CurrentPosition.track[tk].delay;
+            shortest_no = false;
+        }
 
     //if(shortest > 0) UI.PrintLn("shortest: %ld", shortest);
 
@@ -419,7 +421,7 @@ void MIDIplay::ProcessEvents()
     for(size_t tk = 0; tk < TrackCount; ++tk)
         CurrentPosition.track[tk].delay -= shortest;
 
-    fraction<long> t = shortest * Tempo;
+    fraction<uint64_t> t = shortest * Tempo;
 
     if(CurrentPosition.began)
         CurrentPosition.wait += t.valuel();
@@ -453,7 +455,7 @@ void MIDIplay::ProcessEvents()
         loopStart_hit = true;
     }
 
-    if(shortest < 0 || loopEnd)
+    if(shortest_no || loopEnd)
     {
         // Loop if song end reached
         loopEnd         = false;
@@ -496,7 +498,7 @@ void MIDIplay::HandleEvent(size_t tk)
 
         if(evtype == 0x51)
         {
-            Tempo = InvDeltaTicks * fraction<long>((long) ReadBEint(data.data(), data.size()));
+            Tempo = InvDeltaTicks * fraction<uint64_t>(ReadBEint(data.data(), data.size()));
             return;
         }
 
@@ -1262,7 +1264,7 @@ void MIDIplay::NoteOff(uint16_t MidCh, uint8_t note)
 }
 
 
-void MIDIplay::UpdateVibrato(double amount)
+void MIDIplay::UpdateVibrato(long double amount)
 {
     for(size_t a = 0, b = Ch.size(); a < b; ++a)
         if(Ch[a].vibrato && !Ch[a].activenotes.empty())
@@ -1290,7 +1292,7 @@ uint64_t MIDIplay::ChooseDevice(const std::string &name)
     return n;
 }
 
-void MIDIplay::UpdateArpeggio(double) // amount = amount of time passed
+void MIDIplay::UpdateArpeggio(long double) // amount = amount of time passed
 {
     // If there is an adlib channel that has multiple notes
     // simulated on the same channel, arpeggio them.