diff options
| author | David Robillard <d@drobilla.net> | 2011-03-15 01:16:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-03-15 01:16:24 +0000 |
| commit | be3002c239219e0829dc24ae7e1f93af557c4cf8 (patch) | |
| tree | 7aadcc4d17ec31232f5f78db1f40f73a0cbfc9ee /libs/ardour/midi_port.cc | |
| parent | 148c1f805bca9d459d9a24a6b5c8d5f277680a9e (diff) | |
Fix more broken whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@9152 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_port.cc')
| -rw-r--r-- | libs/ardour/midi_port.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc index 52aa7e6005..1ebc1de3fa 100644 --- a/libs/ardour/midi_port.cc +++ b/libs/ardour/midi_port.cc @@ -41,7 +41,7 @@ MidiPort::~MidiPort() void MidiPort::cycle_start (pframes_t nframes) { - Port::cycle_start (nframes); + Port::cycle_start (nframes); _buffer->clear (); @@ -76,20 +76,20 @@ MidiPort::get_midi_buffer (pframes_t nframes) jack_midi_event_get (&ev, jack_buffer, i); - if (ev.buffer[0] == 0xfe) { - /* throw away active sensing */ - continue; - } + if (ev.buffer[0] == 0xfe) { + /* throw away active sensing */ + continue; + } - /* check that the event is in the acceptable time range */ + /* check that the event is in the acceptable time range */ if ((ev.time >= (_global_port_buffer_offset + _port_buffer_offset)) && - (ev.time < (_global_port_buffer_offset + _port_buffer_offset + nframes))) { + (ev.time < (_global_port_buffer_offset + _port_buffer_offset + nframes))) { _buffer->push_back (ev); } else { cerr << "Dropping incoming MIDI at time " << ev.time << "; offset=" - << _global_port_buffer_offset << " limit=" - << (_global_port_buffer_offset + _port_buffer_offset + nframes) << "\n"; + << _global_port_buffer_offset << " limit=" + << (_global_port_buffer_offset + _port_buffer_offset + nframes) << "\n"; } } @@ -145,13 +145,13 @@ MidiPort::flush_buffers (pframes_t nframes, framepos_t time) if (ev.time() >= _global_port_buffer_offset + _port_buffer_offset) { if (jack_midi_event_write (jack_buffer, (jack_nframes_t) ev.time(), ev.buffer(), ev.size()) != 0) { - cerr << "write failed, drop flushed note off on the floor, time " - << ev.time() << " > " << _global_port_buffer_offset + _port_buffer_offset << endl; - } - } else { - cerr << "drop flushed event on the floor, time " << ev.time() - << " < " << _global_port_buffer_offset + _port_buffer_offset << endl; - } + cerr << "write failed, drop flushed note off on the floor, time " + << ev.time() << " > " << _global_port_buffer_offset + _port_buffer_offset << endl; + } + } else { + cerr << "drop flushed event on the floor, time " << ev.time() + << " < " << _global_port_buffer_offset + _port_buffer_offset << endl; + } } } } |