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

diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index e3badc5b11..eef05e879a 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -1,6 +1,6 @@
 
 /*
-  Copyright (C) 1999-2002 Paul Davis 
+  Copyright (C) 1999-2002 Paul Davis
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -16,465 +16,181 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-  $Id$
 */
 
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 #include <iostream>
 #include <cmath>
 #include <unistd.h>
 
-#include <ardour/timestamps.h>
+#include "ardour/timestamps.h"
 
-#include <pbd/error.h>
+#include "pbd/error.h"
+#include "pbd/enumwriter.h"
+#include "pbd/stacktrace.h"
 
-#include <ardour/ardour.h>
-#include <ardour/configuration.h>
-#include <ardour/audioengine.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
+#include "ardour/ardour.h"
+#include "ardour/configuration.h"
+#include "ardour/audioengine.h"
+#include "ardour/session.h"
+#include "ardour/tempo.h"
 
 #include "i18n.h"
 
+using namespace std;
 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 (framepos_t when, Timecode::BBT_Time& bbt)
 {
 	_tempo_map->bbt_time (when, bbt);
 }
 
-/* SMPTE TIME */
-
-int
-Session::set_smpte_type (float fps, bool drop_frames)
+/* Timecode TIME */
+float
+Session::timecode_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_timecode_format()) {
+		case timecode_23976:
+			return 23.976;
 
-	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;
+			break;
+		case timecode_24:
+			return 24;
 
-	case 25:
-		mtc_smpte_bits = 0x20;
-		break;
+			break;
+		case timecode_24976:
+			return 24.976;
 
-	case 30:
-	default:
-		if (drop_frames) {
-			mtc_smpte_bits = 0x40;
-		} else {
-			mtc_smpte_bits =  0x60;
-		}
-		break;
-	};
+			break;
+		case timecode_25:
+			return 25;
 
-	SMPTETypeChanged (); /* EMIT SIGNAL */
+			break;
+		case timecode_2997:
+			return 29.97;
 
-	set_dirty();
+			break;
+		case timecode_2997drop:
+			return 29.97;
 
-	return 0;
-}
+			break;
+		case timecode_30:
+			return 30;
 
-void
-Session::set_smpte_offset (jack_nframes_t off)
-{
-	_smpte_offset = off;
-	last_smpte_valid = false;
-	SMPTEOffsetChanged (); /* EMIT SIGNAL */
-}
+			break;
+		case timecode_30drop:
+			return 30;
 
-void
-Session::set_smpte_offset_negative (bool neg)
-{
-	_smpte_offset_negative = neg;
-	last_smpte_valid = false;
-	SMPTEOffsetChanged (); /* EMIT SIGNAL */
-}
+			break;
+		case timecode_5994:
+			return 59.94;
 
-#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 timecode_60:
+			return 60;
 
-// 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;
-
-	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 timecode 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::timecode_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_timecode_format()) {
+		case timecode_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 timecode_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 timecode_24976:
+			return false;
 
+			break;
+		case timecode_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 timecode_2997:
+			return false;
 
+			break;
+		case timecode_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 timecode_30:
+			return false;
+
 			break;
-		case MIDI::MTC_30_FPS_DROP:
-		case MIDI::MTC_30_FPS:
-			smpte.frames = 29;
+		case timecode_30drop:
+			return true;
+
 			break;
-		}
-    
-		// Increment by one frame
-		wrap = smpte_increment( smpte );
-	}
-  
-	return wrap;
-}
+		case timecode_5994:
+			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
-{
-	// 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;
-		break;
-	case MIDI::MTC_30_FPS_DROP:
-		if ((smpte.minutes % 10) && (smpte.seconds == 0)) {
-			smpte.frames = 2;
-		} else {
-			smpte.frames = 0;
-		}
-		break;
-	}
-  
-	if (SMPTE_IS_ZERO(smpte)) {
-		smpte.negative = false;
-	}
-}
+			break;
+		case timecode_60:
+			return false;
 
+			break;
+	        default:
+			error << "Editor received unexpected timecode type" << endmsg;
+	}
 
