summaryrefslogtreecommitdiff
path: root/drumgizmo/input/jackmidi.cc
diff options
context:
space:
mode:
Diffstat (limited to 'drumgizmo/input/jackmidi.cc')
-rw-r--r--drumgizmo/input/jackmidi.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/drumgizmo/input/jackmidi.cc b/drumgizmo/input/jackmidi.cc
index 7081bf1..2637cc5 100644
--- a/drumgizmo/input/jackmidi.cc
+++ b/drumgizmo/input/jackmidi.cc
@@ -3,7 +3,7 @@
* jackmidi.cc
*
* Mo 25. Jan 11:26:06 CET 2016
- * Copyright 2016 Christian Glöckner
+ * Copyright 2016 Christian Gl�ckner
* cgloeckner@freenet.de
****************************************************************************/
@@ -50,7 +50,7 @@ bool JackMidiInputEngine::init(const Instruments& instruments)
{
if(!loadMidiMap(midimap_file, instruments))
{
- std::cerr << "[MidifileInputEngine] Failed to parse midimap '"
+ std::cerr << "[JackMidiInputEngine] Failed to parse midimap '"
<< midimap_file << "'\n";
return false;
}
@@ -114,7 +114,10 @@ void JackMidiInputEngine::process(jack_nframes_t num_frames)
// It might not be though in case the system is under heavy load.
// Make room for both the new and old events to make sure we don't throw
// anything away.
- events.reserve(events.size() + num_events);
+
+ // FIXME: NarcoticV: Had to comment out the line below on my system
+ // (pipewire-jack), otherwise I got race conditions and crashes.
+ // events.reserve(events.size() + num_events);
for(jack_nframes_t i = 0; i < num_events; ++i)
{