smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

Fix up Mackie control surface to cope with changes to midi++ midi ports from a while back.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7513 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-07-27 03:09:58 +00:00
parent 4f2c3f0fb6
commit fbc946d60d
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -579,8 +579,12 @@ void
MackieControlProtocol::create_ports() MackieControlProtocol::create_ports()
{ {
MIDI::Manager * mm = MIDI::Manager::instance(); MIDI::Manager * mm = MIDI::Manager::instance();
MIDI::Port * midi_input_port = mm->add_port (new MIDI::Port (default_port_name, MIDI::Port::IsInput, session->engine().jack())); MIDI::Port * midi_input_port = mm->add_port (
MIDI::Port * midi_output_port = mm->add_port (new MIDI::Port (default_port_name, MIDI::Port::IsOutput, session->engine().jack())); new MIDI::Port (string_compose (_("%1 in"), default_port_name), MIDI::Port::IsInput, session->engine().jack())
);
MIDI::Port * midi_output_port = mm->add_port (
new MIDI::Port (string_compose (_("%1 out"), default_port_name), MIDI::Port::IsOutput, session->engine().jack())
);
// open main port // open main port
@ -596,13 +600,13 @@ MackieControlProtocol::create_ports()
// open extender ports. Up to 9. Should be enough. // open extender ports. Up to 9. Should be enough.
// could also use mm->get_midi_ports() // could also use mm->get_midi_ports()
string ext_port_base = "mcu_xt_";
for (int index = 1; index <= 9; ++index) { for (int index = 1; index <= 9; ++index) {
ostringstream os; MIDI::Port * midi_input_port = mm->add_port (
os << ext_port_base << index; new MIDI::Port (string_compose (_("mcu_xt_%1 in"), index), MIDI::Port::IsInput, session->engine().jack())
MIDI::Port * midi_input_port = mm->add_port (new MIDI::Port (os.str(), MIDI::Port::IsInput, session->engine().jack())); );
MIDI::Port * midi_output_port = mm->add_port (new MIDI::Port (os.str(), MIDI::Port::IsOutput, session->engine().jack())); MIDI::Port * midi_output_port = mm->add_port (
new MIDI::Port (string_compose (_("mcu_xt_%1 out"), index), MIDI::Port::IsOutput, session->engine().jack())
);
if (midi_input_port->ok() && midi_output_port->ok()) { if (midi_input_port->ok() && midi_output_port->ok()) {
add_port (*midi_input_port, *midi_output_port, index); add_port (*midi_input_port, *midi_output_port, index);
} }

5
libs/surfaces/mackie/mackie_control_protocol_poll.cc
View file

@ -29,12 +29,7 @@ const char * MackieControlProtocol::default_port_name = "mcu";
bool MackieControlProtocol::probe() bool MackieControlProtocol::probe()
{ {
if ( MIDI::Manager::instance()->port(default_port_name) == 0 ) {
info << "Mackie: No MIDI port called " << default_port_name << endmsg;
return false;
} else {
return true; return true;
}
} }
void MackieControlProtocol::handle_port_inactive( SurfacePort * port ) void MackieControlProtocol::handle_port_inactive( SurfacePort * port )