ardour/livetrax
13
0
Fork 0
Code

three recent fixes from 2.0-ongoing (RT on by default, Mackie port name nonsense; processor box no-redisplay flag reset on set_route()

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5762 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-10-08 21:56:16 +00:00
parent 6368ebcc4c
commit b893b9a2be
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/engine_dialog.cc
View File

@ -215,6 +215,7 @@ EngineControl::EngineControl ()
options_packer.attach (realtime_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
++row;
realtime_button.set_active (true);
realtime_button.signal_toggled().connect (mem_fun (*this, &EngineControl::realtime_changed));
realtime_changed ();

2
gtk2_ardour/processor_box.cc
View File

@ -176,6 +176,8 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
{
connections.clear ();
/* new route: any existing block on processor redisplay must be meaningless */
no_processor_redisplay = false;
_route = r;
connections.push_back (_route->processors_changed.connect (

2
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -591,7 +591,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" );
}