fix crash when copy'ing latent plugins

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

diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc
index a52854d954be24cfd56b7f49fda8100d5fc4cc7e..f2dc4f9abb9fea1dc35f449ff8a3e107a8bdd148 100644 (file)
--- a/libs/ardour/midi_clock_slave.cc
+++ b/libs/ardour/midi_clock_slave.cc
@@ -35,7 +35,7 @@
 #include "ardour/slave.h"
 #include "ardour/tempo.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -44,7 +44,7 @@ using namespace PBD;
 
 MIDIClock_Slave::MIDIClock_Slave (Session& s, MidiPort& p, int ppqn)
        : ppqn (ppqn)
-       , bandwidth (10.0 / 60.0) // 1 BpM = 1 / 60 Hz
+       , bandwidth (2.0 / 60.0) // 1 BpM = 1 / 60 Hz
 {
        session = (ISlaveSessionProxy *) new SlaveSessionProxy(s);
        rebind (p);
@@ -54,7 +54,7 @@ MIDIClock_Slave::MIDIClock_Slave (Session& s, MidiPort& p, int ppqn)
 MIDIClock_Slave::MIDIClock_Slave (ISlaveSessionProxy* session_proxy, int ppqn)
        : session(session_proxy)
        , ppqn (ppqn)
-       , bandwidth (10.0 / 60.0) // 1 BpM = 1 / 60 Hz
+       , bandwidth (2.0 / 60.0) // 1 BpM = 1 / 60 Hz
 {
        reset ();
 }
@@ -82,8 +82,8 @@ MIDIClock_Slave::rebind (MidiPort& port)
 void
 MIDIClock_Slave::calculate_one_ppqn_in_frames_at(framepos_t time)
 {
-       const Tempo& current_tempo = session->tempo_map().tempo_at(time);
-       double frames_per_beat = current_tempo.frames_per_beat(session->frame_rate());
+       const Tempo& current_tempo = session->tempo_map().tempo_at_frame (time);
+       double const frames_per_beat = session->tempo_map().frames_per_beat_at (time, session->frame_rate());
 
        double quarter_notes_per_beat = 4.0 / current_tempo.note_type();
        double frames_per_quarter_note = frames_per_beat / quarter_notes_per_beat;
@@ -122,6 +122,8 @@ MIDIClock_Slave::update_midi_clock (Parser& /*parser*/, framepos_t timestamp)
                return;
        }
 
+       pframes_t cycle_offset = timestamp - session->sample_time_at_cycle_start();
+
        calculate_one_ppqn_in_frames_at(should_be_position);
 
        framepos_t elapsed_since_start = timestamp - first_timestamp;
@@ -133,6 +135,8 @@ MIDIClock_Slave::update_midi_clock (Parser& /*parser*/, framepos_t timestamp)
                first_timestamp = timestamp;
                elapsed_since_start = should_be_position;
 
+               DEBUG_TRACE (DEBUG::MidiClock, string_compose ("first clock message after start received @ %1\n", timestamp));
+
                // calculate filter coefficients
                calculate_filter_coefficients();
 
@@ -152,7 +156,7 @@ MIDIClock_Slave::update_midi_clock (Parser& /*parser*/, framepos_t timestamp)
                // we use session->transport_frame() instead of t1 here
                // because t1 is used to calculate the transport speed,
                // so the loop will compensate for accumulating rounding errors
-               error = (double(should_be_position) - double(session->transport_frame()));
+               error = (double(should_be_position) - (double(session->transport_frame()) + double(cycle_offset)));
                e = error / double(session->frame_rate());
                current_delta = error;
 
@@ -162,21 +166,23 @@ MIDIClock_Slave::update_midi_clock (Parser& /*parser*/, framepos_t timestamp)
                e2 += c * e;
        }
 
-       DEBUG_TRACE (DEBUG::MidiClock, string_compose ("clock #%1 @ %2 arrived %3 (theoretical) audible %4 transport %5 error %6 "
-                                                      "read delta %7 should-be delta %8 t1-t0 %9 t0 %10 t1 %11 framerate %12 appspeed %13\n",
-                                                      midi_clock_count,
-                                                      elapsed_since_start,
-                                                      should_be_position,
-                                                      session->audible_frame(),
-                                                      session->transport_frame(),
-                                                      error,
-                                                      timestamp - last_timestamp,
-                                                      one_ppqn_in_frames,
-                                                      (t1 -t0) * session->frame_rate(),
-                                                      t0 * session->frame_rate(),
-                                                      t1 * session->frame_rate(),
-                                                      session->frame_rate(),
-                                                      ((t1 - t0) * session->frame_rate()) / one_ppqn_in_frames));
+       DEBUG_TRACE (DEBUG::MidiClock, string_compose ("clock #%1 @ %2 should-be %3 transport %4 error %5 appspeed %6 "
+                                                      "read-delta %7 should-be delta %8 t1-t0 %9 t0 %10 t1 %11 framerate %12 engine %13\n",
+                                                      midi_clock_count,                                          // #
+                                                      elapsed_since_start,                                       // @
+                                                      should_be_position,                                        // should-be
+                                                      session->transport_frame(),                                // transport
+                                                      error,                                                     // error
+                                                      ((t1 - t0) * session->frame_rate()) / one_ppqn_in_frames, // appspeed
+                                                      timestamp - last_timestamp,                                // read delta
+                                                      one_ppqn_in_frames,                                        // should-be delta
+                                                      (t1 - t0) * session->frame_rate(),                         // t1-t0
+                                                      t0 * session->frame_rate(),                                // t0
+                                                      t1 * session->frame_rate(),                                // t1
+                                                      session->frame_rate(),                                      // framerate
+                                                      session->frame_time()
+
+       ));
 
        last_timestamp = timestamp;
 }
@@ -184,7 +190,7 @@ MIDIClock_Slave::update_midi_clock (Parser& /*parser*/, framepos_t timestamp)
 void
 MIDIClock_Slave::start (Parser& /*parser*/, framepos_t timestamp)
 {
-       DEBUG_TRACE (DEBUG::MidiClock, string_compose ("MIDIClock_Slave got start message at time %1 engine time %2\n", timestamp, session->frame_time()));
+       DEBUG_TRACE (DEBUG::MidiClock, string_compose ("MIDIClock_Slave got start message at time %1 engine time %2 transport_frame %3\n", timestamp, session->frame_time(), session->transport_frame()));
 
        if (!_started) {
                reset();
@@ -199,6 +205,8 @@ MIDIClock_Slave::start (Parser& /*parser*/, framepos_t timestamp)
 void
 MIDIClock_Slave::reset ()
 {
+       DEBUG_TRACE (DEBUG::MidiClock, string_compose ("MidiClock_Slave reset(): calculated filter bandwidth is %1 for period size %2\n", bandwidth, session->frames_per_cycle()));
+
        should_be_position = session->transport_frame();
        last_timestamp = 0;
 
@@ -344,7 +352,7 @@ MIDIClock_Slave::speed_and_position (double& speed, framepos_t& pos)
                pos = should_be_position;
        }
 
-       DEBUG_TRACE (DEBUG::MidiClock, string_compose ("speed_and_position: %1 & %2 <-> %3 (transport)\n", speed, pos, session->transport_frame()));
+       DEBUG_TRACE (DEBUG::MidiClock, string_compose ("speed_and_position: speed %1 should-be %2 transport %3 \n", speed, pos, session->transport_frame()));
 
        return true;
 }