merge with master, fixing conflicts in 3 wscript files

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

diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc
index e9be71d98e84e59860435d6a415687c6b81651ac..2888e7c11454e85da555cb69520eee160981d998 100644 (file)
--- a/libs/ardour/ltc_slave.cc
+++ b/libs/ardour/ltc_slave.cc
@@ -134,7 +134,7 @@ LTC_Slave::resync_latency()
 
        if (!session.deletion_in_progress() && session.ltc_output_io()) { /* check if Port exits */
                boost::shared_ptr<Port> ltcport = session.ltc_input_port();
-               ltcport->get_connected_latency_range(ltc_slave_latency, false);
+               ltcport->get_connected_latency_range (ltc_slave_latency, false);
        }
 }
 
@@ -150,9 +150,9 @@ LTC_Slave::reset()
 }
 
 void
-LTC_Slave::parse_ltc(const jack_nframes_t nframes, const jack_default_audio_sample_t * const in, const framecnt_t posinfo)
+LTC_Slave::parse_ltc(const ARDOUR::pframes_t nframes, const Sample* const in, const ARDOUR::framecnt_t posinfo)
 {
-       jack_nframes_t i;
+       pframes_t i;
        unsigned char sound[8192];
        if (nframes > 8192) {
                /* TODO warn once or wrap, loop conversion below
@@ -413,22 +413,22 @@ LTC_Slave::init_engine_dll (framepos_t pos, int32_t inc)
 }
 
 /* main entry point from session_process.cc
- * called from jack_process callback context
- * so it is OK to use jack_port_get_buffer()
+ * called from process callback context
+ * so it is OK to use get_buffer()
  */
 bool
 LTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 {
        bool engine_init_called = false;
-       framepos_t now = session.engine().frame_time_at_cycle_start();
+       framepos_t now = session.engine().sample_time_at_cycle_start();
        framepos_t sess_pos = session.transport_frame(); // corresponds to now
-       framecnt_t nframes = session.engine().frames_per_cycle();
+       framecnt_t nframes = session.engine().samples_per_cycle();
 
-       jack_default_audio_sample_t *in;
+       Sample* in;
 
        boost::shared_ptr<Port> ltcport = session.ltc_input_port();
 
-       in = (jack_default_audio_sample_t*) jack_port_get_buffer (ltcport->jack_port(), nframes);
+       in = (Sample*) AudioEngine::instance()->port_engine().get_buffer (ltcport->port_handle(), nframes);
 
        frameoffset_t skip = now - (monotonic_cnt + nframes);
        monotonic_cnt = now;
@@ -441,7 +441,7 @@ LTC_Slave::speed_and_position (double& speed, framepos_t& pos)
        else if (engine_dll_initstate != transport_direction && ltc_speed != 0) {
                engine_dll_initstate = transport_direction;
                init_engine_dll(last_ltc_frame + rint(ltc_speed * double(2 * nframes + now - last_timestamp)),
-                               session.engine().frames_per_cycle());
+                               session.engine().samples_per_cycle());
                engine_init_called = true;
        }
 
@@ -521,8 +521,8 @@ LTC_Slave::speed_and_position (double& speed, framepos_t& pos)
                t0 = t1;
                t1 += b * e + e2;
                e2 += c * e;
-               speed_flt = (t1 - t0) / double(session.engine().frames_per_cycle());
-               DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC engine DLL t0:%1 t1:%2 err:%3 spd:%4 ddt:%5\n", t0, t1, e, speed_flt, e2 - session.engine().frames_per_cycle() ));
+               speed_flt = (t1 - t0) / double(session.engine().samples_per_cycle());
+               DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC engine DLL t0:%1 t1:%2 err:%3 spd:%4 ddt:%5\n", t0, t1, e, speed_flt, e2 - session.engine().samples_per_cycle() ));
        } else {
                DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC adjusting elapsed (no DLL) from %1 by %2\n", elapsed, (2 * nframes * ltc_speed)));
                speed_flt = 0;
@@ -591,7 +591,7 @@ LTC_Slave::approximate_current_delta() const
                snprintf(delta, sizeof(delta), _("flywheel"));
        } else {
                snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%s%" PRIi64 "</span>sm",
-                               LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta));
+                               LEADINGZERO(llabs(current_delta)), PLUSMINUS(-current_delta), llabs(current_delta));
        }
        return std::string(delta);
 }