summaryrefslogtreecommitdiff
path: root/muse2/muse/widgets/bigtime.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-07-01 16:42:16 +0000
committerFlorian Jung <flo@windfisch.org>2012-07-01 16:42:16 +0000
commit9c4664d162c537ba4dd4fd8220971c0fb727103a (patch)
tree37a28b7cd4e4d8984ad4934a4884cd7b4da0505c /muse2/muse/widgets/bigtime.cpp
parente87fedf1be804f7ec774071d844b1f163be30b96 (diff)
final merge
Diffstat (limited to 'muse2/muse/widgets/bigtime.cpp')
-rw-r--r--muse2/muse/widgets/bigtime.cpp5
1 files changed, 4 insertions, 1 deletions
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);