diff options
author | Devin Anderson <surfacepatterns (at) gmail (dot) com> | 2011-03-23 02:44:24 -0700 |
---|---|---|
committer | Devin Anderson <surfacepatterns (at) gmail (dot) com> | 2011-03-23 02:44:24 -0700 |
commit | e2683cb02435b91f43dfbc943c31831a55881bf5 (patch) | |
tree | b0f7f72e1d65b6706cd7e32f6f8e2f5f5fe44d89 /common/JackMidiPort.cpp | |
parent | 4ced89b41c7bb0d67d074439044e3fcd29e51d00 (diff) | |
download | jack2-e2683cb02435b91f43dfbc943c31831a55881bf5.tar.gz |
Fix 'alsarawmidi' driver so that it actually works. Add functionality to 'midi_latency_test'. Fix bug in raw write queue implementation. Output error message when a source MIDI port isn't valid during mixdown. Output error messages for error conditions detected in buffer read and write queues.
Diffstat (limited to 'common/JackMidiPort.cpp')
-rw-r--r-- | common/JackMidiPort.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common/JackMidiPort.cpp b/common/JackMidiPort.cpp index 42ee245c..5bd82341 100644 --- a/common/JackMidiPort.cpp +++ b/common/JackMidiPort.cpp @@ -55,7 +55,6 @@ SERVER_EXPORT jack_midi_data_t* JackMidiBuffer::ReserveEvent(jack_nframes_t time lost_events++; return 0; } - JackMidiEvent* event = &events[event_count++]; event->time = time; event->size = size; @@ -90,7 +89,7 @@ static void MidiBufferMixdown(void* mixbuffer, void** src_buffers, int src_count { JackMidiBuffer* mix = static_cast<JackMidiBuffer*>(mixbuffer); if (!mix->IsValid()) { - jack_error("MIDI: invalid mix buffer"); + jack_error("Jack::MidiBufferMixdown - invalid mix buffer"); return; } mix->Reset(nframes); @@ -98,8 +97,10 @@ static void MidiBufferMixdown(void* mixbuffer, void** src_buffers, int src_count int event_count = 0; for (int i = 0; i < src_count; ++i) { JackMidiBuffer* buf = static_cast<JackMidiBuffer*>(src_buffers[i]); - if (!buf->IsValid()) + if (!buf->IsValid()) { + jack_error("Jack::MidiBufferMixdown - invalid source buffer"); return; + } buf->mix_index = 0; event_count += buf->event_count; mix->lost_events += buf->lost_events; |