possibly fix deadlocking issues with tempo map by rearranging code and adding RT...
[ardour.git] / libs / ardour / session_time.cc
index abe4f506963bed0544eafda392f54cc768b1b043..38eb0b4b28859005a5f42f9a440e136169db7a1d 100644 (file)
@@ -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
   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/stacktrace.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 PBD;
 
 /* BBT TIME*/
 
 void
-Session::bbt_time (nframes_t when, BBT_Time& bbt)
+Session::bbt_time (framepos_t when, Timecode::BBT_Time& bbt)
 {
        _tempo_map->bbt_time (when, bbt);
 }
 
-/* SMPTE TIME */
-
-void
-Session::sync_time_vars ()
+/* Timecode TIME */
+float
+Session::timecode_frames_per_second() const
 {
-       _current_frame_rate = (nframes_t) round (_base_frame_rate * (1.0 + (Config->get_video_pullup()/100.0)));
-       _frames_per_hour = _current_frame_rate * 3600;
-       _frames_per_smpte_frame = (double) _current_frame_rate / (double) Config->get_smpte_frames_per_second();
-       _smpte_frames_per_hour = (unsigned long) (Config->get_smpte_frames_per_second() * 3600.0);
+       switch (config.get_timecode_format()) {
+               case timecode_23976:
+                       return 23.976;
+
+                       break;
+               case timecode_24:
+                       return 24;
+
+                       break;
+               case timecode_24976:
+                       return 24.976;
+
+                       break;
+               case timecode_25:
+                       return 25;
+
+                       break;
+               case timecode_2997:
+                       return 29.97;
+
+                       break;
+               case timecode_2997drop:
+                       return 29.97;
+
+                       break;
+               case timecode_30:
+                       return 30;
+
+                       break;
+               case timecode_30drop:
+                       return 30;
+
+                       break;
+               case timecode_5994:
+                       return 59.94;
+
+                       break;
+               case timecode_60:
+                       return 60;
+
+                       break;
+               default:
+                 cerr << "Editor received unexpected timecode type" << endl;
+       }
+       return 30.0;
 }
+bool
+Session::timecode_drop_frames() const
+{
+       switch (config.get_timecode_format()) {
+               case timecode_23976:
+                       return false;
 
-int
-Session::set_smpte_type (float fps, bool drop_frames)
+                       break;
+               case timecode_24:
+                       return false;
+
+                       break;
+               case timecode_24976:
+                       return false;
+
+                       break;
+               case timecode_25:
+                       return false;
+
+                       break;
+               case timecode_2997:
+                       return false;
+
+                       break;
+               case timecode_2997drop:
+                       return true;
+
+                       break;
+               case timecode_30:
+                       return false;
+
+                       break;
+               case timecode_30drop:
+                       return true;
+
+                       break;
+               case timecode_5994:
+                       return false;
+
+                       break;
+               case timecode_60:
+                       return false;
+
+                       break;
+               default:
+                       error << "Editor received unexpected timecode type" << endmsg;
+       }
+
+       return false;
+}
+void
+Session::sync_time_vars ()
 {
-       Config->set_smpte_frames_per_second (fps);
-       Config->set_smpte_drop_frames (drop_frames);
+       _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 {
+         _frames_per_hour = (int32_t)(3600 * rint(timecode_frames_per_second()) * _frames_per_timecode_frame);
+       }
+       _timecode_frames_per_hour = rint(timecode_frames_per_second() * 3600.0);
 
-       last_smpte_valid = false;
-       // smpte type bits are the middle two in the upper nibble
-       switch ((int) ceil (fps)) {
+       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_smpte_bits = 0;
+               mtc_timecode_bits = 0;
                break;
 
        case 25:
-               mtc_smpte_bits = 0x20;
+               mtc_timecode_bits = 0x20;
                break;
 
        case 30:
        default:
-               if (drop_frames) {
-                       mtc_smpte_bits = 0x40;
+               if (timecode_drop_frames()) {
+                       mtc_timecode_bits = 0x40;
                } else {
-                       mtc_smpte_bits =  0x60;
+                       mtc_timecode_bits =  0x60;
                }
                break;
        };
-
-       return 0;
-}
-
-void
-Session::set_smpte_offset (nframes_t off)
-{
-       _smpte_offset = off;
-       last_smpte_valid = false;
-
-       SMPTEOffsetChanged (); /* EMIT SIGNAL */
 }
 
 void
-Session::set_smpte_offset_negative (bool neg)
+Session::timecode_to_sample( Timecode::Time& timecode, framepos_t& sample, bool use_offset, bool use_subframes ) const
 {
-       _smpte_offset_negative = neg;
-       last_smpte_valid = false;
 
-       SMPTEOffsetChanged (); /* EMIT SIGNAL */
-}
-
-void
-Session::smpte_to_sample( SMPTE::Time& smpte, nframes_t& sample, bool use_offset, bool use_subframes ) const
-{
-       if (Config->get_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
@@ -121,10 +202,10 @@ Session::smpte_to_sample( SMPTE::Time& smpte, nframes_t& sample, bool use_offset
                // 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
@@ -148,191 +229,202 @@ Session::smpte_to_sample( SMPTE::Time& smpte, nframes_t& sample, bool use_offset
                //  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)
-               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);
-               nframes_t exceeding_samples = (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()) + (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( 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
 {
-       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 (Config->get_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) Config->get_smpte_frames_per_second () * 60);
-               smpte_frames_left = smpte_frames_left % ((long) Config->get_smpte_frames_per_second () * 60);
-               smpte.seconds = smpte_frames_left / (long) Config->get_smpte_frames_per_second ();
-               smpte.frames = smpte_frames_left % (long) Config->get_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 (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 (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 (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, 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), "%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32, 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
@@ -343,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;
                }
@@ -370,56 +462,62 @@ 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,
-                                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;
+       Timecode::BBT_Time bbt;
 
-       /* frame info */
-
-       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_bar_division;
+                       pos->beats_per_minute = metric.tempo().beats_per_minute();
+                       
+                       pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT);
+
+               } catch (...) {
+                       warning << _("failed to set tempo map information for JACK due to issues with tempo map") << endmsg;
+               }
        }
 
 #ifdef HAVE_JACK_VIDEO_SUPPORT
        //poke audio video ratio so Ardour can track Video Sync
-       pos->audio_frames_per_video_frame = frame_rate() / Config->get_smpte_frames_per_second ();
+       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 = Config->get_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) {
 
@@ -450,45 +548,76 @@ Session::jack_timebase_callback (jack_transport_state_t state,
 
                }
 
-       } 
-
-#endif         
+       }
+#endif
 }
 
-nframes_t
-Session::convert_to_frames_at (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_rt (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 / Config->get_smpte_frames_per_second ();
-               if (_smpte_offset_negative) 
-               {
-                       return (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 (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 (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;
 }