From 95d974228808b3eacbceb0f520983e3236ce8d30 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 8 Oct 2009 20:02:01 +0000 Subject: [PATCH] JACK is realtime by default when started by ardour; mackie "ardour" port limitation applies only to ALSA sequencer ports git-svn-id: http://subversion.ardour.org/svn/ardour2/ardour2/branches/2.0-ongoing@5760 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/engine_dialog.cc | 1 + libs/surfaces/mackie/mackie_control_protocol.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 90151fb85..fcf57fa80 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -216,6 +216,7 @@ EngineControl::EngineControl () options_packer.attach (realtime_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0); ++row; + realtime_button.set_active (true); /* RT is active by default */ realtime_button.signal_toggled().connect (mem_fun (*this, &EngineControl::realtime_changed)); realtime_changed (); diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index caf017255..e55d7b1f4 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -589,7 +589,7 @@ void MackieControlProtocol::add_port( MIDI::Port & midi_port, int number ) cout << "MIDI::Port::ALSA_Sequencer " << MIDI::Port::ALSA_Sequencer << endl; cout << "MIDI::Port::Unknown " << MIDI::Port::Unknown << endl; #endif - if ( string( midi_port.device() ) == string( "ardour" ) ) + if ( string( midi_port.device() ) == string( "ardour" ) && midi_port.type() == MIDI::Port::ALSA_Sequencer ) { throw MackieControlException( "The Mackie MCU driver will not use a port with device=ardour" ); } -- 2.11.4.GIT