From 9c4664d162c537ba4dd4fd8220971c0fb727103a Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Sun, 1 Jul 2012 16:42:16 +0000
Subject: final merge

---
 muse2/muse/widgets/bigtime.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'muse2/muse/widgets/bigtime.cpp')

diff --git a/muse2/muse/widgets/bigtime.cpp b/muse2/muse/widgets/bigtime.cpp
index 0b213f28..5adf4966 100644
--- a/muse2/muse/widgets/bigtime.cpp
+++ b/muse2/muse/widgets/bigtime.cpp
@@ -32,6 +32,7 @@
 #include "song.h"
 #include "app.h"
 #include "gconfig.h"
+#include "audio.h"
 
 namespace MusEGlobal {
 extern int mtcType;
@@ -229,7 +230,9 @@ bool BigTime::setString(unsigned v)
             return true;
             }
 
-      unsigned absFrame = MusEGlobal::tempomap.tick2frame(v);
+      // Quick fix: Not much to do but ignore the supplied tick: We need the exact frame here.
+      unsigned absFrame = MusEGlobal::audio->pos().frame();
+      
       int bar, beat;
       unsigned tick;
       AL::sigmap.tickValues(v, &bar, &beat, &tick);
-- 
cgit v1.2.3