JACK is realtime by default when started by ardour; mackie "ardour" port limitation...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5760 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 90151fb85d516f43a8b1189eff45c35b57fdf83e..fcf57fa8082c8d8637756d26b5f7b979a062e148 100644 (file)
--- 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 caf01725587d559254e535bd6b787853c6c8db72..e55d7b1f44603b2dc423941b60102324f8751edd 100644 (file)
--- 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" );
        }