X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_rulers.cc;h=868b00690083be3eca49a8b14ed4049d79a65a9e;hb=b6c3e5537269e53bb145300e7724e8b89dfb74d6;hp=f2b42fccc34dd9731ae769ab4f3c05c7a3564482;hpb=72812d2cd04d7c685264209f00cac36e5abef061;p=ardour.git

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index f2b42fccc3..868b006900 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -53,7 +53,7 @@
 #include "editor_cursors.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -1275,7 +1275,7 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
 				next_beat.beats = (*i).beat;
 				next_beat.bars = (*i).bar;
 				next_beat.ticks = tick;
-				pos = _session->tempo_map().frame_time (next_beat);
+				pos = _session->tempo_map().frame_at_bbt (next_beat);
 
 				if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
 					i_am_accented = true;
@@ -1345,7 +1345,7 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
 				next_beat.beats = (*i).beat;
 				next_beat.bars = (*i).bar;
 				next_beat.ticks = tick;
-				pos = _session->tempo_map().frame_time (next_beat);
+				pos = _session->tempo_map().frame_at_bbt (next_beat);
 
 				if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
 					i_am_accented = true;
@@ -1421,7 +1421,7 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
 			while (tick < Timecode::BBT_Time::ticks_per_beat && (n < bbt_nmarks)) {
 
 				next_beat.ticks = tick;
-				pos = _session->tempo_map().frame_time (next_beat);
+				pos = _session->tempo_map().frame_at_bbt (next_beat);
 				if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
 					i_am_accented = true;
 				}