fix conflicts and merge with master

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

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 07a34283e344f56be4f69eb27e8ebdf1ea3657a0..63cba68df1f1d6bc9bec8e06c6a6b3cb382b1d5c 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,7 @@
 
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
+#include "pbd/timersub.h"
 
 #include "timecode/time.h"
 
@@ -425,7 +424,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 (AudioEngine::instance()->mtc_output_port()->get_midi_buffer (nframes));
+       MidiBuffer& mb (_midi_ports->mtc_output_port()->get_midi_buffer (nframes));
        mb.push_back (0, sizeof (msg), msg);
 
        _pframes_since_last_mtc = 0;
@@ -440,7 +439,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,10 +511,10 @@ 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 (AudioEngine::instance()->mtc_output_port()->get_midi_buffer(nframes));
+               MidiBuffer& mb (_midi_ports->mtc_output_port()->get_midi_buffer(nframes));
                if (!mb.push_back (out_stamp, 2, mtc_msg)) {
                        error << string_compose(_("Session: cannot send quarter-frame MTC message (%1)"), strerror (errno))
                              << endmsg;
@@ -603,3 +602,45 @@ Session::start_midi_thread ()
        return 0;
 }
 
+MIDI::Port* 
+Session::midi_input_port () const
+{
+       return _midi_ports->midi_input_port ();
+}
+MIDI::Port* 
+Session::midi_output_port () const
+{
+       return _midi_ports->midi_output_port ();
+}
+boost::shared_ptr<MidiPort> 
+Session::midi_clock_output_port () const
+{
+       return _midi_ports->midi_clock_output_port ();
+}
+boost::shared_ptr<MidiPort> 
+Session::midi_clock_input_port () const
+{
+       return _midi_ports->midi_clock_input_port ();
+}
+boost::shared_ptr<MidiPort> 
+Session::mtc_output_port () const
+{
+       return _midi_ports->mtc_output_port ();
+}
+boost::shared_ptr<MidiPort> 
+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 ();
+}