X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_time.cc;h=64641e302beb4d9c78a9d18811c5ba03ef5c3ace;hb=3d183dc462a82c5ee0b4fb77a226f0e49d9736f7;hp=0f2186c09b8eefd5020326976b7a6985501b5987;hpb=bb826f4beebfcedc50570b818c305560d2233e47;p=ardour.git

diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 0f2186c09b..64641e302b 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,12 +66,12 @@ 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)));
-	_frames_per_timecode_frame = (double) _current_frame_rate / (double) timecode_frames_per_second();
+	_current_frame_rate = (framecnt_t) round (_nominal_frame_rate * (1.0 + (config.get_video_pullup()/100.0)));
+	_samples_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);
+	  _frames_per_hour = (int32_t)(107892 * _samples_per_timecode_frame);
 	} else {
-	  _frames_per_hour = (int32_t)(3600 * rint(timecode_frames_per_second()) * _frames_per_timecode_frame);
+	  _frames_per_hour = (int32_t)(3600 * rint(timecode_frames_per_second()) * _samples_per_timecode_frame);
 	}
 	_timecode_frames_per_hour = rint(timecode_frames_per_second() * 3600.0);
 
@@ -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,20 +182,27 @@ 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();
+	// cerr << "Session::backend_sync_callback() _transport_frame: " << _transport_frame << " pos: " << pos << " audible_frame: " << audible_frame() << endl;
+
+	if (slave) {
+		// cerr << "Session::backend_sync_callback() emitting Located()" << endl;
+		Located (); /* EMIT SIGNAL */
+	}
 
 	switch (state) {
 	case TransportStopped:
 		if (slave && _transport_frame != pos && post_transport_work() == 0) {
 			request_locate (pos, false);
-			// cerr << "SYNC: stopped, locate to " << pos->frame << " from " << _transport_frame << endl;
+			// cerr << "SYNC: stopped, locate to " << pos << " from " << _transport_frame << endl;
 			return false;
 		} else {
+			// cerr << "SYNC: stopped, nothing to do" << endl;
 			return true;
 		}
 
 	case TransportStarting:
-		// cerr << "SYNC: starting @ " << pos->frame << " a@ " << _transport_frame << " our work = " <<  post_transport_work() << " pos matches ? " << (_transport_frame == pos->frame) << endl;
+		// cerr << "SYNC: starting @ " << pos << " a@ " << _transport_frame << " our work = " <<  post_transport_work() << " pos matches ? " << (_transport_frame == pos) << endl;
 		if (slave) {
 			return _transport_frame == pos && post_transport_work() == 0;
 		} else {
@@ -226,7 +233,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: