diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/midi_ring_buffer.h | 6 | ||||
-rw-r--r-- | libs/ardour/ardour/note.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libs/ardour/ardour/midi_ring_buffer.h b/libs/ardour/ardour/midi_ring_buffer.h index b514ea2bc2..c817866600 100644 --- a/libs/ardour/ardour/midi_ring_buffer.h +++ b/libs/ardour/ardour/midi_ring_buffer.h @@ -368,8 +368,9 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t break; bool success = MidiRingBufferBase<Byte>::full_read(sizeof(double), (Byte*)&ev.time()); - if (success) + if (success) { success = MidiRingBufferBase<Byte>::full_read(sizeof(size_t), (Byte*)&ev.size()); + } if (!success) { std::cerr << "MRB: READ ERROR (time/size)" << std::endl; @@ -377,8 +378,9 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t } Byte first_event_byte; - if(success) + if(success) { success = full_peek(sizeof(Byte), &first_event_byte); + } // could this ever happen??? if (!success) { diff --git a/libs/ardour/ardour/note.h b/libs/ardour/ardour/note.h index 713d732113..f32a2e75f9 100644 --- a/libs/ardour/ardour/note.h +++ b/libs/ardour/ardour/note.h @@ -36,6 +36,7 @@ class Note { public: Note(uint8_t chan=0, double time=0, double dur=0, uint8_t note=0, uint8_t vel=0x40); Note(const Note& copy); + ~Note(); const Note& operator=(const Note& copy); |