X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_time.cc;h=8f080285e2c26a09e893644bc2e5bbe8ce47c501;hb=47ba20143e06445a9977f4757d816439ea8042d0;hp=0f2186c09b8eefd5020326976b7a6985501b5987;hpb=4729bbde5f5f6833b878155da5a395d5ecd9e565;p=ardour.git

diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 0f2186c09b..8f080285e2 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -35,7 +35,7 @@
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -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);
@@ -164,12 +164,12 @@ Session::timecode_duration (framecnt_t when, Timecode::Time& timecode) const
 }
 
 void
-Session::timecode_duration_string (char* buf, framepos_t when) const
+Session::timecode_duration_string (char* buf, size_t len, framepos_t when) const
 {
 	Timecode::Time timecode;
 
 	timecode_duration (when, timecode);
-	snprintf (buf, sizeof (buf), "%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32, timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
+	snprintf (buf, len, "%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32, timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
 }
 
 void
@@ -182,7 +182,7 @@ Session::timecode_time (Timecode::Time &t)
 int
 Session::backend_sync_callback (TransportState state, framepos_t pos)
 {
-	bool slave = synced_to_jack();
+	bool slave = synced_to_engine();
 
 	switch (state) {
 	case TransportStopped:
@@ -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: