summaryrefslogtreecommitdiff
path: root/libs/ardour/session_midi.cc
diff options
context:
space:
mode:
authorHans Baier <hansfbaier@googlemail.com>2008-08-06 22:22:35 +0000
committerHans Baier <hansfbaier@googlemail.com>2008-08-06 22:22:35 +0000
commit8164a0992d005659fe4cce1dce12f6464438f371 (patch)
tree5f1a95ee980d5f08f80dd1843275c98ed69b9a39 /libs/ardour/session_midi.cc
parent6954080ce18e0eee08361c02b1f25bd4512e9d90 (diff)
* fixed JACK_MidiPort to get the events into the slave
git-svn-id: svn://localhost/ardour2/branches/3.0@3662 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_midi.cc')
-rw-r--r--libs/ardour/session_midi.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index a807c5e98b..dd927a3add 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -333,6 +333,8 @@ Session::set_trace_midi_input (bool yn, MIDI::Port* port)
{
MIDI::Parser* input_parser;
+ cerr << "enabling tracing: " << yn << " for input port " << port->name() << endl;
+
if (port) {
if ((input_parser = port->input()) != 0) {
input_parser->trace (yn, &cout, "input: ");
@@ -356,6 +358,15 @@ Session::set_trace_midi_input (bool yn, MIDI::Port* port)
input_parser->trace (yn, &cout, "input: ");
}
}
+
+ if (_midi_clock_port
+ && _midi_clock_port != _mmc_port
+ && _midi_clock_port != _mtc_port
+ && _midi_clock_port != _midi_port) {
+ if ((input_parser = _midi_clock_port->input()) != 0) {
+ input_parser->trace (yn, &cout, "input: ");
+ }
+ }
}
Config->set_trace_midi_input (yn);
@@ -1152,9 +1163,7 @@ Session::midi_thread_work ()
nfds++;
}
- cerr << "before handling midi clock port" << endl;
if (_midi_clock_port && (_midi_clock_port != _mmc_port || !Config->get_mmc_control()) && _midi_clock_port->selectable() >= 0) {
- cerr << "inside handling midi clock port" << endl;
pfd[nfds].fd = _midi_clock_port->selectable();
pfd[nfds].events = POLLIN|POLLHUP|POLLERR;
ports[nfds] = _midi_clock_port;