From 577f0bd1d0517a0a2ff84fd5221473ac9b0f5972 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Wed, 14 May 2008 15:20:04 -0500
Subject: [PATCH] Improve tick calculation.

---
 Timeline/Timeline.C | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Timeline/Timeline.C b/Timeline/Timeline.C
index ae8834c..707fd54 100644
--- a/Timeline/Timeline.C
+++ b/Timeline/Timeline.C
@@ -366,7 +366,7 @@ const float ticks_per_beat = 1920.0;
 position_info
 Timeline::solve_tempomap ( nframes_t frame ) const
 {
-    return render_tempomap( frame, 1, 0, 0 );
+    return render_tempomap( frame, 0, 0, 0 );
 }
 
 /** draw appropriate measure lines inside the given bounding box */
@@ -461,12 +461,14 @@ done:
     pos.beats_per_bar = sig.beats_per_bar;
     pos.beat_type = sig.beat_type;
 
-    assert( f < end );
+    assert( f <= end );
+
+    assert( end - f <= frames_per_beat );
 
     /* FIXME: this this right? */
 
     const nframes_t frames_per_tick = frames_per_beat / ticks_per_beat;
-    bbt.tick = ( ( ( end - f ) / frames_per_tick ) % (nframes_t)ticks_per_beat );
+    bbt.tick = ( end - f ) / frames_per_tick;
 
     return pos;
 }