diff options
Diffstat (limited to 'libs/ardour/session_midi.cc')
| -rw-r--r-- | libs/ardour/session_midi.cc | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index d0e75fbb6e..87b9e5e861 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -45,7 +45,7 @@ #include "ardour/midi_ui.h" #include "ardour/profile.h" #include "ardour/session.h" -#include "ardour/slave.h" +#include "ardour/transport_master.h" #include "ardour/ticker.h" #include "pbd/i18n.h" @@ -306,9 +306,9 @@ Session::mmc_locate (MIDI::MachineControl &/*mmc*/, const MIDI::byte* mmc_tc) of an MTC slave to become out of date. Catch this. */ - MTC_Slave* mtcs = dynamic_cast<MTC_Slave*> (_slave); + boost::shared_ptr<MTC_TransportMaster> mtcs = boost::dynamic_pointer_cast<MTC_TransportMaster> (transport_master()); - if (mtcs != 0) { + if (mtcs) { // cerr << "Locate *with* MTC slave\n"; mtcs->handle_locate (mmc_tc); } else { @@ -402,7 +402,7 @@ Session::send_full_time_code (samplepos_t const t, MIDI::pframes_t nframes) if (_engine.freewheeling() || !Config->get_send_mtc()) { return 0; } - if (_slave && !_slave->locked()) { + if (!transport_master()->locked()) { return 0; } @@ -486,7 +486,7 @@ Session::send_midi_time_code_for_cycle (samplepos_t start_sample, samplepos_t en // cerr << "(MTC) Not sending MTC\n"; return 0; } - if (_slave && !_slave->locked()) { + if (!transport_master()->locked()) { return 0; } @@ -707,21 +707,12 @@ 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 (); -} void Session::midi_track_presentation_info_changed (PropertyChange const& what_changed, boost::weak_ptr<MidiTrack> mt) |