-// Go to next whole minute (seconds == 0, frames == 0 or frames == 2)
-smpte_wrap_t
-Session::smpte_increment_minutes( SMPTE_Time& smpte ) const
+	return false;
+}
+void
+Session::sync_time_vars ()
 {
-	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 );
+	_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();
+	if (timecode_drop_frames()) {
+	  _frames_per_hour = (int32_t)(107892 * _frames_per_timecode_frame);
 	} else {
-		// Go to highest possible second
-		smpte.seconds = 59;
-		// Wrap minute by incrementing second
-		wrap = smpte_increment_seconds( smpte );
+	  _frames_per_hour = (int32_t)(3600 * rint(timecode_frames_per_second()) * _frames_per_timecode_frame);
 	}
-  
-	return wrap;
-}
+	_timecode_frames_per_hour = rint(timecode_frames_per_second() * 3600.0);
 
-// Go to lowest absolute value in this minute
-void
-Session::smpte_minutes_floor( SMPTE_Time& smpte ) const
-{
-	// Go to lowest possible second
-	smpte.seconds = 0;
-	// Go to lowest possible frame
-	smpte_seconds_floor( smpte );
+	last_timecode_valid = false;
+	// timecode type bits are the middle two in the upper nibble
+	switch ((int) ceil (timecode_frames_per_second())) {
+	case 24:
+		mtc_timecode_bits = 0;
+		break;
 
-	if (SMPTE_IS_ZERO(smpte)) {
-		smpte.negative = false;
-	}
-}
+	case 25:
+		mtc_timecode_bits = 0x20;
+		break;
 
-// 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;
+	case 30:
+	default:
+		if (timecode_drop_frames()) {
+			mtc_timecode_bits = 0x40;
+		} else {
+			mtc_timecode_bits =  0x60;
+		}
+		break;
+	};
 }
 
-// Go to lowest absolute value in this hour
 void
-Session::smpte_hours_floor( SMPTE_Time& smpte ) const
+Session::timecode_to_sample( Timecode::Time& timecode, framepos_t& sample, bool use_offset, bool use_subframes ) const
 {
-	smpte.minutes = 0;
-	smpte.seconds = 0;
-	smpte.frames = 0;
-	smpte.subframes = 0;
-  
-	if (SMPTE_IS_ZERO(smpte)) {
-		smpte.negative = false;
-	}
-}
-
 
