some rather simple code to allow MIDI Clock to set the tempo of the session.

[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 d714eecac1886d1feba5192c990619d82e74e48f..706032887d8f2267ea72c3c666405b7a5620a1b4 100644 (file)
--- a/libs/ardour/midi_clock_slave.cc
+++ b/libs/ardour/midi_clock_slave.cc
@@ -36,6 +36,7 @@
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 #include "ardour/transport_master.h"
+#include "ardour/transport_master_manager.h"
 
 #include "pbd/i18n.h"
 
@@ -219,7 +220,6 @@ MIDIClock_TransportMaster::update_midi_clock (Parser& /*parser*/, samplepos_t ti
 
                const double samples_per_quarter = (timestamp - current.timestamp) * 24.0;
                const double instantaneous_bpm = (ENGINE->sample_rate() * 60.0) / samples_per_quarter;
-               const double lpf_coeff = 0.05;
 
                const double predicted_clock_interval_in_samples = (t1 - t0);
 
@@ -233,6 +233,8 @@ MIDIClock_TransportMaster::update_midi_clock (Parser& /*parser*/, samplepos_t ti
                 * change of more than 20% of the current tempo.
                 */
 
+               const double lpf_coeff = 0.063;
+
                if (fabs (instantaneous_bpm - _bpm) > (0.20 * _bpm)) {
                        _bpm = instantaneous_bpm;
                } else {
@@ -250,6 +252,10 @@ MIDIClock_TransportMaster::update_midi_clock (Parser& /*parser*/, samplepos_t ti
 
                midi_clock_count++;
                current.update (current.position + one_ppqn_in_samples, timestamp, speed);
+
+               if (TransportMasterManager::instance().current().get() == this) {
+                       _session->maybe_update_tempo_from_midiclock_tempo (_bpm);
+               }
        }
 
        DEBUG_TRACE (DEBUG::MidiClock, string_compose ("clock #%1 @ %2 should-be %3 transport %4 error %5 appspeed %6 "