enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / libs / ardour / session_time.cc

diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 5e25aaf5080d28af5d428b8052e0872795980a2a..8f080285e2c26a09e893644bc2e5bbe8ce47c501 100644 (file)
--- 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);
@@ -95,6 +95,7 @@ Session::sync_time_vars ()
                }
                break;
        };
+       ltc_tx_parse_offset();
 }
 
 void
@@ -163,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
@@ -179,31 +180,30 @@ Session::timecode_time (Timecode::Time &t)
 }
 
 int
-Session::jack_sync_callback (jack_transport_state_t state,
-                            jack_position_t* pos)
+Session::backend_sync_callback (TransportState state, framepos_t pos)
 {
-       bool slave = synced_to_jack();
+       bool slave = synced_to_engine();
 
        switch (state) {
-       case JackTransportStopped:
-               if (slave && _transport_frame != pos->frame && post_transport_work() == 0) {
-                       request_locate (pos->frame, false);
+       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;
                        return false;
                } else {
                        return true;
                }
 
-       case JackTransportStarting:
+       case TransportStarting:
                // 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 && post_transport_work() == 0;
                } else {
                        return true;
                }
                break;
 
-       case JackTransportRolling:
+       case TransportRolling:
                // cerr << "SYNC: rolling slave = " << slave << endl;
                if (slave) {
                        start_transport ();
@@ -211,97 +211,13 @@ Session::jack_sync_callback (jack_transport_state_t state,
                break;
 
        default:
-               error << string_compose (_("Unknown JACK transport state %1 in sync callback"), state)
+               error << string_compose (_("Unknown transport state %1 in sync callback"), state)
                      << endmsg;
        }
 
        return true;
 }
 
-void
-Session::jack_timebase_callback (jack_transport_state_t /*state*/,
-                                pframes_t /*nframes*/,
-                                jack_position_t* pos,
-                                int /*new_position*/)
-{
-       Timecode::BBT_Time bbt;
-
-       if (pos->frame != _transport_frame) {
-               cerr << "ARDOUR says " << _transport_frame << " JACK says " << pos->frame << endl;
-       }
-
-       /* BBT info */
-
-       if (_tempo_map) {
-
-               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
-       /* Timecode info */
-
-       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 (play_loop) {
-
-                       Location* location = _locations.auto_loop_location();
-
-                       if (location) {
-
-                               t.transport_state = JackTransportLooping;
-                               t.loop_start = location->start();
-                               t.loop_end = location->end();
-                               t.valid = jack_transport_bits_t (t.valid | JackTransportLoop);
-
-                       } else {
-
-                               t.loop_start = 0;
-                               t.loop_end = 0;
-                               t.transport_state = JackTransportRolling;
-
-                       }
-
-               } else {
-
-                       t.loop_start = 0;
-                       t.loop_end = 0;
-                       t.transport_state = JackTransportRolling;
-
-               }
-
-       }
-#endif
-}
 
 ARDOUR::framecnt_t
 Session::convert_to_frames (AnyTime const & position)
@@ -310,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: