X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fticker.cc;h=0b4e64e0df3917e75c44adb1e942c0acf9865a0b;hb=a406d9183adc67075a4e802fd8254c2560df9964;hp=dbe81ae32cae2de6965360e249dde58148366a3f;hpb=c53115c650d9da64ba686425e8b90dc452ff862d;p=ardour.git diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index dbe81ae32c..0b4e64e0df 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -18,14 +18,13 @@ $Id$ */ +#include "midi++/port.h" +#include "midi++/manager.h" +#include "evoral/midi_events.h" #include "ardour/ticker.h" #include "ardour/session.h" #include "ardour/tempo.h" - -#ifdef DEBUG_MIDI_CLOCK -#include -using namespace std; -#endif +#include "ardour/debug.h" using namespace ARDOUR; @@ -43,7 +42,6 @@ void MidiClockTicker::set_session (Session* s) Ticker::set_session (s); if (_session) { - _session->MIDIClock_PortChanged.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::update_midi_clock_port, this)); _session->TransportStateChange.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_state_changed, this)); _session->PositionChanged.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::position_changed, this, _1)); _session->TransportLooped.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_looped, this)); @@ -60,7 +58,7 @@ MidiClockTicker::session_going_away () void MidiClockTicker::update_midi_clock_port() { - _midi_port = _session->midi_clock_port(); + _midi_port = MIDI::Manager::instance()->midi_clock_output_port(); } void MidiClockTicker::transport_state_changed() @@ -70,11 +68,13 @@ void MidiClockTicker::transport_state_changed() return; } - float speed = _session->transport_speed(); - nframes_t position = _session->transport_frame(); -#ifdef DEBUG_MIDI_CLOCK - cerr << "Transport state change, speed:" << speed << "position:" << position<< " play loop " << _session->get_play_loop() << endl; -#endif + float speed = _session->transport_speed(); + framepos_t position = _session->transport_frame(); + + DEBUG_TRACE (PBD::DEBUG::MidiClock, + string_compose ("Transport state change, speed: %1 position: %2 play loop: %3\n", speed, position, _session->get_play_loop()) + ); + if (speed == 1.0f) { _last_tick = position; @@ -103,14 +103,13 @@ void MidiClockTicker::transport_state_changed() send_stop_event(0); } - tick(position, *((ARDOUR::BBT_Time *) 0), *((Timecode::Time *)0)); + tick(position, *((Timecode::BBT_Time *) 0), *((Timecode::Time *)0)); } -void MidiClockTicker::position_changed(nframes_t position) +void MidiClockTicker::position_changed (framepos_t position) { -#ifdef DEBUG_MIDI_CLOCK - cerr << "Position changed:" << position << endl; -#endif + DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Position change: %1\n", position)); + _last_tick = position; } @@ -119,42 +118,33 @@ void MidiClockTicker::transport_looped() Location* loop_location = _session->locations()->auto_loop_location(); assert(loop_location); -#ifdef DEBUG_MIDI_CLOCK - cerr << "Transport looped, position:" << _session->transport_frame() - << " loop start " << loop_location->start( ) - << " loop end " << loop_location->end( ) - << " play loop " << _session->get_play_loop() - << endl; -#endif + DEBUG_TRACE (PBD::DEBUG::MidiClock, + string_compose ("Transport looped, position: %1, loop start: %2, loop end: %3, play loop: %4\n", + _session->transport_frame(), loop_location->start(), loop_location->end(), _session->get_play_loop()) + ); // adjust _last_tick, so that the next MIDI clock message is sent // in due time (and the tick interval is still constant) - nframes_t elapsed_since_last_tick = loop_location->end() - _last_tick; + framecnt_t elapsed_since_last_tick = loop_location->end() - _last_tick; _last_tick = loop_location->start() - elapsed_since_last_tick; } -void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/) +void MidiClockTicker::tick (const framepos_t& transport_frames, const Timecode::BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/) { if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0) return; - MIDI::JACK_MidiPort* jack_port = dynamic_cast(_midi_port); - assert(jack_port); - while (true) { double next_tick = _last_tick + one_ppqn_in_frames(transport_frames); - nframes_t next_tick_offset = nframes_t(next_tick) - transport_frames; - -#ifdef DEBUG_MIDI_CLOCK - cerr << "Transport:" << transport_frames - << ":Last tick time:" << _last_tick << ":" - << ":Next tick time:" << next_tick << ":" - << "Offset:" << next_tick_offset << ":" - << "cycle length:" << jack_port->nframes_this_cycle() - << endl; -#endif - - if (next_tick_offset >= jack_port->nframes_this_cycle()) + framecnt_t next_tick_offset = framecnt_t(next_tick) - transport_frames; + + DEBUG_TRACE (PBD::DEBUG::MidiClock, + string_compose ("Transport: %1, last tick time: %2, next tick time: %3, offset: %4, cycle length: %5\n", + transport_frames, _last_tick, next_tick, next_tick_offset, _midi_port->nframes_this_cycle() + ) + ); + + if (next_tick_offset >= _midi_port->nframes_this_cycle()) return; send_midi_clock_event(next_tick_offset); @@ -163,7 +153,7 @@ void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /* } } -double MidiClockTicker::one_ppqn_in_frames(nframes_t transport_position) +double MidiClockTicker::one_ppqn_in_frames (framepos_t transport_position) { const Tempo& current_tempo = _session->tempo_map().tempo_at(transport_position); const Meter& current_meter = _session->tempo_map().meter_at(transport_position); @@ -177,50 +167,46 @@ double MidiClockTicker::one_ppqn_in_frames(nframes_t transport_position) return frames_per_quarter_note / double (_ppqn); } -void MidiClockTicker::send_midi_clock_event(nframes_t offset) +void MidiClockTicker::send_midi_clock_event (pframes_t offset) { if (!_midi_port) { return; } -#ifdef WITH_JACK_MIDI - assert (MIDI::JACK_MidiPort::is_process_thread()); -#endif // WITH_JACK_MIDI -#ifdef DEBUG_MIDI_CLOCK - cerr << "Tick with offset " << offset << endl; -#endif // DEBUG_MIDI_CLOCK + DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Tick with offset %1\n", offset)); + static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CLOCK }; - _midi_port->write(_midi_clock_tick, 1, offset); + _midi_port->write (_midi_clock_tick, 1, offset); } -void MidiClockTicker::send_start_event(nframes_t offset) +void MidiClockTicker::send_start_event (pframes_t offset) { if (!_midi_port) { return; } static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_START }; - _midi_port->write(_midi_clock_tick, 1, offset); + _midi_port->write (_midi_clock_tick, 1, offset); } -void MidiClockTicker::send_continue_event(nframes_t offset) +void MidiClockTicker::send_continue_event (pframes_t offset) { if (!_midi_port) { return; } static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CONTINUE }; - _midi_port->write(_midi_clock_tick, 1, offset); + _midi_port->write (_midi_clock_tick, 1, offset); } -void MidiClockTicker::send_stop_event(nframes_t offset) +void MidiClockTicker::send_stop_event (pframes_t offset) { if (!_midi_port) { return; } static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_STOP }; - _midi_port->write(_midi_clock_tick, 1, offset); + _midi_port->write (_midi_clock_tick, 1, offset); }