-void
-Session::smpte_to_sample( SMPTE_Time& smpte, jack_nframes_t& sample, bool use_offset, bool use_subframes ) const
-{
-	if (smpte_drop_frames) {
+	if (timecode.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
@@ -486,10 +202,10 @@ Session::smpte_to_sample( SMPTE_Time& smpte, jack_nframes_t& sample, bool use_of
 		// approx. 0.2 frames too early. This adds up with 0.2 too early for each minute until we are 1.8
 		// frames too early at 0:9:0:2 (9 * 0.2 = 1.8). The 10th minute brings us 1.8 frames later again
 		// (at end of 0:9:59:29), which sums up to 0 (we are back to zero at 0:10:0:0 :-).
-		// 
+		//
 		// In table form:
-		// 
-		// SMPTE value    frames offset   subframes offset   seconds (rounded)  44100 sample (rounded)
+		//
+		// Timecode value    frames offset   subframes offset   seconds (rounded)  44100 sample (rounded)
 		//  0:00:00:00        0.0             0                     0.000                0 (accurate)
 		//  0:00:59:29        1.8           144                    60.027          2647177
 		//  0:01:00:02       -0.2           -16                    60.060          2648648
@@ -513,191 +229,202 @@ 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();
+		framecnt_t base_samples = (framecnt_t) (((timecode.hours * 107892) + ((timecode.minutes / 10) * 17982)) * _frames_per_timecode_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);
+		int32_t exceeding_df_minutes = timecode.minutes % 10;
+		int32_t exceeding_df_seconds = (exceeding_df_minutes * 60) + timecode.seconds;
+		int32_t exceeding_df_frames = (30 * exceeding_df_seconds) + timecode.frames - (2 * exceeding_df_minutes);
+		framecnt_t exceeding_samples = (framecnt_t) rint(exceeding_df_frames * _frames_per_timecode_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(timecode.rate) * _frames_per_timecode_frame
+		   (frames per Timecode second), which is larger than
+		   frame_rate() in the non-integer Timecode rate case.
+		*/
+
+		sample = (framecnt_t)rint((((timecode.hours * 60 * 60) + (timecode.minutes * 60) + timecode.seconds) * (rint(timecode.rate) * _frames_per_timecode_frame)) + (timecode.frames * _frames_per_timecode_frame));
 	}
-  
+
 	if (use_subframes) {
-		sample += (long) (((double)smpte.subframes * _frames_per_smpte_frame) / 80.0);
+		sample += (int32_t) (((double)timecode.subframes * _frames_per_timecode_frame) / config.get_subframes_per_frame());
 	}
-  
+
 	if (use_offset) {
-		if (smpte_offset_negative()) {
-			if (sample >= smpte_offset()) {
-				sample -= smpte_offset();
+		if (config.get_timecode_offset_negative()) {
+			if (sample >= config.get_timecode_offset()) {
+				sample -= config.get_timecode_offset();
 			} else {
 				/* Prevent song-time from becoming negative */
 				sample = 0;
 			}
 		} else {
-			if (smpte.negative) {
-				if (sample <= smpte_offset()) {
-					sample = smpte_offset() - sample;
+			if (timecode.negative) {
+				if (sample <= config.get_timecode_offset()) {
+					sample = config.get_timecode_offset() - sample;
 				} else {
 					sample = 0;
 				}
 			} else {
-				sample += smpte_offset();
+				sample += config.get_timecode_offset();
 			}
 		}
 	}
+
 }
 
 
 void
-Session::sample_to_smpte( jack_nframes_t sample, SMPTE_Time& smpte, bool use_offset, bool use_subframes ) const
+Session::sample_to_timecode (framepos_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes ) const
 {
-	jack_nframes_t offset_sample;
-  
+	framepos_t offset_sample;
+
 	if (!use_offset) {
 		offset_sample = sample;
-		smpte.negative = false;
+		timecode.negative = false;
 	} else {
-		if (_smpte_offset_negative) {
-			offset_sample =  sample + _smpte_offset;
-			smpte.negative = false;
+		if (config.get_timecode_offset_negative()) {
+			offset_sample = sample + config.get_timecode_offset ();
+			timecode.negative = false;
 		} else {
-			if (sample < _smpte_offset) {
-				offset_sample = (_smpte_offset - sample);
-				smpte.negative = true;
+			if (sample < config.get_timecode_offset()) {
+				offset_sample = (config.get_timecode_offset() - sample);
+				timecode.negative = true;
 			} else {
-				offset_sample =  sample - _smpte_offset;
-				smpte.negative = false;
+				offset_sample =  sample - config.get_timecode_offset();
+				timecode.negative = false;
 			}
 		}
 	}
-  
-	double smpte_frames_left_exact;
-	double smpte_frames_fraction;
-	unsigned long smpte_frames_left;
-  
+
+	double timecode_frames_left_exact;
+	double timecode_frames_fraction;
+	uint32_t timecode_frames_left;
+
 	// Extract whole hours. Do this to prevent rounding errors with
 	// high sample numbers in the calculations that follow.
-	smpte.hours = offset_sample / _frames_per_hour;
+	timecode.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);
-  
+
+	// Calculate exact number of (exceeding) timecode frames and fractional frames
+	timecode_frames_left_exact = (double) offset_sample / _frames_per_timecode_frame;
+	timecode_frames_fraction = timecode_frames_left_exact - floor( timecode_frames_left_exact );
+	timecode.subframes = (int32_t) rint(timecode_frames_fraction * config.get_subframes_per_frame());
+
 	// XXX Not sure if this is necessary anymore...
-	if (smpte.subframes == 80) {
+	if (timecode.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;
+		timecode_frames_left_exact = ceil( timecode_frames_left_exact );
+		timecode.subframes = 0;
 	}
 
 	// Extract hour-exceeding frames for minute, second and frame calculations
-	smpte_frames_left = ((long) floor( smpte_frames_left_exact ));
+	timecode_frames_left = (uint32_t) floor (timecode_frames_left_exact);
 
-	if (smpte_drop_frames) {
-		// See long explanation in smpte_to_sample()...
+	if (timecode_drop_frames()) {
+		// See int32_t explanation in timecode_to_sample()...
 
 		// Number of 10 minute chunks
-		smpte.minutes = (smpte_frames_left / 17982) * 10; // exactly 17982 frames in 10 minutes
+		timecode.minutes = (timecode_frames_left / 17982) * 10; // exactly 17982 frames in 10 minutes
 		// frames exceeding the nearest 10 minute barrier
-		long exceeding_df_frames = smpte_frames_left % 17982;
+		int32_t exceeding_df_frames = timecode_frames_left % 17982;
 
 		// Find minutes exceeding the nearest 10 minute barrier
 		if (exceeding_df_frames >= 1800) { // nothing to do if we are inside the first minute (0-1799)
 			exceeding_df_frames -= 1800; // take away first minute (different number of frames than the others)
-			long extra_minutes_minus_1 = exceeding_df_frames / 1798; // how many minutes after the first one
+			int32_t extra_minutes_minus_1 = exceeding_df_frames / 1798; // how many minutes after the first one
 			exceeding_df_frames -= extra_minutes_minus_1 * 1798; // take away the (extra) minutes just found
-			smpte.minutes += extra_minutes_minus_1 + 1; // update with exceeding minutes
+			timecode.minutes += extra_minutes_minus_1 + 1; // update with exceeding minutes
 		}
-    
+
 		// Adjust frame numbering for dropped frames (frame 0 and 1 skipped at start of every minute except every 10th)
-		if (smpte.minutes % 10) {
+		if (timecode.minutes % 10) {
 			// Every minute except every 10th
 			if (exceeding_df_frames < 28) {
 				// First second, frames 0 and 1 are skipped
-				smpte.seconds = 0;
-				smpte.frames = exceeding_df_frames + 2;
+				timecode.seconds = 0;
+				timecode.frames = exceeding_df_frames + 2;
 			} else {
 				// All other seconds, all 30 frames are counted
 				exceeding_df_frames -= 28;
-				smpte.seconds = (exceeding_df_frames / 30) + 1;
-				smpte.frames = exceeding_df_frames % 30;
+				timecode.seconds = (exceeding_df_frames / 30) + 1;
+				timecode.frames = exceeding_df_frames % 30;
 			}
 		} else {
 			// Every 10th minute, all 30 frames counted in all seconds
-			smpte.seconds = exceeding_df_frames / 30;
-			smpte.frames = exceeding_df_frames % 30;
+			timecode.seconds = exceeding_df_frames / 30;
+			timecode.frames = exceeding_df_frames % 30;
 		}
 	} 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;
+		timecode.minutes = timecode_frames_left / ((int32_t) rint (timecode_frames_per_second ()) * 60);
+		timecode_frames_left = timecode_frames_left % ((int32_t) rint (timecode_frames_per_second ()) * 60);
+		timecode.seconds = timecode_frames_left / (int32_t) rint(timecode_frames_per_second ());
+		timecode.frames = timecode_frames_left % (int32_t) rint(timecode_frames_per_second ());
 	}
 
 	if (!use_subframes) {
-		smpte.subframes = 0;
+		timecode.subframes = 0;
 	}
+	/* set frame rate and drop frame */
+	timecode.rate = timecode_frames_per_second ();
+	timecode.drop = timecode_drop_frames();
 }
 
 void
-Session::smpte_time (jack_nframes_t when, SMPTE_Time& smpte)
+Session::timecode_time (framepos_t when, Timecode::Time& timecode)
 {
-	if (last_smpte_valid && when == last_smpte_when) {
-		smpte = last_smpte;
+	if (last_timecode_valid && when == last_timecode_when) {
+		timecode = last_timecode;
 		return;
 	}
 
-	sample_to_smpte( when, smpte, true /* use_offset */, false /* use_subframes */ );
+	sample_to_timecode( when, timecode, true /* use_offset */, false /* use_subframes */ );
 
-	last_smpte_when = when;
-	last_smpte = smpte;
-	last_smpte_valid = true;
+	last_timecode_when = when;
+	last_timecode = timecode;
+	last_timecode_valid = true;
 }
 
 void
-Session::smpte_time_subframes (jack_nframes_t when, SMPTE_Time& smpte)
+Session::timecode_time_subframes (framepos_t when, Timecode::Time& timecode)
 {
-	if (last_smpte_valid && when == last_smpte_when) {
-		smpte = last_smpte;
+	if (last_timecode_valid && when == last_timecode_when) {
+		timecode = last_timecode;
 		return;
 	}
-  
-	sample_to_smpte( when, smpte, true /* use_offset */, true /* use_subframes */ );
 
-	last_smpte_when = when;
-	last_smpte = smpte;
-	last_smpte_valid = true;
+	sample_to_timecode( when, timecode, true /* use_offset */, true /* use_subframes */ );
+
+	last_timecode_when = when;
+	last_timecode = timecode;
+	last_timecode_valid = true;
 }
 
 void
-Session::smpte_duration (jack_nframes_t when, SMPTE_Time& smpte) const
+Session::timecode_duration (framecnt_t when, Timecode::Time& timecode) const
 {
-	sample_to_smpte( when, smpte, false /* use_offset */, true /* use_subframes */ );
+	sample_to_timecode( when, timecode, false /* use_offset */, true /* use_subframes */ );
 }
 
 void
-Session::smpte_duration_string (char* buf, jack_nframes_t when) const
+Session::timecode_duration_string (char* buf, framepos_t when) const
 {
-	SMPTE_Time smpte;
+	Timecode::Time timecode;
 
-	smpte_duration (when, smpte);
-	snprintf (buf, sizeof (buf), "%02ld:%02ld:%02ld:%02ld", smpte.hours, smpte.minutes, smpte.seconds, smpte.frames);
+	timecode_duration (when, timecode);
+	snprintf (buf, sizeof (buf), "%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32, timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
 }
 
 void
-Session::smpte_time (SMPTE_Time &t)
+Session::timecode_time (Timecode::Time &t)
 
 {
-	smpte_time (_transport_frame, t);
+	timecode_time (_transport_frame, t);
 }
 
 int
@@ -708,18 +435,18 @@ Session::jack_sync_callback (jack_transport_state_t state,
 
 	switch (state) {
 	case JackTransportStopped:
-		if (slave && _transport_frame != pos->frame && post_transport_work == 0) {
-		 	request_locate (pos->frame, false);
+		if (slave && _transport_frame != pos->frame && post_transport_work() == 0) {
+			request_locate (pos->frame, false);
 			// cerr << "SYNC: stopped, locate to " << pos->frame << " from " << _transport_frame << endl;
 			return false;
 		} else {
 			return true;
 		}
-		
+
 	case JackTransportStarting:
-		// cerr << "SYNC: starting @ " << pos->frame << " a@ " << _transport_frame << " our work = " <<  post_transport_work << " pos matches ? " << (_transport_frame == pos->frame) << endl;
+		// cerr << "SYNC: starting @ " << pos->frame << " a@ " << _transport_frame << " our work = " <<  post_transport_work() << " pos matches ? " << (_transport_frame == pos->frame) << endl;
 		if (slave) {
-			return _transport_frame == pos->frame && post_transport_work == 0;
+			return _transport_frame == pos->frame && post_transport_work() == 0;
 		} else {
 			return true;
 		}
@@ -735,54 +462,66 @@ Session::jack_sync_callback (jack_transport_state_t state,
 	default:
 		error << string_compose (_("Unknown JACK transport state %1 in sync callback"), state)
 		      << endmsg;
-	} 
+	}
 
 	return true;
 }
 
 void
-Session::jack_timebase_callback (jack_transport_state_t state,
-				 jack_nframes_t nframes,
+Session::jack_timebase_callback (jack_transport_state_t /*state*/,
+				 pframes_t /*nframes*/,
 				 jack_position_t* pos,
-				 int new_position)
+				 int /*new_position*/)
 {
-	BBT_Time bbt;
-
-	/* frame info */
+	Timecode::BBT_Time bbt;
 
-	pos->frame = _transport_frame;
-	pos->valid = JackPositionTimecode;
+	if (pos->frame != _transport_frame) {
+		cerr << "ARDOUR says " << _transport_frame << " JACK says " << pos->frame << endl;
+	}
 
 	/* BBT info */
-	
-	if (_tempo_map) {
-
-		TempoMap::Metric metric (_tempo_map->metric_at (_transport_frame));
-		_tempo_map->bbt_time_with_metric (_transport_frame, bbt, metric);
-		
-		pos->bar = bbt.bars;
-		pos->beat = bbt.beats;
-		pos->tick = bbt.ticks;
 
-		// XXX still need to set bar_start_tick
-
-		pos->beats_per_bar = metric.meter().beats_per_bar();
-		pos->beat_type = metric.meter().note_divisor();
-		pos->ticks_per_beat = Meter::ticks_per_beat;
-		pos->beats_per_minute = metric.tempo().beats_per_minute();
+	if (_tempo_map) {
 
-		pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT);
+		TempoMetric metric (_tempo_map->metric_at (_transport_frame));
+
+		try {
+			_tempo_map->bbt_time_rt (_transport_frame, bbt);
+
+			pos->bar = bbt.bars;
+			pos->beat = bbt.beats;
+			pos->tick = bbt.ticks;
+			
+			// XXX still need to set bar_start_tick
+			
+			pos->beats_per_bar = metric.meter().divisions_per_bar();
+			pos->beat_type = metric.meter().note_divisor();
+			pos->ticks_per_beat = Timecode::BBT_Time::ticks_per_beat;
+			pos->beats_per_minute = metric.tempo().beats_per_minute();
+			
+			pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT);
+
+		} catch (...) {
+			/* no message */
+		}
 	}
 
+#ifdef HAVE_JACK_VIDEO_SUPPORT
+	//poke audio video ratio so Ardour can track Video Sync
+	pos->audio_frames_per_video_frame = frame_rate() / timecode_frames_per_second();
+	pos->valid = jack_position_bits_t (pos->valid | JackAudioVideoRatio);
+#endif
+
 #if 0
-	/* SMPTE info */
+	/* Timecode info */
 
-	t.smpte_offset = _smpte_offset;
-	t.smpte_frame_rate = smpte_frames_per_second;
+	pos->timecode_offset = config.get_timecode_offset();
+	t.timecode_frame_rate = timecode_frames_per_second();
+	pos->valid = jack_position_bits_t (pos->valid | JackPositionTimecode;
 
 	if (_transport_speed) {
 
-		if (auto_loop) {
+		if (play_loop) {
 
 			Location* location = _locations.auto_loop_location();
 
@@ -809,45 +548,76 @@ Session::jack_timebase_callback (jack_transport_state_t state,
 
 		}
 
-	} 
-
-#endif		
+	}
+#endif
 }
 
-jack_nframes_t
-Session::convert_to_frames_at (jack_nframes_t position, AnyTime& any)
+ARDOUR::framecnt_t
+Session::convert_to_frames (AnyTime const & position)
 {
 	double secs;
-	
-	switch (any.type) {
+
+	switch (position.type) {
 	case AnyTime::BBT:
-		return _tempo_map->frame_time ( any.bbt);
+		return _tempo_map->frame_time (position.bbt);
 		break;
 
-	case AnyTime::SMPTE:
+	case AnyTime::Timecode:
 		/* XXX need to handle negative values */
-		secs = any.smpte.hours * 60 * 60;
-		secs += any.smpte.minutes * 60;
-		secs += any.smpte.seconds;
-		secs += any.smpte.frames / smpte_frames_per_second;
-		if (_smpte_offset_negative) 
-		{
-			return (jack_nframes_t) floor (secs * frame_rate()) - _smpte_offset;
+		secs = position.timecode.hours * 60 * 60;
+		secs += position.timecode.minutes * 60;
+		secs += position.timecode.seconds;
+		secs += position.timecode.frames / timecode_frames_per_second();
+		if (config.get_timecode_offset_negative()) {
+			return (framecnt_t) floor (secs * frame_rate()) - config.get_timecode_offset();
+		} else {
+			return (framecnt_t) floor (secs * frame_rate()) + config.get_timecode_offset();
 		}
-		else
-		{
-			return (jack_nframes_t) floor (secs * frame_rate()) + _smpte_offset;
+		break;
+
+	case AnyTime::Seconds:
+		return (framecnt_t) floor (position.seconds * frame_rate());
+		break;
+
+	case AnyTime::Frames:
+		return position.frames;
+		break;
+	}
+
+	return position.frames;
+}
+
+ARDOUR::framecnt_t
+Session::any_duration_to_frames (framepos_t position, AnyTime const & duration)
+{
+	double secs;
+
+	switch (duration.type) {
+	case AnyTime::BBT:
+		return (framecnt_t) ( _tempo_map->framepos_plus_bbt (position, duration.bbt) - position);
+		break;
+
+	case AnyTime::Timecode:
+		/* XXX need to handle negative values */
+		secs = duration.timecode.hours * 60 * 60;
+		secs += duration.timecode.minutes * 60;
+		secs += duration.timecode.seconds;
+		secs += duration.timecode.frames / timecode_frames_per_second();
+		if (config.get_timecode_offset_negative()) {
+			return (framecnt_t) floor (secs * frame_rate()) - config.get_timecode_offset();
+		} else {
+			return (framecnt_t) floor (secs * frame_rate()) + config.get_timecode_offset();
 		}
 		break;
 
 	case AnyTime::Seconds:
-		return (jack_nframes_t) floor (any.seconds * frame_rate());
+                return (framecnt_t) floor (duration.seconds * frame_rate());
 		break;
 
 	case AnyTime::Frames:
-		return any.frames;
+		return duration.frames;
 		break;
 	}
 
-	return any.frames;
+	return duration.frames;
 }