X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=2e4842016a6673ecb08942f21f5123bb26f8a73d;hb=b502bbc61895d61c39bf240b47e8a3664be2c541;hp=65432c375406d0453cc1db014b14b9fd3d209d5d;hpb=98d994f29c968796c5e9822e7c3b1713e53b274d;p=ardour.git

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 65432c3754..2e4842016a 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -17,6 +17,10 @@
 
 */
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
 #include <cstdio> // for sprintf, grrr
 #include <cstdlib>
 #include <cmath>
@@ -134,13 +138,13 @@ Editor::redisplay_tempo (bool immediate_redraw)
 }
 
 void
-Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
+Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost)
 {
 	if (!_session) {
 		return;
 	}
 
-	BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
+	Timecode::BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
 
 	_session->bbt_time(leftmost, previous_beat);
 	_session->bbt_time(rightmost, next_beat);
@@ -197,7 +201,7 @@ Editor::draw_measures ()
 }
 
 void
-Editor::mouse_add_new_tempo_event (nframes64_t frame)
+Editor::mouse_add_new_tempo_event (framepos_t frame)
 {
 	if (_session == 0) {
 		return;
@@ -220,7 +224,7 @@ Editor::mouse_add_new_tempo_event (nframes64_t frame)
 	}
 
 	double bpm = 0;
-	BBT_Time requested;
+	Timecode::BBT_Time requested;
 
 	bpm = tempo_dialog.get_bpm ();
 	double nt = tempo_dialog.get_note_type();
@@ -239,7 +243,7 @@ Editor::mouse_add_new_tempo_event (nframes64_t frame)
 }
 
 void
-Editor::mouse_add_new_meter_event (nframes64_t frame)
+Editor::mouse_add_new_meter_event (framepos_t frame)
 {
 	if (_session == 0) {
 		return;
@@ -267,7 +271,7 @@ Editor::mouse_add_new_meter_event (nframes64_t frame)
 	bpb = max (1.0, bpb); // XXX is this a reasonable limit?
 
 	double note_type = meter_dialog.get_note_type ();
-	BBT_Time requested;
+	Timecode::BBT_Time requested;
 
 	meter_dialog.get_bbt_time (requested);
 
@@ -348,7 +352,7 @@ Editor::edit_tempo_section (TempoSection* section)
 
 	double bpm = tempo_dialog.get_bpm ();
 	double nt = tempo_dialog.get_note_type ();
-	BBT_Time when;
+	Timecode::BBT_Time when;
 	tempo_dialog.get_bbt_time(when);
 	bpm = max (0.01, bpm);