X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fticker.cc;h=3fe6e66b81ceb2f97676181989ae3c50ab81a8ce;hb=4dc63966f0872efe768dad61eb9b8785d06b92d1;hp=0ed4427b72df1c6e5f76a449b3301c1423577ac4;hpb=6bcdf4f0f106d0b83ed7f221f546c132585e19e7;p=ardour.git diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index 0ed4427b72..3fe6e66b81 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -25,6 +25,7 @@ #include "ardour/audioengine.h" #include "ardour/midi_buffer.h" #include "ardour/midi_port.h" +#include "ardour/lmath.h" #include "ardour/ticker.h" #include "ardour/session.h" #include "ardour/tempo.h" @@ -38,58 +39,66 @@ class MidiClockTicker::Position : public Timecode::BBT_Time { public: - Position() : speed(0.0f), frame(0) { } - ~Position() { } + Position() : speed(0.0f), frame(0), midi_beats(0) { } + ~Position() { } - /** Sync timing information taken from the given Session - @return True if timings differed */ - bool sync (Session* s) { + /** Sync timing information taken from the given Session + * @return True if timings differed + */ - bool didit = false; + bool sync (Session* s) { - double sp = s->transport_speed(); - framecnt_t fr = s->transport_frame(); + bool changed = false; + + double sp = s->transport_speed(); + framecnt_t fr = s->transport_frame(); + + if (speed != sp) { + speed = sp; + changed = true; + } - if (speed != sp) { - speed = sp; - didit = true; - } + if (frame != fr) { + frame = fr; + changed = true; + } - if (frame != fr) { - frame = fr; - didit = true; - } + /* Midi beats and clocks always gets updated for now */ - /* Midi beats and clocks always gets updated for now */ + s->bbt_time (this->frame, *this); - s->bbt_time (this->frame, *this); + const TempoMap& tempo = s->tempo_map(); - const TempoMap& tempo = s->tempo_map(); + const double divisions = tempo.meter_at(frame).divisions_per_bar(); + const double divisor = tempo.meter_at(frame).note_divisor(); + const double qnote_scale = divisor * 0.25f; + double mb; - const double divisions = tempo.meter_at(frame).divisions_per_bar(); - const double divisor = tempo.meter_at(frame).note_divisor(); - const double qnote_scale = divisor * 0.25f; + /** Midi Beats in terms of Song Position Pointer is equivalent to total + * sixteenth notes at 'time' + */ - /** Midi Beats in terms of Song Position Pointer is equivalent to total - sixteenth notes at 'time' */ + mb = (((bars - 1) * divisions) + beats - 1); + mb += (double)ticks / (double)Position::ticks_per_beat * qnote_scale; + mb *= 16.0f / divisor; - midi_beats = (((bars - 1) * divisions) + beats - 1); - midi_beats += (double)ticks / (double)Position::ticks_per_beat * qnote_scale; - midi_beats *= 16.0f / divisor; + if (mb != midi_beats) { + midi_beats = mb; + midi_clocks = midi_beats * 6.0f; + changed = true; + } - midi_clocks = midi_beats * 6.0f; + return changed; + } - return didit; - } - - double speed; - framecnt_t frame; - double midi_beats; - double midi_clocks; + double speed; + framecnt_t frame; + double midi_beats; + double midi_clocks; - void print (std::ostream& s) { - s << "frames: " << frame << " midi beats: " << midi_beats << " speed: " << speed; - } + void print (std::ostream& s) { + s << "frames: " << frame << " midi beats: " << midi_beats << " speed: " << speed; + } }; @@ -127,7 +136,7 @@ MidiClockTicker::session_located() { DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Session Located: %1, speed: %2\n", _session->transport_frame(), _session->transport_speed())); - if (0 == _session || ! _pos->sync (_session)) { + if (!_session || !_pos->sync (_session)) { return; } @@ -150,7 +159,7 @@ MidiClockTicker::session_going_away () void MidiClockTicker::update_midi_clock_port() { - _midi_port = AudioEngine::instance()->midi_clock_output_port(); + _midi_port = _session->midi_clock_output_port(); } void @@ -212,37 +221,30 @@ MidiClockTicker::transport_looped() void MidiClockTicker::tick (const framepos_t& /* transport_frame */, pframes_t nframes) { - if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0) { + if (!Config->get_send_midi_clock() || _session == 0 || _midi_port == 0) { return; } if (_send_pos) { if (_pos->speed == 0.0f) { - uint32_t where = llrint (_pos->midi_beats); - send_position_event (where, 0, nframes); + send_position_event (llrint (_pos->midi_beats), 0, nframes); } else if (_pos->speed == 1.0f) { -#if 1 - /* Experimental. To really do this and have accuracy, the - stop/locate/continue sequence would need queued to send immediately - before the next midi clock. */ - send_stop_event (0, nframes); if (_pos->frame == 0) { send_start_event (0, nframes); } else { - uint32_t where = llrint (_pos->midi_beats); - send_position_event (where, 0, nframes); + send_position_event (llrint (_pos->midi_beats), 0, nframes); send_continue_event (0, nframes); } -#endif } else { /* Varispeed not supported */ } - _send_pos = true; + _send_pos = false; } + if (_send_state) { if (_pos->speed == 1.0f) { if (_session->get_play_loop()) { @@ -270,6 +272,10 @@ MidiClockTicker::tick (const framepos_t& /* transport_frame */, pframes_t nframe _send_state = false; } + if (_session->transport_speed() != 1.0f) { + /* no varispeed support and nothing to do after this if stopped */ + return; + } const framepos_t end = _pos->frame + nframes; double iter = _last_tick; @@ -317,11 +323,12 @@ MidiClockTicker::send_midi_clock_event (pframes_t offset, pframes_t nframes) return; } - DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Tick with offset %1\n", offset)); + static uint8_t msg = MIDI_CMD_COMMON_CLOCK; - static uint8_t tick_byte = { MIDI_CMD_COMMON_CLOCK }; MidiBuffer& mb (_midi_port->get_midi_buffer (nframes)); - mb.push_back (offset, 1, &tick_byte); + mb.push_back (offset, 1, &msg); + + DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Tick with offset %1\n", offset)); } void @@ -331,11 +338,11 @@ MidiClockTicker::send_start_event (pframes_t offset, pframes_t nframes) return; } - DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Start %1\n", _last_tick)); - - static uint8_t tick_byte = { MIDI_CMD_COMMON_START }; + static uint8_t msg = { MIDI_CMD_COMMON_START }; MidiBuffer& mb (_midi_port->get_midi_buffer (nframes)); - mb.push_back (offset, 1, &tick_byte); + mb.push_back (offset, 1, &msg); + + DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Start %1\n", _last_tick)); } void @@ -345,11 +352,11 @@ MidiClockTicker::send_continue_event (pframes_t offset, pframes_t nframes) return; } - DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Continue %1\n", _last_tick)); - - static uint8_t tick_byte = { MIDI_CMD_COMMON_CONTINUE }; + static uint8_t msg = { MIDI_CMD_COMMON_CONTINUE }; MidiBuffer& mb (_midi_port->get_midi_buffer (nframes)); - mb.push_back (offset, 1, &tick_byte); + mb.push_back (offset, 1, &msg); + + DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Continue %1\n", _last_tick)); } void @@ -359,11 +366,11 @@ MidiClockTicker::send_stop_event (pframes_t offset, pframes_t nframes) return; } - DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Stop %1\n", _last_tick)); - - static uint8_t tick_byte = { MIDI_CMD_COMMON_STOP }; + static uint8_t msg = MIDI_CMD_COMMON_STOP; MidiBuffer& mb (_midi_port->get_midi_buffer (nframes)); - mb.push_back (offset, 1, &tick_byte); + mb.push_back (offset, 1, &msg); + + DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Stop %1\n", _last_tick)); } void @@ -387,5 +394,7 @@ MidiClockTicker::send_position_event (uint32_t midi_beats, pframes_t offset, pfr MidiBuffer& mb (_midi_port->get_midi_buffer (nframes)); mb.push_back (offset, 3, &msg[0]); - DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Song Position Sent: %1\n", midi_beats)); + DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Song Position Sent: %1 to %2 (events now %3, buf = %4)\n", midi_beats, _midi_port->name(), + mb.size(), &mb)); + }