X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_time.cc;h=54770d5cc8a16b5f4e64ef757a7de6980166e56a;hb=24b514797ab265bf48eb93d6c2c812ce5232fdba;hp=ab5a470a8af096c130008eca578fc7d600a115b5;hpb=25a6296f865620d5013cd634e693f7179e7edc84;p=ardour.git

diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index ab5a470a8a..54770d5cc8 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -46,7 +46,7 @@ using namespace PBD;
 void
 Session::bbt_time (framepos_t when, Timecode::BBT_Time& bbt)
 {
-	_tempo_map->bbt_time (when, bbt);
+	bbt = _tempo_map->bbt_at_frame (when);
 }
 
 /* Timecode TIME */
@@ -66,7 +66,7 @@ Session::timecode_drop_frames() const
 void
 Session::sync_time_vars ()
 {
-	_current_frame_rate = (framecnt_t) round (_base_frame_rate * (1.0 + (config.get_video_pullup()/100.0)));
+	_current_frame_rate = (framecnt_t) round (_nominal_frame_rate * (1.0 + (config.get_video_pullup()/100.0)));
 	_frames_per_timecode_frame = (double) _current_frame_rate / (double) timecode_frames_per_second();
 	if (timecode_drop_frames()) {
 	  _frames_per_hour = (int32_t)(107892 * _frames_per_timecode_frame);
@@ -226,7 +226,7 @@ Session::convert_to_frames (AnyTime const & position)
 
 	switch (position.type) {
 	case AnyTime::BBT:
-		return _tempo_map->frame_time (position.bbt);
+		return _tempo_map->frame_at_bbt (position.bbt);
 		break;
 
 	case AnyTime::Timecode: