three recent fixes from 2.0-ongoing (RT on by default, Mackie port name nonsense; processor box no-redisplay flag reset on set_route()
git-svn-id: svn://localhost/ardour2/branches/3.0@5762 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
6368ebcc4c
commit
b893b9a2be
|
@ -215,6 +215,7 @@ EngineControl::EngineControl ()
|
||||||
options_packer.attach (realtime_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
|
options_packer.attach (realtime_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
|
||||||
++row;
|
++row;
|
||||||
|
|
||||||
|
realtime_button.set_active (true);
|
||||||
realtime_button.signal_toggled().connect (mem_fun (*this, &EngineControl::realtime_changed));
|
realtime_button.signal_toggled().connect (mem_fun (*this, &EngineControl::realtime_changed));
|
||||||
realtime_changed ();
|
realtime_changed ();
|
||||||
|
|
||||||
|
|
|
@ -176,6 +176,8 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
|
||||||
{
|
{
|
||||||
connections.clear ();
|
connections.clear ();
|
||||||
|
|
||||||
|
/* new route: any existing block on processor redisplay must be meaningless */
|
||||||
|
no_processor_redisplay = false;
|
||||||
_route = r;
|
_route = r;
|
||||||
|
|
||||||
connections.push_back (_route->processors_changed.connect (
|
connections.push_back (_route->processors_changed.connect (
|
||||||
|
|
|
@ -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::ALSA_Sequencer " << MIDI::Port::ALSA_Sequencer << endl;
|
||||||
cout << "MIDI::Port::Unknown " << MIDI::Port::Unknown << endl;
|
cout << "MIDI::Port::Unknown " << MIDI::Port::Unknown << endl;
|
||||||
#endif
|
#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" );
|
throw MackieControlException( "The Mackie MCU driver will not use a port with device=ardour" );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user