X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fsession_time.cc;h=e7bd0a3696ef1be40c2fc5c418c5c230d8aaf2c6;hb=bb02870c15a9db3f46e2e24d1d5c72e9ca5dfe0b;hp=e3badc5b114b0cf448d32eddc4bf42a609ad9671;hpb=4c509656223d3ed1f0fab504cb483090d38972f9;p=ardour.git

diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index e3badc5b11..e7bd0a3696 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -26,6 +26,7 @@
 #include <ardour/timestamps.h>
 
 #include <pbd/error.h>
+#include <pbd/stacktrace.h>
 
 #include <ardour/ardour.h>
 #include <ardour/configuration.h>
@@ -36,445 +37,182 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
-//using namespace sigc;
+using namespace PBD;
 
 /* BBT TIME*/
 
 void
-Session::bbt_time (jack_nframes_t when, BBT_Time& bbt)
+Session::bbt_time (nframes_t when, BBT_Time& bbt)
 {
 	_tempo_map->bbt_time (when, bbt);
 }
 
 /* SMPTE TIME */
-
-int
-Session::set_smpte_type (float fps, bool drop_frames)
+float
+Session::smpte_frames_per_second() const
 {
-	smpte_frames_per_second = fps;
-	smpte_drop_frames = drop_frames;
-	_frames_per_smpte_frame = (double) _current_frame_rate / (double) smpte_frames_per_second;
-	_frames_per_hour = _current_frame_rate * 3600;
-	_smpte_frames_per_hour = (unsigned long) (smpte_frames_per_second * 3600.0);
+	switch (Config->get_smpte_format()) {
+		case smpte_23976: 
+			return 23.976;
 
+			break;
+		case smpte_24: 
+			return 24;
 
-	last_smpte_valid = false;
-	// smpte type bits are the middle two in the upper nibble
-	switch ((int) ceil (fps)) {
-	case 24:
-		mtc_smpte_bits = 0;
-		break;
-
-	case 25:
-		mtc_smpte_bits = 0x20;
-		break;
-
-	case 30:
-	default:
-		if (drop_frames) {
-			mtc_smpte_bits = 0x40;
-		} else {
-			mtc_smpte_bits =  0x60;
-		}
-		break;
-	};
+			break;
+		case smpte_24976: 
+			return 24.976;
 
-	SMPTETypeChanged (); /* EMIT SIGNAL */
+			break;
+		case smpte_25: 
+			return 25;
 
-	set_dirty();
+			break;
+		case smpte_2997: 
+			return 29.97;
 
-	return 0;
-}
+			break;
+		case smpte_2997drop: 
+			return 29.97;
 
-void
-Session::set_smpte_offset (jack_nframes_t off)
-{
-	_smpte_offset = off;
-	last_smpte_valid = false;
-	SMPTEOffsetChanged (); /* EMIT SIGNAL */
-}
+			break;
+		case smpte_30: 
+			return 30;
 
-void
-Session::set_smpte_offset_negative (bool neg)
-{
-	_smpte_offset_negative = neg;
-	last_smpte_valid = false;
-	SMPTEOffsetChanged (); /* EMIT SIGNAL */
-}
+			break;
+		case smpte_30drop: 
+			return 30;
 
-#define SMPTE_IS_AROUND_ZERO( sm ) (!(sm).frames && !(sm).seconds && !(sm).minutes && !(sm).hours)
-#define SMPTE_IS_ZERO( sm ) (!(sm).frames && !(sm).seconds && !(sm).minutes && !(sm).hours && !(sm.subframes))
+			break;
+		case smpte_5994: 
+			return 59.94;
 
-// Increment by exactly one frame (keep subframes value)
-// Return true if seconds wrap
-smpte_wrap_t
-Session::smpte_increment( SMPTE_Time& smpte ) const
-{
-	smpte_wrap_t wrap = smpte_wrap_none;
+			break;
+		case smpte_60: 
+			return 60;
 
-	if (smpte.negative) {
-		if (SMPTE_IS_AROUND_ZERO(smpte) && smpte.subframes) {
-			// We have a zero transition involving only subframes
-			smpte.subframes = 80 - smpte.subframes;
-			smpte.negative = false;
-			return smpte_wrap_seconds;
-		}
-    
-		smpte.negative = false;
-		wrap = smpte_decrement( smpte );
-		if (!SMPTE_IS_ZERO( smpte )) {
-			smpte.negative = true;
-		}
-		return wrap;
-	}
-  
-	switch (mtc_smpte_bits >> 5) {
-	case MIDI::MTC_24_FPS:
-		if (smpte.frames == 23) {
-			smpte.frames = 0;
-			wrap = smpte_wrap_seconds;
-		}
-		break;
-	case MIDI::MTC_25_FPS:
-		if (smpte.frames == 24) {
-			smpte.frames = 0;
-			wrap = smpte_wrap_seconds;
-		}
-		break;
-	case MIDI::MTC_30_FPS_DROP:
-		if (smpte.frames == 29) {
-			if ( ((smpte.minutes + 1) % 10) && (smpte.seconds == 59) ) {
-				smpte.frames = 2;
-			}
-			else {
-				smpte.frames = 0;
-			}
-			wrap = smpte_wrap_seconds;
-		}
-		break;
-	case MIDI::MTC_30_FPS:
-		if (smpte.frames == 29) {
-			smpte.frames = 0;
-			wrap = smpte_wrap_seconds;
-		}
-		break;
-	}
-  
-	if (wrap == smpte_wrap_seconds) {
-		if (smpte.seconds == 59) {
-			smpte.seconds = 0;
-			wrap = smpte_wrap_minutes;
-			if (smpte.minutes == 59) {
-				smpte.minutes = 0;
-				wrap = smpte_wrap_hours;
-				smpte.hours++;
-			} else {
-				smpte.minutes++;
-			}
-		} else {
-			smpte.seconds++;
-		}
-	} else {
-		smpte.frames++;
+			break;
+	        default:
+		  cerr << "Editor received unexpected smpte type" << endl;
 	}
-  
-	return wrap;
+	return 30.0;
 }
-
-// Decrement by exactly one frame (keep subframes value)
-smpte_wrap_t
-Session::smpte_decrement( SMPTE_Time& smpte ) const
+bool
+Session::smpte_drop_frames() const
 {
-	smpte_wrap_t wrap = smpte_wrap_none;
-  
-  
-	if (smpte.negative || SMPTE_IS_ZERO(smpte)) {
-		smpte.negative = false;
-		wrap = smpte_increment( smpte );
-		smpte.negative = true;
-		return wrap;
-	} else if (SMPTE_IS_AROUND_ZERO(smpte) && smpte.subframes) {
-		// We have a zero transition involving only subframes
-		smpte.subframes = 80 - smpte.subframes;
-		smpte.negative = true;
-		return smpte_wrap_seconds;
-	}
-  
-	switch (mtc_smpte_bits >> 5) {
-	case MIDI::MTC_24_FPS:
-		if (smpte.frames == 0) {
-			smpte.frames = 23;
-			wrap = smpte_wrap_seconds;
-		}
-		break;
-	case MIDI::MTC_25_FPS:
-		if (smpte.frames == 0) {
-			smpte.frames = 24;
-			wrap = smpte_wrap_seconds;
-		}
-		break;
-	case MIDI::MTC_30_FPS_DROP:
-		if ((smpte.minutes % 10) && (smpte.seconds == 0)) {
-			if (smpte.frames <= 2) {
-				smpte.frames = 29;
-				wrap = smpte_wrap_seconds;
-			}
-		} else if (smpte.frames == 0) {
-			smpte.frames = 29;
-			wrap = smpte_wrap_seconds;
-		}
-		break;
-	case MIDI::MTC_30_FPS:
-		if (smpte.frames == 0) {
-			smpte.frames = 29;
-			wrap = smpte_wrap_seconds;
-		}
-		break;
-	}
-  
-	if (wrap == smpte_wrap_seconds) {
-		if (smpte.seconds == 0) {
-			smpte.seconds = 59;
-			wrap = smpte_wrap_minutes;
-			if (smpte.minutes == 0) {
-				smpte.minutes = 59;
-				wrap = smpte_wrap_hours;
-				smpte.hours--;
-			}
-			else {
-				smpte.minutes--;
-			}
-		} else {
-			smpte.seconds--;
-		}
-	} else {
-		smpte.frames--;
-	}
-  
-	if (SMPTE_IS_ZERO( smpte )) {
-		smpte.negative = false;
-	}
-  
-	return wrap;
-}
+	switch (Config->get_smpte_format()) {
+		case smpte_23976: 
+			return false;
 
-// Go to lowest absolute subframe value in this frame (set to 0 :-)
-void
-Session::smpte_frames_floor( SMPTE_Time& smpte ) const
-{
-	smpte.subframes = 0;
-	if (SMPTE_IS_ZERO(smpte)) {
-		smpte.negative = false;
-	}
-}
+			break;
+		case smpte_24: 
+			return false;
 
-// Increment by one subframe
-smpte_wrap_t
-Session::smpte_increment_subframes( SMPTE_Time& smpte ) const
-{
-	smpte_wrap_t wrap = smpte_wrap_none;
-  
-	if (smpte.negative) {
-		smpte.negative = false;
-		wrap = smpte_decrement_subframes( smpte );
-		if (!SMPTE_IS_ZERO(smpte)) {
-			smpte.negative = true;
-		}
-		return wrap;
-	}
-  
-	smpte.subframes++;
-	if (smpte.subframes >= 80) {
-		smpte.subframes = 0;
-		smpte_increment( smpte );
-		return smpte_wrap_frames;
-	}
-	return smpte_wrap_none;
-}
+			break;
+		case smpte_24976: 
+			return false;
 
+			break;
+		case smpte_25: 
+			return false;
 
-// Decrement by one subframe
-smpte_wrap_t
-Session::smpte_decrement_subframes( SMPTE_Time& smpte ) const
-{
-	smpte_wrap_t wrap = smpte_wrap_none;
-  
-	if (smpte.negative) {
-		smpte.negative = false;
-		wrap = smpte_increment_subframes( smpte );
-		smpte.negative = true;
-		return wrap;
-	}
-  
-	if (smpte.subframes <= 0) {
-		smpte.subframes = 0;
-		if (SMPTE_IS_ZERO(smpte)) {
-			smpte.negative = true;
-			smpte.subframes = 1;
-			return smpte_wrap_frames;
-		} else {
-			smpte_decrement( smpte );
-			smpte.subframes = 79;
-			return smpte_wrap_frames;
-		}
-	} else {
-		smpte.subframes--;
-		if (SMPTE_IS_ZERO(smpte)) {
-			smpte.negative = false;
-		}
-		return smpte_wrap_none;
-	}
-}
+			break;
+		case smpte_2997: 
+			return false;
 
+			break;
+		case smpte_2997drop: 
+			return true;
 
-// Go to next whole second (frames == 0 or frames == 2)
-smpte_wrap_t
-Session::smpte_increment_seconds( SMPTE_Time& smpte ) const
-{
-	smpte_wrap_t wrap = smpte_wrap_none;
-  
-	// Clear subframes
-	smpte_frames_floor( smpte );
-  
-	if (smpte.negative) {
-		// Wrap second if on second boundary
-		wrap = smpte_increment(smpte);
-		// Go to lowest absolute frame value
-		smpte_seconds_floor( smpte );
-		if (SMPTE_IS_ZERO(smpte)) {
-			smpte.negative = false;
-		}
-	} else {
-		// Go to highest possible frame in this second
-		switch (mtc_smpte_bits >> 5) {
-		case MIDI::MTC_24_FPS:
-			smpte.frames = 23;
 			break;
-		case MIDI::MTC_25_FPS:
-			smpte.frames = 24;
+		case smpte_30: 
+			return false;
+
 			break;
-		case MIDI::MTC_30_FPS_DROP:
-		case MIDI::MTC_30_FPS:
-			smpte.frames = 29;
+		case smpte_30drop: 
+			return true;
+
 			break;
-		}
-    
-		// Increment by one frame
-		wrap = smpte_increment( smpte );
+		case smpte_5994: 
+			return false;
+
+			break;
+		case smpte_60: 
+			return false;
+
+			break;
+	        default:
+			cerr << "Editor received unexpected smpte type" << endl;
 	}
-  
-	return wrap;
+	return false;
 }
-
-// Go to lowest (absolute) frame value in this second
-// Doesn't care about positive/negative
 void
-Session::smpte_seconds_floor( SMPTE_Time& smpte ) const
+Session::sync_time_vars ()
 {
-	// Clear subframes
-	smpte_frames_floor( smpte );
-  
-	// Go to lowest possible frame in this second
-	switch (mtc_smpte_bits >> 5) {
-	case MIDI::MTC_24_FPS:
-	case MIDI::MTC_25_FPS:
-	case MIDI::MTC_30_FPS:
-		smpte.frames = 0;
+	_current_frame_rate = (nframes_t) round (_base_frame_rate * (1.0 + (Config->get_video_pullup()/100.0)));
+	_frames_per_smpte_frame = (double) _current_frame_rate / (double) smpte_frames_per_second();
+	if (smpte_drop_frames()) {
+	  _frames_per_hour = (long)(107892 * _frames_per_smpte_frame);
+	} else {
+	  _frames_per_hour = (long)(3600 * rint(smpte_frames_per_second()) * _frames_per_smpte_frame);
+	}
+	_smpte_frames_per_hour = (nframes_t)rint(smpte_frames_per_second() * 3600.0);
+
+}
+
+int
+Session::set_smpte_format (SmpteFormat format)
+{
+
+	Config->set_smpte_format (format);
+
+	last_smpte_valid = false;
+	// smpte type bits are the middle two in the upper nibble
+	switch ((int) ceil (smpte_frames_per_second())) {
+	case 24:
+		mtc_smpte_bits = 0;
 		break;
-	case MIDI::MTC_30_FPS_DROP:
-		if ((smpte.minutes % 10) && (smpte.seconds == 0)) {
-			smpte.frames = 2;
+
+	case 25:
+		mtc_smpte_bits = 0x20;
+		break;
+
+	case 30:
+	default:
+		if (smpte_drop_frames()) {
+			mtc_smpte_bits = 0x40;
 		} else {
-			smpte.frames = 0;
+			mtc_smpte_bits =  0x60;
 		}
 		break;
-	}
-  
-	if (SMPTE_IS_ZERO(smpte)) {
-		smpte.negative = false;
-	}
-}
-
+	};
 
-// Go to next whole minute (seconds == 0, frames == 0 or frames == 2)
-smpte_wrap_t
-Session::smpte_increment_minutes( SMPTE_Time& smpte ) const
-{
-	smpte_wrap_t wrap = smpte_wrap_none;
-  
-	// Clear subframes
-	smpte_frames_floor( smpte );
-  
-	if (smpte.negative) {
-		// Wrap if on minute boundary
-		wrap = smpte_increment_seconds( smpte );
-		// Go to lowest possible value in this minute
-		smpte_minutes_floor( smpte );
-	} else {
-		// Go to highest possible second
-		smpte.seconds = 59;
-		// Wrap minute by incrementing second
-		wrap = smpte_increment_seconds( smpte );
-	}
-  
-	return wrap;
+	return 0;
 }
 
-// Go to lowest absolute value in this minute
 void
-Session::smpte_minutes_floor( SMPTE_Time& smpte ) const
+Session::set_smpte_offset (nframes_t off)
 {
-	// Go to lowest possible second
-	smpte.seconds = 0;
-	// Go to lowest possible frame
-	smpte_seconds_floor( smpte );
-
-	if (SMPTE_IS_ZERO(smpte)) {
-		smpte.negative = false;
-	}
-}
+	_smpte_offset = off;
+	last_smpte_valid = false;
 
-// Go to next whole hour (minute = 0, second = 0, frame = 0)
-smpte_wrap_t
-Session::smpte_increment_hours( SMPTE_Time& smpte ) const
-{
-	smpte_wrap_t wrap = smpte_wrap_none;
-  
-	// Clear subframes
-	smpte_frames_floor(smpte);
-  
-	if (smpte.negative) {
-		// Wrap if on hour boundary
-		wrap = smpte_increment_minutes( smpte );
-		// Go to lowest possible value in this hour
-		smpte_hours_floor( smpte );
-	} else {
-		smpte.minutes = 59;
-		wrap = smpte_increment_minutes( smpte );
-	}
-  
-	return wrap;
+	SMPTEOffsetChanged (); /* EMIT SIGNAL */
 }
 
-// Go to lowest absolute value in this hour
 void
-Session::smpte_hours_floor( SMPTE_Time& smpte ) const
+Session::set_smpte_offset_negative (bool neg)
 {
-	smpte.minutes = 0;
-	smpte.seconds = 0;
-	smpte.frames = 0;
-	smpte.subframes = 0;
-  
-	if (SMPTE_IS_ZERO(smpte)) {
-		smpte.negative = false;
-	}
-}
+	_smpte_offset_negative = neg;
+	last_smpte_valid = false;
 
+	SMPTEOffsetChanged (); /* EMIT SIGNAL */
+}
 
 void
-Session::smpte_to_sample( SMPTE_Time& smpte, jack_nframes_t& sample, bool use_offset, bool use_subframes ) const
+Session::smpte_to_sample( SMPTE::Time& smpte, nframes_t& sample, bool use_offset, bool use_subframes ) const
 {
-	if (smpte_drop_frames) {
+
+	if (smpte.drop) {
 		// The drop frame format was created to better approximate the 30000/1001 = 29.97002997002997....
 		// framerate of NTSC color TV. The used frame rate of drop frame is 29.97, which drifts by about
 		// 0.108 frame per hour, or about 1.3 frames per 12 hours. This is not perfect, but a lot better
@@ -513,22 +251,29 @@ Session::smpte_to_sample( SMPTE_Time& smpte, jack_nframes_t& sample, bool use_of
 		//  0:10:00:00        0.0             0                   600.000         26460000 (accurate)
 		//
 		//  Per Sigmond <per@sigmond.no>
-    
+
 		// Samples inside time dividable by 10 minutes (real time accurate)
-		jack_nframes_t base_samples = ((smpte.hours * 60 * 60) + ((smpte.minutes / 10) * 10 * 60)) * frame_rate();
+		nframes_t base_samples = (nframes_t) (((smpte.hours * 107892) + ((smpte.minutes / 10) * 17982)) * _frames_per_smpte_frame);
+
 		// Samples inside time exceeding the nearest 10 minutes (always offset, see above)
 		long exceeding_df_minutes = smpte.minutes % 10;
 		long exceeding_df_seconds = (exceeding_df_minutes * 60) + smpte.seconds;
 		long exceeding_df_frames = (30 * exceeding_df_seconds) + smpte.frames - (2 * exceeding_df_minutes);
-		jack_nframes_t exceeding_samples = (jack_nframes_t) rint(exceeding_df_frames * _frames_per_smpte_frame);
+		nframes_t exceeding_samples = (nframes_t) rint(exceeding_df_frames * _frames_per_smpte_frame);
 		sample = base_samples + exceeding_samples;
 	} else {
-		// Non drop is easy:
-		sample = (((smpte.hours * 60 * 60) + (smpte.minutes * 60) + smpte.seconds) * frame_rate()) + (jack_nframes_t)rint(smpte.frames * _frames_per_smpte_frame);
+		/* 
+		   Non drop is easy.. just note the use of 
+		   rint(smpte.rate) * _frames_per_smpte_frame
+		   (frames per SMPTE second), which is larger than  
+		   frame_rate() in the non-integer SMPTE rate case.
+		*/
+
+		sample = (nframes_t)rint((((smpte.hours * 60 * 60) + (smpte.minutes * 60) + smpte.seconds) * (rint(smpte.rate) * _frames_per_smpte_frame)) + (smpte.frames * _frames_per_smpte_frame));
 	}
   
 	if (use_subframes) {
-		sample += (long) (((double)smpte.subframes * _frames_per_smpte_frame) / 80.0);
+		sample += (long) (((double)smpte.subframes * _frames_per_smpte_frame) / Config->get_subframes_per_frame());
 	}
   
 	if (use_offset) {
@@ -551,14 +296,15 @@ Session::smpte_to_sample( SMPTE_Time& smpte, jack_nframes_t& sample, bool use_of
 			}
 		}
 	}
+
 }
 
 
 void
-Session::sample_to_smpte( jack_nframes_t sample, SMPTE_Time& smpte, bool use_offset, bool use_subframes ) const
+Session::sample_to_smpte( nframes_t sample, SMPTE::Time& smpte, bool use_offset, bool use_subframes ) const
 {
-	jack_nframes_t offset_sample;
-  
+	nframes_t offset_sample;
+
 	if (!use_offset) {
 		offset_sample = sample;
 		smpte.negative = false;
@@ -585,14 +331,14 @@ Session::sample_to_smpte( jack_nframes_t sample, SMPTE_Time& smpte, bool use_off
 	// high sample numbers in the calculations that follow.
 	smpte.hours = offset_sample / _frames_per_hour;
 	offset_sample = offset_sample % _frames_per_hour;
-  
+
 	// Calculate exact number of (exceeding) smpte frames and fractional frames
 	smpte_frames_left_exact = (double) offset_sample / _frames_per_smpte_frame;
 	smpte_frames_fraction = smpte_frames_left_exact - floor( smpte_frames_left_exact );
-	smpte.subframes = (long) rint(smpte_frames_fraction * 80.0);
+	smpte.subframes = (long) rint(smpte_frames_fraction * Config->get_subframes_per_frame());
   
 	// XXX Not sure if this is necessary anymore...
-	if (smpte.subframes == 80) {
+	if (smpte.subframes == Config->get_subframes_per_frame()) {
 		// This can happen with 24 fps (and 29.97 fps ?)
 		smpte_frames_left_exact = ceil( smpte_frames_left_exact );
 		smpte.subframes = 0;
@@ -601,7 +347,7 @@ Session::sample_to_smpte( jack_nframes_t sample, SMPTE_Time& smpte, bool use_off
 	// Extract hour-exceeding frames for minute, second and frame calculations
 	smpte_frames_left = ((long) floor( smpte_frames_left_exact ));
 
-	if (smpte_drop_frames) {
+	if (smpte_drop_frames()) {
 		// See long explanation in smpte_to_sample()...
 
 		// Number of 10 minute chunks
@@ -637,19 +383,22 @@ Session::sample_to_smpte( jack_nframes_t sample, SMPTE_Time& smpte, bool use_off
 		}
 	} else {
 		// Non drop is easy
-		smpte.minutes = smpte_frames_left / ((long) smpte_frames_per_second * 60);
-		smpte_frames_left = smpte_frames_left % ((long) smpte_frames_per_second * 60);
-		smpte.seconds = smpte_frames_left / (long) smpte_frames_per_second;
-		smpte.frames = smpte_frames_left % (long) smpte_frames_per_second;
+		smpte.minutes = smpte_frames_left / ((long) rint (smpte_frames_per_second ()) * 60);
+		smpte_frames_left = smpte_frames_left % ((long) rint (smpte_frames_per_second ()) * 60);
+		smpte.seconds = smpte_frames_left / (long) rint(smpte_frames_per_second ());
+		smpte.frames = smpte_frames_left % (long) rint(smpte_frames_per_second ());
 	}
 
 	if (!use_subframes) {
 		smpte.subframes = 0;
 	}
+	/* set frame rate and drop frame */
+	smpte.rate = smpte_frames_per_second ();
+	smpte.drop = smpte_drop_frames();
 }
 
 void
-Session::smpte_time (jack_nframes_t when, SMPTE_Time& smpte)
+Session::smpte_time (nframes_t when, SMPTE::Time& smpte)
 {
 	if (last_smpte_valid && when == last_smpte_when) {
 		smpte = last_smpte;
@@ -664,7 +413,7 @@ Session::smpte_time (jack_nframes_t when, SMPTE_Time& smpte)
 }
 
 void
-Session::smpte_time_subframes (jack_nframes_t when, SMPTE_Time& smpte)
+Session::smpte_time_subframes (nframes_t when, SMPTE::Time& smpte)
 {
 	if (last_smpte_valid && when == last_smpte_when) {
 		smpte = last_smpte;
@@ -679,22 +428,22 @@ Session::smpte_time_subframes (jack_nframes_t when, SMPTE_Time& smpte)
 }
 
 void
-Session::smpte_duration (jack_nframes_t when, SMPTE_Time& smpte) const
+Session::smpte_duration (nframes_t when, SMPTE::Time& smpte) const
 {
 	sample_to_smpte( when, smpte, false /* use_offset */, true /* use_subframes */ );
 }
 
 void
-Session::smpte_duration_string (char* buf, jack_nframes_t when) const
+Session::smpte_duration_string (char* buf, nframes_t when) const
 {
-	SMPTE_Time smpte;
+	SMPTE::Time smpte;
 
 	smpte_duration (when, smpte);
-	snprintf (buf, sizeof (buf), "%02ld:%02ld:%02ld:%02ld", smpte.hours, smpte.minutes, smpte.seconds, smpte.frames);
+	snprintf (buf, sizeof (buf), "%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32, smpte.hours, smpte.minutes, smpte.seconds, smpte.frames);
 }
 
 void
-Session::smpte_time (SMPTE_Time &t)
+Session::smpte_time (SMPTE::Time &t)
 
 {
 	smpte_time (_transport_frame, t);
@@ -742,7 +491,7 @@ Session::jack_sync_callback (jack_transport_state_t state,
 
 void
 Session::jack_timebase_callback (jack_transport_state_t state,
-				 jack_nframes_t nframes,
+				 nframes_t nframes,
 				 jack_position_t* pos,
 				 int new_position)
 {
@@ -774,15 +523,21 @@ Session::jack_timebase_callback (jack_transport_state_t state,
 		pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT);
 	}
 
+#ifdef HAVE_JACK_VIDEO_SUPPORT
+	//poke audio video ratio so Ardour can track Video Sync
+	pos->audio_frames_per_video_frame = frame_rate() / smpte_frames_per_second();
+	pos->valid = jack_position_bits_t (pos->valid | JackAudioVideoRatio);
+#endif
+
 #if 0
 	/* SMPTE info */
 
 	t.smpte_offset = _smpte_offset;
-	t.smpte_frame_rate = smpte_frames_per_second;
+	t.smpte_frame_rate = smpte_frames_per_second();
 
 	if (_transport_speed) {
 
-		if (auto_loop) {
+		if (play_loop) {
 
 			Location* location = _locations.auto_loop_location();
 
@@ -814,8 +569,8 @@ Session::jack_timebase_callback (jack_transport_state_t state,
 #endif		
 }
 
-jack_nframes_t
-Session::convert_to_frames_at (jack_nframes_t position, AnyTime& any)
+nframes_t
+Session::convert_to_frames_at (nframes_t position, AnyTime& any)
 {
 	double secs;
 	
@@ -829,19 +584,19 @@ Session::convert_to_frames_at (jack_nframes_t position, AnyTime& any)
 		secs = any.smpte.hours * 60 * 60;
 		secs += any.smpte.minutes * 60;
 		secs += any.smpte.seconds;
-		secs += any.smpte.frames / smpte_frames_per_second;
+		secs += any.smpte.frames / smpte_frames_per_second();
 		if (_smpte_offset_negative) 
 		{
-			return (jack_nframes_t) floor (secs * frame_rate()) - _smpte_offset;
+			return (nframes_t) floor (secs * frame_rate()) - _smpte_offset;
 		}
 		else
 		{
-			return (jack_nframes_t) floor (secs * frame_rate()) + _smpte_offset;
+			return (nframes_t) floor (secs * frame_rate()) + _smpte_offset;
 		}
 		break;
 
 	case AnyTime::Seconds:
-		return (jack_nframes_t) floor (any.seconds * frame_rate());
+		return (nframes_t) floor (any.seconds * frame_rate());
 		break;
 
 	case AnyTime::Frames: