diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-09 20:05:18 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-09 20:05:18 +0000 |
| commit | 498dfebcca3b97cdd7b83444040042fe06626241 (patch) | |
| tree | 09b397ba40679e67a1a265e6d227e39ee0b4b4da /libs/ardour/session_midi.cc | |
| parent | 8f508460903ef628a3f34ee60611b75ed4e1a734 (diff) | |
90% done with external sync design changes (GUI now has toggle switch for ext/int sync; source chosen separately, currently in ardour prefs dialog ; fix libmidi++ and compilation scripts to correctly build JACK+ALSA support; minor contiuing tweaks on transport stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@6048 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_midi.cc')
| -rw-r--r-- | libs/ardour/session_midi.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index f7ee8ef3c9..34d9b470f5 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -141,6 +141,8 @@ Session::set_mtc_port (string port_tag) ms->rebind (*port); } + cerr << "!!SPT to " << port_tag << endl; + Config->set_mtc_port_name (port_tag); out: @@ -494,7 +496,7 @@ Session::setup_midi_control () void Session::spp_start (Parser &, nframes_t /*timestamp*/) { - if (Config->get_mmc_control() && (Config->get_slave_source() != MTC)) { + if (Config->get_mmc_control() && (config.get_external_sync() && config.get_sync_source() != MTC)) { request_transport_speed (1.0); } } @@ -516,7 +518,7 @@ Session::spp_stop (Parser&, nframes_t /*timestamp*/) void Session::midi_clock_start (Parser& ignored, nframes_t timestamp) { - if (Config->get_slave_source() == MIDIClock) { + if (config.get_external_sync() && (config.get_sync_source() == MIDIClock)) { request_transport_speed (1.0); } } @@ -530,7 +532,7 @@ Session::midi_clock_continue (Parser& parser, nframes_t timestamp) void Session::midi_clock_stop (Parser& ignored, nframes_t timestamp) { - if (Config->get_slave_source() == MIDIClock) { + if (config.get_external_sync() && (config.get_slave_source() == MIDIClock)) { request_stop (); } } @@ -539,7 +541,7 @@ Session::midi_clock_stop (Parser& ignored, nframes_t timestamp) void Session::mmc_deferred_play (MIDI::MachineControl &/*mmc*/) { - if (Config->get_mmc_control() && (Config->get_slave_source() != MTC)) { + if (Config->get_mmc_control() && (config.get_external_sync() && (config.get_sync_source() != MTC))) { request_transport_speed (1.0); } } |