summaryrefslogtreecommitdiff
path: root/libs/surfaces/mackie
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-07-07 23:47:31 +0000
committerCarl Hetherington <carl@carlh.net>2010-07-07 23:47:31 +0000
commit28e3215afa99ab7974734a30feedc24ebcd534ab (patch)
tree3401365268952196d18d548e63be864578afe7a0 /libs/surfaces/mackie
parentea23298f10e9587eba483cb54a6f7d75ca68126a (diff)
Fix Mackie surface after port rework.
git-svn-id: svn://localhost/ardour2/branches/3.0@7388 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/mackie')
-rw-r--r--libs/surfaces/mackie/mackie_control_protocol.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index a49c67acc5..f25b31439d 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -16,6 +16,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <fcntl.h>
#include <iostream>
#include <algorithm>
#include <cmath>
@@ -49,6 +50,7 @@
#include "ardour/session.h"
#include "ardour/tempo.h"
#include "ardour/types.h"
+#include "ardour/audioengine.h"
#include "mackie_control_protocol.h"
@@ -577,11 +579,11 @@ void
MackieControlProtocol::create_ports()
{
MIDI::Manager * mm = MIDI::Manager::instance();
- MIDI::Port * midi_port = mm->port (default_port_name);
+ MIDI::Port * midi_port = mm->add_port (new MIDI::Port (default_port_name, O_RDWR, session->engine().jack()));
// open main port
- if (midi_port == 0) {
+ if (!midi_port->ok()) {
ostringstream os;
os << string_compose (_("no MIDI port named \"%1\" exists - Mackie control disabled"), default_port_name);
error << os.str() << endmsg;
@@ -598,8 +600,8 @@ MackieControlProtocol::create_ports()
for (int index = 1; index <= 9; ++index) {
ostringstream os;
os << ext_port_base << index;
- MIDI::Port * midi_port = mm->port (os.str());
- if (midi_port != 0) {
+ MIDI::Port * midi_port = mm->add_port (new MIDI::Port (os.str(), O_RDWR, session->engine().jack()));
+ if (midi_port->ok()) {
add_port (*midi_port, index);
}
}