diff options
| -rw-r--r-- | libs/ardour/ardour/smpte.h | 5 | ||||
| -rw-r--r-- | libs/ardour/globals.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/session_events.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/session_midi.cc | 115 | ||||
| -rw-r--r-- | libs/ardour/session_process.cc | 17 | ||||
| -rw-r--r-- | libs/ardour/session_transport.cc | 32 | ||||
| -rw-r--r-- | libs/ardour/smpte.cc | 1 |
7 files changed, 57 insertions, 121 deletions
diff --git a/libs/ardour/ardour/smpte.h b/libs/ardour/ardour/smpte.h index 6a7684c5ba..d0901c372e 100644 --- a/libs/ardour/ardour/smpte.h +++ b/libs/ardour/ardour/smpte.h @@ -30,7 +30,10 @@ enum Wrap { HOURS }; -// FIXME: make this a float +/** SMPTE frame rate (in frames per second). + * + * This should be eliminated in favour of a float to support arbitrary rates. + */ enum FPS { MTC_24_FPS = 0, MTC_25_FPS = 1, diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 82310b3564..a618f17be5 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -168,15 +168,11 @@ setup_midi (AudioEngine& engine) if (default_mmc_port == 0) { warning << string_compose (_("No MMC control (MIDI port \"%1\" not available)"), Config->get_mmc_port_name()) << endmsg; - //return 0; } if (default_mtc_port == 0) { warning << string_compose (_("No MTC support (MIDI port \"%1\" not available)"), Config->get_mtc_port_name()) << endmsg; - } else { - // [DR] - warning << "MTC port available" << endl; } if (default_midi_port == 0) { diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc index 5687e3f733..7e0b6fbef5 100644 --- a/libs/ardour/session_events.cc +++ b/libs/ardour/session_events.cc @@ -120,7 +120,6 @@ Session::queue_event (Event* ev) } } -/* [DR] Always called from audio thread? */ void Session::merge_event (Event* ev) { @@ -311,8 +310,7 @@ Session::process_event (Event* ev) return; } - // FIXME [DR] - printf("Processing event: %s\n", event_names[ev->type]); + //printf("Processing event: %s\n", event_names[ev->type]); switch (ev->type) { case Event::SetLoop: diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index bb3c0018df..91428a8ce4 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -818,6 +818,9 @@ Session::change_midi_ports () } /** Send MTC Full Frame message (complete SMPTE time) for the start of this cycle. + * This resets the MTC code, the next quarter frame message that is sent will be + * the first one with the beginning of this cycle as the new start point. + * * Audio thread only, realtime safe. MIDI::Manager::cycle_start must * have been called with the appropriate nframes parameter this cycle. */ @@ -825,7 +828,7 @@ int Session::send_full_time_code(jack_nframes_t nframes) { /* This function could easily send at a given frame offset, but would - * that be useful? [DR] */ + * that be useful? Does ardour do sub-block accurate locating? [DR] */ MIDI::byte msg[10]; SMPTE::Time smpte; @@ -839,27 +842,14 @@ Session::send_full_time_code(jack_nframes_t nframes) // Get smpte time for this transport frame sample_to_smpte(_transport_frame, smpte, true /* use_offset */, false /* no subframes */); - // Check for negative smpte time and prepare for quarter frame transmission - assert(!smpte.negative); // this shouldn't happen - if (smpte.negative) { - // Negative mtc is not defined, so sync slave to smpte zero. - // When _transport_frame gets there we will start transmitting quarter frames - smpte.hours = 0; - smpte.minutes = 0; - smpte.seconds = 0; - smpte.frames = 0; - smpte.subframes = 0; - smpte.negative = false; - smpte_to_sample( smpte, outbound_mtc_smpte_frame, true, false ); - transmitting_smpte_time = smpte; - } else { - transmitting_smpte_time = smpte; - outbound_mtc_smpte_frame = _transport_frame; - if (((mtc_smpte_bits >> 5) != MIDI::MTC_25_FPS) && (transmitting_smpte_time.frames % 2)) { - // start MTC quarter frame transmission on an even frame - SMPTE::increment( transmitting_smpte_time ); - outbound_mtc_smpte_frame += (jack_nframes_t) _frames_per_smpte_frame; - } + transmitting_smpte_time = smpte; + outbound_mtc_smpte_frame = _transport_frame; + + // I don't understand this bit yet.. [DR] + if (((mtc_smpte_bits >> 5) != MIDI::MTC_25_FPS) && (transmitting_smpte_time.frames % 2)) { + // start MTC quarter frame transmission on an even frame + SMPTE::increment( transmitting_smpte_time ); + outbound_mtc_smpte_frame += (jack_nframes_t) _frames_per_smpte_frame; } // Compensate for audio latency @@ -867,7 +857,7 @@ Session::send_full_time_code(jack_nframes_t nframes) next_quarter_frame_to_send = 0; - // Sync slave to the same smpte time as we are on (except if negative, see above) + // Sync slave to the same SMPTE time as we are on msg[0] = 0xf0; msg[1] = 0x7f; msg[2] = 0x7f; @@ -880,6 +870,8 @@ Session::send_full_time_code(jack_nframes_t nframes) msg[7] = smpte.seconds; msg[8] = smpte.frames; + cerr << "MTC: Sending full time code at " << outbound_mtc_smpte_frame << endl; + // Send message at offset 0, sent time is for the start of this cycle if (!_mtc_port->midimsg (msg, sizeof (msg), 0)) { error << _("Session: could not send full MIDI time code") << endmsg; @@ -889,76 +881,47 @@ Session::send_full_time_code(jack_nframes_t nframes) return 0; } -/** Sends all time code messages for this cycle. + +/** Sends MTC (quarter-frame) messages for this cycle. * Must be called exactly once per cycle from the audio thread. Realtime safe. * This function assumes the state of full SMPTE is sane, eg. the slave is * expecting quarter frame messages and has the right frame of reference (any * full MTC SMPTE time messages that needed to be sent should have been sent - * earlier in the cycle). + * earlier already this cycle by send_full_time_code) */ int Session::send_midi_time_code_for_cycle(jack_nframes_t nframes) { - //cerr << "----------------------" << endl; - - // FIXME: remove, just for debug print statement - static jack_nframes_t last_time = 0; - assert (next_quarter_frame_to_send >= 0); + assert (next_quarter_frame_to_send <= 7); + + if (next_quarter_frame_to_send < 0) + { + printf("Negative????\n"); + } if (_mtc_port == 0 || !send_mtc || transmitting_smpte_time.negative /*|| (next_quarter_frame_to_send < 0)*/ ) { - printf("Not sending MTC\n"); + printf("(MTC) Not sending MTC\n"); return 0; } /* Duration of one quarter frame */ jack_nframes_t quarter_frame_duration = ((long) _frames_per_smpte_frame) >> 2; - // FIXME: what was transmitting_smpte_time before?? - //smpte_time(_transport_frame, transmitting_smpte_time); - //smpte_to_sample( transmitting_smpte_time, outbound_mtc_smpte_frame, true /* use_offset */, false ); - - -#if 0 - if (_send_smpte_update) { - // Send full SMPTE time and reset quarter frames - cerr << "[DR] Sending full SMTPE update" << endl; - // Re-calculate timing of first quarter frame - smpte_to_sample( transmitting_smpte_time, outbound_mtc_smpte_frame, true /* use_offset */, false ); - // Compensate for audio latency - //outbound_mtc_smpte_frame += _worst_output_latency; - send_full_time_code(nframes); - _send_smpte_update = false; - next_quarter_frame_to_send = 0; - } -#endif + //cerr << "(MTC) TR: " << _transport_frame << " - SF: " << outbound_mtc_smpte_frame + //<< " - NQ: " << next_quarter_frame_to_send << " - FD" << quarter_frame_duration << endl; + + // FIXME: this should always be true + //assert((outbound_mtc_smpte_frame + (next_quarter_frame_to_send * quarter_frame_duration)) + // > _transport_frame); - //cerr << "A - " << _transport_frame << " - " << outbound_mtc_smpte_frame - //<< " - " << next_quarter_frame_to_send << " - " << quarter_frame_duration << endl; - - // Note: Unlike the previous implementation of this function (for slow MIDI I/O), - // this now sends all MTC messages for _this_ frame, not messages from the past - // up until the start of the current frame (any messages in the past must have - // been sent last cycle). This assertion enforces this: - //assert(outbound_mtc_smpte_frame >= _transport_frame - // && (outbound_mtc_smpte_frame - _transport_frame) < nframes); - /*if ( ! (outbound_mtc_smpte_frame >= _transport_frame - && (outbound_mtc_smpte_frame - _transport_frame) < nframes)) { */ - if (outbound_mtc_smpte_frame + (next_quarter_frame_to_send * quarter_frame_duration) - < _transport_frame) { - cerr << "[MTC] ERROR: MTC message stamped " << outbound_mtc_smpte_frame - << " in cycle starting " << _transport_frame << endl; - return 0; - } else { - //cerr << "[MTC] OK" << endl; - } // Send quarter frames for this cycle while (_transport_frame + nframes > (outbound_mtc_smpte_frame + (next_quarter_frame_to_send * quarter_frame_duration))) { - //cerr << "B: Next frame to send: " << next_quarter_frame_to_send << endl; + //cerr << "(MTC) Next frame to send: " << next_quarter_frame_to_send << endl; switch (next_quarter_frame_to_send) { case 0: @@ -986,9 +949,11 @@ Session::send_midi_time_code_for_cycle(jack_nframes_t nframes) mtc_msg[1] = 0x70 | (((mtc_smpte_bits|transmitting_smpte_time.hours) & 0xf0) >> 4); break; } - - jack_nframes_t msg_time = (outbound_mtc_smpte_frame + + const jack_nframes_t msg_time = (outbound_mtc_smpte_frame + (quarter_frame_duration * next_quarter_frame_to_send)); + + // This message must fall within this block or something is broken assert(msg_time >= _transport_frame); assert(msg_time < _transport_frame + nframes); @@ -1001,7 +966,7 @@ Session::send_midi_time_code_for_cycle(jack_nframes_t nframes) return -1; } - /*cerr << "smpte = " << transmitting_smpte_time.hours + /*cerr << "(MTC) SMPTE: " << transmitting_smpte_time.hours << ":" << transmitting_smpte_time.minutes << ":" << transmitting_smpte_time.seconds << ":" << transmitting_smpte_time.frames @@ -1009,8 +974,6 @@ Session::send_midi_time_code_for_cycle(jack_nframes_t nframes) << ", stamp = " << out_stamp << ", delta = " << _transport_frame + out_stamp - last_time << endl;*/ - last_time = _transport_frame + out_stamp; - // Increment quarter frame counter next_quarter_frame_to_send++; @@ -1186,6 +1149,10 @@ Session::deliver_midi (MIDI::Port * port, MIDI::byte* buf, int32_t bufsize) } #if 0 + +This is aaalll gone. + + void Session::deliver_midi_message (MIDI::Port * port, MIDI::eventType ev, MIDI::channel_t ch, MIDI::EventTwoBytes data) { diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 2f35bbfee2..ba66d3ea2d 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -278,10 +278,11 @@ Session::process_with_events (jack_nframes_t nframes) process_event (ev); } - /* Events caused a transport change and we need to send MTC - * [DR] FIXME: best place for this? */ + /* Events caused a transport change, send an MTC Full Frame (SMPTE) message. + * This is sent whether rolling or not, to give slaves an idea of ardour time + * on locates (and allow slow slaves to position and prepare for rolling) + */ if (_send_smpte_update) { - cerr << "[DR] TIME CHANGE\n" << endl; send_full_time_code(nframes); } @@ -289,7 +290,7 @@ Session::process_with_events (jack_nframes_t nframes) no_roll (nframes, 0); return; } - + if (events.empty() || next_event == events.end()) { process_without_events (nframes); return; @@ -319,6 +320,8 @@ Session::process_with_events (jack_nframes_t nframes) no_roll (nframes, 0); return; } + + send_midi_time_code_for_cycle(nframes); if (actively_recording()) { stop_limit = max_frames; @@ -420,8 +423,6 @@ Session::process_with_events (jack_nframes_t nframes) if (session_needs_butler) summon_butler (); - - send_midi_time_code_for_cycle(nframes); } void @@ -760,6 +761,8 @@ Session::process_without_events (jack_nframes_t nframes) no_roll (nframes, 0); return; } + + send_midi_time_code_for_cycle(nframes); if (actively_recording()) { stop_limit = max_frames; @@ -800,8 +803,6 @@ Session::process_without_events (jack_nframes_t nframes) } /* implicit release of route lock */ - send_midi_time_code_for_cycle(nframes); - if (session_needs_butler) summon_butler (); } diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 313e56ed20..45ef3812d1 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -596,16 +596,12 @@ Session::locate (jack_nframes_t target_frame, bool with_roll, bool with_flush, b return; } + // Update SMPTE time + // [DR] FIXME: find out exactly where this should go below _transport_frame = target_frame; smpte_time(_transport_frame, transmitting_smpte_time); outbound_mtc_smpte_frame = _transport_frame; next_quarter_frame_to_send = 0; - cerr << "[DR] LOCATE ----------" << endl; - cerr << "\t_transport_frame = " << _transport_frame << endl; - cerr << "\ttransmitting_smpte_time = " << string_compose("%1:%2:%3:%4", - transmitting_smpte_time.hours,transmitting_smpte_time.minutes, - transmitting_smpte_time.seconds,transmitting_smpte_time.frames) << endl; - cerr << "-------------" << endl; if (_transport_speed && (!with_loop || loop_changing)) { /* schedule a declick. we'll be called again when its done */ @@ -893,18 +889,6 @@ Session::actually_start_transport () send_mmc_in_another_thread (MIDI::MachineControl::cmdDeferredPlay, 0); */ - // [DR] Update SMPTE time from transport frame - smpte_time(_transport_frame, transmitting_smpte_time); - outbound_mtc_smpte_frame = _transport_frame; - next_quarter_frame_to_send = 0; - - cerr << "[DR] ACTUALLY START TRANSPORT ----------" << endl; - cerr << "\t_transport_frame = " << _transport_frame << endl; - cerr << "\ttransmitting_smpte_time = " << string_compose("%1:%2:%3:%4", - transmitting_smpte_time.hours,transmitting_smpte_time.minutes, - transmitting_smpte_time.seconds,transmitting_smpte_time.frames) << endl; - cerr << "-------------" << endl; - TransportStateChange (); /* EMIT SIGNAL */ } @@ -941,18 +925,6 @@ Session::post_transport () set_next_event (); post_transport_work = PostTransportWork (0); - - // [DR] Update SMPTE time from transport frame - smpte_time(_transport_frame, transmitting_smpte_time); - outbound_mtc_smpte_frame = _transport_frame; - next_quarter_frame_to_send = 0; - - cerr << "[DR] POST TRANSPORT ----------" << endl; - cerr << "\t_transport_frame = " << _transport_frame << endl; - cerr << "\ttransmitting_smpte_time = " << string_compose("%1:%2:%3:%4", - transmitting_smpte_time.hours,transmitting_smpte_time.minutes, - transmitting_smpte_time.seconds,transmitting_smpte_time.frames) << endl; - cerr << "-------------" << endl; } void diff --git a/libs/ardour/smpte.cc b/libs/ardour/smpte.cc index 17e5a6b42b..9ee582b802 100644 --- a/libs/ardour/smpte.cc +++ b/libs/ardour/smpte.cc @@ -32,7 +32,6 @@ FPS Time::default_rate = MTC_30_FPS; Wrap increment( Time& smpte ) { - //Wrap wrap = NONE; Wrap wrap = NONE; if (smpte.negative) { |