diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-24 19:29:45 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-24 19:29:45 -0400 |
| commit | 9ac6bb9befa047a6c349bed02d40da84600b67cc (patch) | |
| tree | 5b88f453b8f43d2a43b31cb15b0b50acd6f9eb4a /libs/surfaces | |
| parent | 3d95822716d2e52b54a5bdbe7be4478ab034f8db (diff) | |
part-way through getting the audioengine changes to compile
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/surface_port.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index cfa6524f70..ffda2435d0 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1236,7 +1236,7 @@ MackieControlProtocol::midi_input_handler (IOCondition ioc, MIDI::Port* port) } DEBUG_TRACE (DEBUG::MackieControl, string_compose ("data available on %1\n", port->name())); - framepos_t now = session->engine().frame_time(); + framepos_t now = session->engine().sample_time(); port->parse (now); } diff --git a/libs/surfaces/mackie/surface_port.cc b/libs/surfaces/mackie/surface_port.cc index 9f52f0dccd..44db30ab1b 100644 --- a/libs/surfaces/mackie/surface_port.cc +++ b/libs/surfaces/mackie/surface_port.cc @@ -59,10 +59,10 @@ SurfacePort::SurfacePort (Surface& s) _input_port = new MIDI::IPMIDIPort (_surface->mcp().ipmidi_base() +_surface->number()); _output_port = _input_port; } else { - jack_client_t* jack = MackieControlProtocol::instance()->get_session().engine().jack(); + ARDOUR::PortEngine& port_engine (ARDOUR::AudioEngine::instance()->port_engine()); - _input_port = new MIDI::JackMIDIPort (string_compose (_("%1 in"), _surface->name()), MIDI::Port::IsInput, jack); - _output_port =new MIDI::JackMIDIPort (string_compose (_("%1 out"), _surface->name()), MIDI::Port::IsOutput, jack); + _input_port = new MIDI::JackMIDIPort (string_compose (_("%1 in"), _surface->name()), MIDI::Port::IsInput, port_engine); + _output_port =new MIDI::JackMIDIPort (string_compose (_("%1 out"), _surface->name()), MIDI::Port::IsOutput, port_engine); /* MackieControl has its own thread for handling input from the input * port, and we don't want anything handling output from the output |