X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_clock_slave.cc;h=f6fe0d0930fcb9a227eb898cc608632e153385ed;hb=a017411dfab6d85fdbdcb9d4fd17a05f0ee2cc2a;hp=3a43580d648c79fe028311fae3c884268799aa9d;hpb=f450df300c9c057141a4caf79ff6dbfbf58492d9;p=ardour.git diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc index 3a43580d64..f6fe0d0930 100644 --- a/libs/ardour/midi_clock_slave.cc +++ b/libs/ardour/midi_clock_slave.cc @@ -18,6 +18,7 @@ */ +#include #include #include #include @@ -27,7 +28,8 @@ #include "pbd/pthread_utils.h" #include "midi++/port.h" -#include "midi++/jack.h" + +#include "ardour/debug.h" #include "ardour/slave.h" #include "ardour/session.h" #include "ardour/audioengine.h" @@ -42,9 +44,11 @@ using namespace ARDOUR; using namespace MIDI; using namespace PBD; +#define DEBUG_MIDI_CLOCK 1 + MIDIClock_Slave::MIDIClock_Slave (Session& s, MIDI::Port& p, int ppqn) : ppqn (ppqn) - , bandwidth (30.0 / 60.0) // 1 BpM = 1 / 60 Hz + , bandwidth (1.0 / 60.0) // 1 BpM = 1 / 60 Hz { session = (ISlaveSessionProxy *) new SlaveSessionProxy(s); rebind (p); @@ -54,9 +58,8 @@ MIDIClock_Slave::MIDIClock_Slave (Session& s, MIDI::Port& p, int ppqn) MIDIClock_Slave::MIDIClock_Slave (ISlaveSessionProxy* session_proxy, int ppqn) : session(session_proxy) , ppqn (ppqn) - , bandwidth (30.0 / 60.0) // 1 BpM = 1 / 60 Hz + , bandwidth (1.0 / 60.0) // 1 BpM = 1 / 60 Hz { - session = session_proxy; reset (); } @@ -72,19 +75,17 @@ MIDIClock_Slave::rebind (MIDI::Port& p) port = &p; -#ifdef DEBUG_MIDI_CLOCK - std::cerr << "MIDIClock_Slave: connecting to port " << port->name() << std::endl; -#endif + DEBUG_TRACE (DEBUG::MidiClock, string_compose ("MIDIClock_Slave: connecting to port %1\n", port->name())); - port->input()->timing.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::update_midi_clock, this, _1, _2)); - port->input()->start.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::start, this, _1, _2)); - port->input()->contineu.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::contineu, this, _1, _2)); - port->input()->stop.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::stop, this, _1, _2)); - port->input()->position.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::position, this, _1, _2, 3)); + port->parser()->timing.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::update_midi_clock, this, _1, _2)); + port->parser()->start.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::start, this, _1, _2)); + port->parser()->contineu.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::contineu, this, _1, _2)); + port->parser()->stop.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::stop, this, _1, _2)); + port->parser()->position.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::position, this, _1, _2, 3)); } void -MIDIClock_Slave::calculate_one_ppqn_in_frames_at(nframes64_t time) +MIDIClock_Slave::calculate_one_ppqn_in_frames_at(framepos_t time) { const Tempo& current_tempo = session->tempo_map().tempo_at(time); const Meter& current_meter = session->tempo_map().meter_at(time); @@ -96,16 +97,17 @@ MIDIClock_Slave::calculate_one_ppqn_in_frames_at(nframes64_t time) double frames_per_quarter_note = frames_per_beat / quarter_notes_per_beat; one_ppqn_in_frames = frames_per_quarter_note / double (ppqn); + // DEBUG_TRACE (DEBUG::MidiClock, string_compose ("at %1, one ppqn = %2\n", time, one_ppqn_in_frames)); } -ARDOUR::nframes64_t +ARDOUR::framepos_t MIDIClock_Slave::calculate_song_position(uint16_t song_position_in_sixteenth_notes) { - nframes64_t song_position_frames = 0; + framepos_t song_position_frames = 0; for (uint16_t i = 1; i <= song_position_in_sixteenth_notes; ++i) { // one quarter note contains ppqn pulses, so a sixteenth note is ppqn / 4 pulses calculate_one_ppqn_in_frames_at(song_position_frames); - song_position_frames += one_ppqn_in_frames * (nframes64_t)(ppqn / 4); + song_position_frames += one_ppqn_in_frames * (framepos_t)(ppqn / 4); } return song_position_frames; @@ -115,13 +117,13 @@ void MIDIClock_Slave::calculate_filter_coefficients() { // omega = 2 * PI * Bandwidth / MIDI clock frame frequency in Hz - omega = 2.0 * 3.14159265358979323846 * bandwidth * one_ppqn_in_frames / session->frame_rate(); + omega = 2.0 * M_PI * bandwidth * one_ppqn_in_frames / session->frame_rate(); b = 1.4142135623730950488 * omega; c = omega * omega; } void -MIDIClock_Slave::update_midi_clock (Parser& /*parser*/, nframes64_t timestamp) +MIDIClock_Slave::update_midi_clock (Parser& /*parser*/, framepos_t timestamp) { // some pieces of hardware send MIDI Clock all the time if ( (!_starting) && (!_started) ) { @@ -130,7 +132,7 @@ MIDIClock_Slave::update_midi_clock (Parser& /*parser*/, nframes64_t timestamp) calculate_one_ppqn_in_frames_at(should_be_position); - nframes64_t elapsed_since_start = timestamp - first_timestamp; + framepos_t elapsed_since_start = timestamp - first_timestamp; double error = 0; if (_starting || last_timestamp == 0) { @@ -155,7 +157,7 @@ MIDIClock_Slave::update_midi_clock (Parser& /*parser*/, nframes64_t timestamp) calculate_filter_coefficients(); // calculate loop error - // we use session->transport_frame() instead of t1 here + // we use session->audible_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->audible_frame())); @@ -167,64 +169,57 @@ MIDIClock_Slave::update_midi_clock (Parser& /*parser*/, nframes64_t timestamp) e2 += c * e; } - #ifdef DEBUG_MIDI_CLOCK - cerr - << "MIDI Clock #" << midi_clock_count - //<< "@" << timestamp - << " arrived at: " << elapsed_since_start << " (elapsed time) " - << " should-be transport: " << should_be_position - << " audible: " << session->audible_frame() - << " real transport: " << session->transport_frame() - << " error: " << error - //<< " engine: " << session->frame_time() - << " real delta: " << timestamp - last_timestamp - << " should-be delta: " << one_ppqn_in_frames - << " t1-t0: " << (t1 -t0) * session->frame_rate() - << " t0: " << t0 * session->frame_rate() - << " t1: " << t1 * session->frame_rate() - << " frame-rate: " << session->frame_rate() - << endl; - - cerr << "frames since cycle start: " << session->frames_since_cycle_start() << endl; - #endif // DEBUG_MIDI_CLOCK - + 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)); + last_timestamp = timestamp; } void -MIDIClock_Slave::start (Parser& /*parser*/, nframes64_t /*timestamp*/) +MIDIClock_Slave::start (Parser& /*parser*/, framepos_t timestamp) { - #ifdef DEBUG_MIDI_CLOCK - cerr << "MIDIClock_Slave got start message at time " << timestamp << " engine time: " << session->frame_time() << endl; - #endif + DEBUG_TRACE (DEBUG::MidiClock, string_compose ("MIDIClock_Slave got start message at time %1 engine time %2\n", timestamp, session->frame_time())); if (!_started) { reset(); _started = true; _starting = true; + + should_be_position = session->transport_frame(); } } void MIDIClock_Slave::reset () { - - should_be_position = 0; + should_be_position = session->transport_frame(); last_timestamp = 0; - _starting = false; - _started = false; - - session->request_locate(0, false); + _starting = true; + _started = true; + + // session->request_locate(0, false); } void -MIDIClock_Slave::contineu (Parser& /*parser*/, nframes64_t /*timestamp*/) +MIDIClock_Slave::contineu (Parser& /*parser*/, framepos_t /*timestamp*/) { - #ifdef DEBUG_MIDI_CLOCK - std::cerr << "MIDIClock_Slave got continue message" << endl; - #endif + DEBUG_TRACE (DEBUG::MidiClock, "MIDIClock_Slave got continue message\n"); + if (!_started) { _starting = true; _started = true; @@ -233,11 +228,9 @@ MIDIClock_Slave::contineu (Parser& /*parser*/, nframes64_t /*timestamp*/) void -MIDIClock_Slave::stop (Parser& /*parser*/, nframes64_t /*timestamp*/) +MIDIClock_Slave::stop (Parser& /*parser*/, framepos_t /*timestamp*/) { - #ifdef DEBUG_MIDI_CLOCK - std::cerr << "MIDIClock_Slave got stop message" << endl; - #endif + DEBUG_TRACE (DEBUG::MidiClock, "MIDIClock_Slave got stop message\n"); if (_started || _starting) { _starting = false; @@ -252,7 +245,7 @@ MIDIClock_Slave::stop (Parser& /*parser*/, nframes64_t /*timestamp*/) // that is the position of the last MIDI Clock // message and that is probably what the master // expects where we are right now - nframes64_t stop_position = should_be_position; + framepos_t stop_position = should_be_position; // find out the last MIDI beat: go back #midi_clocks mod 6 // and lets hope the tempo didnt change in those last 6 beats :) @@ -279,11 +272,9 @@ MIDIClock_Slave::position (Parser& /*parser*/, byte* message, size_t size) assert((lsb <= 0x7f) && (msb <= 0x7f)); uint16_t position_in_sixteenth_notes = (uint16_t(msb) << 7) | uint16_t(lsb); - nframes64_t position_in_frames = calculate_song_position(position_in_sixteenth_notes); + framepos_t position_in_frames = calculate_song_position(position_in_sixteenth_notes); - #ifdef DEBUG_MIDI_CLOCK - cerr << "Song Position: " << position_in_sixteenth_notes << " frames: " << position_in_frames << endl; - #endif + DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Song Position: %1 frames: %2\n", position_in_sixteenth_notes, position_in_frames)); session->request_locate(position_in_frames, false); should_be_position = position_in_frames; @@ -310,15 +301,13 @@ MIDIClock_Slave::starting() const } bool -MIDIClock_Slave::stop_if_no_more_clock_events(nframes64_t& pos, nframes64_t now) +MIDIClock_Slave::stop_if_no_more_clock_events(framepos_t& pos, framepos_t now) { /* no timecode for 1/4 second ? conclude that its stopped */ if (last_timestamp && now > last_timestamp && now - last_timestamp > session->frame_rate() / 4) { - #ifdef DEBUG_MIDI_CLOCK - cerr << "No MIDI Clock frames received for some time, stopping!" << endl; - #endif + DEBUG_TRACE (DEBUG::MidiClock, "No MIDI Clock frames received for some time, stopping!\n"); pos = should_be_position; session->request_transport_speed (0); session->request_locate (should_be_position, false); @@ -329,7 +318,7 @@ MIDIClock_Slave::stop_if_no_more_clock_events(nframes64_t& pos, nframes64_t now) } bool -MIDIClock_Slave::speed_and_position (double& speed, nframes64_t& pos) +MIDIClock_Slave::speed_and_position (double& speed, framepos_t& pos) { if (!_started || _starting) { speed = 0.0; @@ -337,7 +326,7 @@ MIDIClock_Slave::speed_and_position (double& speed, nframes64_t& pos) return true; } - nframes64_t engine_now = session->frame_time(); + framepos_t engine_now = session->frame_time(); if (stop_if_no_more_clock_events(pos, engine_now)) { return false; @@ -345,21 +334,23 @@ MIDIClock_Slave::speed_and_position (double& speed, nframes64_t& pos) // calculate speed speed = ((t1 - t0) * session->frame_rate()) / one_ppqn_in_frames; + + // provide a 3% deadzone to lock the speed + if (fabs(speed - 1.0) <= 0.03) + speed = 1.0; // calculate position if (engine_now > last_timestamp) { // we are in between MIDI clock messages // so we interpolate position according to speed - nframes64_t elapsed = engine_now - last_timestamp; - pos = (nframes64_t) (should_be_position + double(elapsed) * speed); + framecnt_t elapsed = engine_now - last_timestamp; + pos = (framepos_t) (should_be_position + double(elapsed) * speed); } else { // A new MIDI clock message has arrived this cycle pos = should_be_position; } - #ifdef DEBUG_MIDI_CLOCK - cerr << "speed_and_position: " << speed << " & " << pos << " <-> " << session->transport_frame() << " (transport)" << endl; - #endif + DEBUG_TRACE (DEBUG::MidiClock, string_compose ("speed_and_position: %1 & %2 <-> %3 (transport)\n", speed, pos, session->transport_frame())); return true; }