fixes for desirable playback when using seamless looping.

[ardour.git] / libs / ardour / session_midi.cc

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 6d3083df7736deb09f1376969388af970102a25c..7becd9c667035ff2823490a00647d8fef95688d9 100644 (file)
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -22,8 +22,6 @@
 #include <cerrno>
 #include <cassert>
 #include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
 
 #include <boost/shared_ptr.hpp>
 
@@ -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"
 
@@ -349,7 +349,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,7 +418,7 @@ 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;
@@ -426,7 +426,7 @@ Session::send_full_time_code (framepos_t const t, pframes_t nframes)
        // 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 +440,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 +512,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));
@@ -552,6 +552,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,6 +608,7 @@ 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;
@@ -645,3 +656,27 @@ Session::mmc_input_port () const
 {
        return _midi_ports->mmc_input_port ();
 }
+
+MIDI::Port*
+Session::scene_output_port () const
+{
+       return _midi_ports->scene_output_port ();
+}
+
+MIDI::Port*
+Session::scene_input_port () const
+{
+       return _midi_ports->scene_input_port ();
+}
+
+boost::shared_ptr<MidiPort>
+Session::scene_in () const
+{
+       return _midi_ports->scene_in ();
+}
+
+boost::shared_ptr<MidiPort>
+Session::scene_out () const
+{
+       return _midi_ports->scene_out ();
+}