X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_midi.cc;h=baff2c7bfec9b5140de01d5727977b26f40e5b32;hb=22ea6423cd274bf57ea687ddbd738ae734fc4e5c;hp=6d3083df7736deb09f1376969388af970102a25c;hpb=1c49138e0099db37931b34fad552b43c332e187d;p=ardour.git diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index 6d3083df77..baff2c7bfe 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -22,8 +22,6 @@ #include #include #include -#include -#include #include @@ -34,6 +32,8 @@ #include "pbd/error.h" #include "pbd/pthread_utils.h" +#include "pbd/timersub.h" +#include "pbd/stacktrace.h" #include "timecode/time.h" @@ -43,6 +43,7 @@ #include "ardour/midi_port.h" #include "ardour/midi_track.h" #include "ardour/midi_ui.h" +#include "ardour/profile.h" #include "ardour/session.h" #include "ardour/slave.h" #include "ardour/ticker.h" @@ -129,6 +130,19 @@ Session::mmc_record_pause (MIDI::MachineControl &/*mmc*/) void Session::mmc_record_strobe (MIDI::MachineControl &/*mmc*/) { + if (Profile->get_trx()) { + + /* In Tracks Live, there is no concept of punch, so we just + treat RecordStrobe like RecordPause. This violates the MMC + specification. + */ + + if (Config->get_mmc_control()) { + maybe_enable_record(); + } + return; + } + if (!Config->get_mmc_control() || (_step_editors > 0)) { return; } @@ -336,7 +350,7 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled) if ((at = dynamic_cast((*i).get())) != 0) { if (trk == at->remote_control_id()) { - at->set_record_enabled (enabled, &mmc); + at->set_record_enabled (enabled, Controllable::UseGroup); break; } } @@ -349,7 +363,7 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled) * @param t time to send. */ int -Session::send_full_time_code (framepos_t const t, pframes_t nframes) +Session::send_full_time_code (framepos_t const t, MIDI::pframes_t nframes) { /* This function could easily send at a given frame offset, but would * that be useful? Does ardour do sub-block accurate locating? [DR] */ @@ -418,15 +432,15 @@ Session::send_full_time_code (framepos_t const t, pframes_t nframes) msg[4] = 0x1; msg[9] = 0xf7; - msg[5] = mtc_timecode_bits | timecode.hours; + msg[5] = mtc_timecode_bits | (timecode.hours % 24); msg[6] = timecode.minutes; msg[7] = timecode.seconds; msg[8] = timecode.frames; // Send message at offset 0, sent time is for the start of this cycle - + MidiBuffer& mb (_midi_ports->mtc_output_port()->get_midi_buffer (nframes)); - mb.push_back (0, sizeof (msg), msg); + mb.push_back (Port::port_offset(), sizeof (msg), msg); _pframes_since_last_mtc = 0; return 0; @@ -440,7 +454,7 @@ Session::send_full_time_code (framepos_t const t, pframes_t nframes) * earlier already this cycle by send_full_time_code) */ int -Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_frame, pframes_t nframes) +Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_frame, ARDOUR::pframes_t nframes) { if (_engine.freewheeling() || !_send_qf_mtc || transmitting_timecode_time.negative || (next_quarter_frame_to_send < 0)) { // cerr << "(MTC) Not sending MTC\n"; @@ -512,7 +526,7 @@ Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_f assert (msg_time < end_frame); /* convert from session frames back to JACK frames using the transport speed */ - pframes_t const out_stamp = (msg_time - start_frame) / _transport_speed; + ARDOUR::pframes_t const out_stamp = (msg_time - start_frame) / _transport_speed; assert (out_stamp < nframes); MidiBuffer& mb (_midi_ports->mtc_output_port()->get_midi_buffer(nframes)); @@ -523,11 +537,13 @@ Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_f } #ifndef NDEBUG - DEBUG_STR_DECL(foo) - DEBUG_STR_APPEND(foo,"sending "); - DEBUG_STR_APPEND(foo, transmitting_timecode_time); - DEBUG_TRACE (DEBUG::MTC, string_compose ("%1 qfm = %2, stamp = %3\n", DEBUG_STR(foo).str(), next_quarter_frame_to_send, - out_stamp)); + if (DEBUG_ENABLED(DEBUG::MTC)) { + DEBUG_STR_DECL(foo) + DEBUG_STR_APPEND(foo,"sending "); + DEBUG_STR_APPEND(foo, transmitting_timecode_time); + DEBUG_TRACE (DEBUG::MTC, string_compose ("%1 qfm = %2, stamp = %3\n", DEBUG_STR(foo).str(), next_quarter_frame_to_send, + out_stamp)); + } #endif // Increment quarter frame counter @@ -552,6 +568,16 @@ Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_f OUTBOUND MMC STUFF **********************************************************************/ +void +Session::send_immediate_mmc (MachineControlCommand c) +{ + if (AudioEngine::instance()->in_process_thread()) { + _mmc->send (c, Port::port_offset()); + } else { + _mmc->send (c, 0); + } + +} bool Session::mmc_step_timeout () @@ -598,50 +624,67 @@ Session::send_song_position_pointer (framepos_t) int Session::start_midi_thread () { + if (midi_control_ui) { return 0; } midi_control_ui = new MidiControlUI (*this); midi_control_ui->run (); return 0; } -MIDI::Port* +boost::shared_ptr Session::midi_input_port () const { return _midi_ports->midi_input_port (); } -MIDI::Port* + +boost::shared_ptr Session::midi_output_port () const { return _midi_ports->midi_output_port (); } -boost::shared_ptr + +boost::shared_ptr +Session::mmc_output_port () const +{ + return _midi_ports->mmc_output_port (); +} + +boost::shared_ptr +Session::mmc_input_port () const +{ + return _midi_ports->mmc_input_port (); +} + +boost::shared_ptr +Session::scene_output_port () const +{ + return _midi_ports->scene_output_port (); +} + +boost::shared_ptr +Session::scene_input_port () const +{ + return _midi_ports->scene_input_port (); +} + +boost::shared_ptr Session::midi_clock_output_port () const { return _midi_ports->midi_clock_output_port (); } -boost::shared_ptr + +boost::shared_ptr Session::midi_clock_input_port () const { return _midi_ports->midi_clock_input_port (); } -boost::shared_ptr +boost::shared_ptr Session::mtc_output_port () const { return _midi_ports->mtc_output_port (); } -boost::shared_ptr +boost::shared_ptr Session::mtc_input_port () const { return _midi_ports->mtc_input_port (); } -MIDI::Port* -Session::mmc_output_port () const -{ - return _midi_ports->mmc_output_port (); -} - -MIDI::Port* -Session::mmc_input_port () const -{ - return _midi_ports->mmc_input_port (); -}