Fix double-display of VST preset names (#3576)

[ardour.git] / gtk2_ardour / editor_rulers.cc

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 152fef8f8330800e7a0a2572836cece1127b3c95..b367a55f2502313cf88c859e5e3236db96355234 100644 (file)
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -41,6 +41,7 @@
 #include "gui_thread.h"
 #include "time_axis_view.h"
 #include "editor_drag.h"
+#include "editor_cursors.h"
 
 #include "i18n.h"
 
@@ -1001,7 +1002,7 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble
                lower = 0;
        }
 
-       pos = (nframes_t) floor (lower);
+       pos = (framecnt_t) floor (lower);
 
        *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * timecode_nmarks);
        switch (timecode_ruler_scale) {
@@ -1149,8 +1150,8 @@ Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper)
        TempoMap::BBTPointList::iterator i;
         BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler
 
-        _session->bbt_time((jack_nframes_t) lower, lower_beat);
-        _session->bbt_time((jack_nframes_t) upper, upper_beat);
+        _session->bbt_time (lower, lower_beat);
+        _session->bbt_time (upper, upper_beat);
         uint32_t beats = 0;
 
        bbt_accent_modulo = 1;