X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fticker.cc;h=5d078952a1f01db16f0fa766a699022568717880;hb=9cb678ebcc2ca0c7993bdd182c9e6ad1f8adf09a;hp=7cbaf066b54de98ae33f13e8c25fd03f06484176;hpb=110311e1860d6fb18b1985ca47f33126ae69f678;p=ardour.git diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index 7cbaf066b5..5d078952a1 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -14,14 +14,18 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ */ #include "pbd/compose.h" +#include "pbd/stacktrace.h" + #include "midi++/port.h" +#include "midi++/jack_midi_port.h" #include "midi++/manager.h" + #include "evoral/midi_events.h" + +#include "ardour/audioengine.h" #include "ardour/ticker.h" #include "ardour/session.h" #include "ardour/tempo.h" @@ -29,19 +33,17 @@ using namespace ARDOUR; -void Ticker::set_session (Session* s) +MidiClockTicker::MidiClockTicker () + : _midi_port (0) + , _ppqn (24) + , _last_tick (0.0) { - SessionHandlePtr::set_session (s); - - if (_session) { - _session->tick.connect_same_thread (_session_connections, boost::bind (&Ticker::tick, this, _1, _2, _3)); - } } void MidiClockTicker::set_session (Session* s) { - Ticker::set_session (s); - + SessionHandlePtr::set_session (s); + if (_session) { _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)); @@ -53,8 +55,8 @@ void MidiClockTicker::set_session (Session* s) void MidiClockTicker::session_going_away () { - SessionHandlePtr::session_going_away(); - _midi_port = 0; + SessionHandlePtr::session_going_away(); + _midi_port = 0; } void MidiClockTicker::update_midi_clock_port() @@ -69,13 +71,18 @@ void MidiClockTicker::transport_state_changed() return; } + if (!_session->engine().running()) { + /* Engine stopped, we can't do anything */ + return; + } + 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()) + string_compose ("Transport state change @ %4, speed: %1 position: %2 play loop: %3\n", speed, position, _session->get_play_loop(), position) ); - + if (speed == 1.0f) { _last_tick = position; @@ -104,7 +111,7 @@ void MidiClockTicker::transport_state_changed() send_stop_event(0); } - tick(position, *((Timecode::BBT_Time *) 0), *((Timecode::Time *)0)); + tick (position); } void MidiClockTicker::position_changed (framepos_t position) @@ -126,29 +133,39 @@ void MidiClockTicker::transport_looped() // adjust _last_tick, so that the next MIDI clock message is sent // in due time (and the tick interval is still constant) + framecnt_t elapsed_since_last_tick = loop_location->end() - _last_tick; - _last_tick = loop_location->start() - elapsed_since_last_tick; + + if (loop_location->start() > elapsed_since_last_tick) { + _last_tick = loop_location->start() - elapsed_since_last_tick; + } else { + _last_tick = 0; + } } -void MidiClockTicker::tick (const framepos_t& transport_frames, const Timecode::BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/) +void MidiClockTicker::tick (const framepos_t& transport_frame) { - if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0) + if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0) { return; + } while (true) { - double next_tick = _last_tick + one_ppqn_in_frames(transport_frames); - framecnt_t next_tick_offset = framecnt_t(next_tick) - transport_frames; + double next_tick = _last_tick + one_ppqn_in_frames (transport_frame); + frameoffset_t next_tick_offset = llrint (next_tick) - transport_frame; + MIDI::JackMIDIPort* mp = dynamic_cast (_midi_port); + 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() - ) - ); + transport_frame, _last_tick, next_tick, next_tick_offset, mp ? mp->nframes_this_cycle() : 0)); - if (next_tick_offset >= _midi_port->nframes_this_cycle()) - return; + if (!mp || (next_tick_offset >= mp->nframes_this_cycle())) { + break; + } - send_midi_clock_event(next_tick_offset); + if (next_tick_offset >= 0) { + send_midi_clock_event (next_tick_offset); + } _last_tick = next_tick; } @@ -156,11 +173,8 @@ void MidiClockTicker::tick (const framepos_t& transport_frames, const Timecode:: 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); - double frames_per_beat = - current_tempo.frames_per_beat(_session->nominal_frame_rate(), - current_meter); + const Tempo& current_tempo = _session->tempo_map().tempo_at (transport_position); + double frames_per_beat = current_tempo.frames_per_beat (_session->nominal_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; @@ -185,7 +199,7 @@ 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); } @@ -195,7 +209,7 @@ 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); } @@ -205,7 +219,7 @@ 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); }