projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accommodate newly introduced source(s) in our MSVC project (cairocanvas)
[ardour.git]
/
libs
/
ardour
/
midi_ring_buffer.cc
diff --git
a/libs/ardour/midi_ring_buffer.cc
b/libs/ardour/midi_ring_buffer.cc
index 3923e5306a0da17fef85d6364ddf26f14a66001d..187de574b67577e6ecd6eaa8f4f88cca48f8e6d4 100644
(file)
--- a/
libs/ardour/midi_ring_buffer.cc
+++ b/
libs/ardour/midi_ring_buffer.cc
@@
-37,7
+37,7
@@
namespace ARDOUR {
*/
template<typename T>
size_t
*/
template<typename T>
size_t
-MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset, bool stop_on_overflow_in_dst)
+MidiRingBuffer<T>::read
(MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset, bool stop_on_overflow_in_dst)
{
if (this->read_space() == 0) {
return 0;
{
if (this->read_space() == 0) {
return 0;
@@
-65,13
+65,13
@@
MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
}
if (ev_time >= end) {
}
if (ev_time >= end) {
- DEBUG_TRACE (DEBUG::Midi
DiskstreamIO
, string_compose ("MRB event @ %1 past end @ %2\n", ev_time, end));
+ DEBUG_TRACE (DEBUG::Midi
RingBuffer
, string_compose ("MRB event @ %1 past end @ %2\n", ev_time, end));
break;
} else if (ev_time < start) {
break;
} else if (ev_time < start) {
- DEBUG_TRACE (DEBUG::Midi
DiskstreamIO
, string_compose ("MRB event @ %1 before start @ %2\n", ev_time, start));
+ DEBUG_TRACE (DEBUG::Midi
RingBuffer
, string_compose ("MRB event @ %1 before start @ %2\n", ev_time, start));
break;
} else {
break;
} else {
- DEBUG_TRACE (DEBUG::Midi
DiskstreamIO
, string_compose ("MRB event @ %1 in range %2 .. %3\n", ev_time, start, end));
+ DEBUG_TRACE (DEBUG::Midi
RingBuffer
, string_compose ("MRB event @ %1 in range %2 .. %3\n", ev_time, start, end));
}
ev_time -= start;
}
ev_time -= start;
@@
-83,7
+83,7
@@
MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
this->increment_read_ptr (prefix_size);
uint8_t status;
this->increment_read_ptr (prefix_size);
uint8_t status;
- bool r = this->peek (&status, sizeof(uint8_t));
+ bool r = this->peek (&status, sizeof(uint8_t));
assert (r); // If this failed, buffer is corrupt, all hope is lost
/* lets see if we are going to be able to write this event into dst.
assert (r); // If this failed, buffer is corrupt, all hope is lost
/* lets see if we are going to be able to write this event into dst.
@@
-91,7
+91,7
@@
MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
uint8_t* write_loc = dst.reserve (ev_time, ev_size);
if (write_loc == 0) {
if (stop_on_overflow_in_dst) {
uint8_t* write_loc = dst.reserve (ev_time, ev_size);
if (write_loc == 0) {
if (stop_on_overflow_in_dst) {
- DEBUG_TRACE (DEBUG::Midi
DiskstreamIO
, string_compose ("MidiRingBuffer: overflow in destination MIDI buffer, stopped after %1 events\n", count));
+ DEBUG_TRACE (DEBUG::Midi
RingBuffer
, string_compose ("MidiRingBuffer: overflow in destination MIDI buffer, stopped after %1 events\n", count));
break;
}
error << "MRB: Unable to reserve space in buffer, event skipped" << endmsg;
break;
}
error << "MRB: Unable to reserve space in buffer, event skipped" << endmsg;
@@
-100,12
+100,12
@@
MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
}
// write MIDI buffer contents
}
// write MIDI buffer contents
- bool success = read_contents (ev_size, write_loc);
+ bool success = read_contents (ev_size, write_loc);
#ifndef NDEBUG
#ifndef NDEBUG
- if (DEBUG_ENABLED (DEBUG::Midi
DiskstreamIO
)) {
+ if (DEBUG_ENABLED (DEBUG::Midi
RingBuffer
)) {
DEBUG_STR_DECL(a);
DEBUG_STR_DECL(a);
- DEBUG_STR_APPEND(a, string_compose ("wrote MidiEvent to Buffer (time=%1, start=%2 offset=%3)", ev_time, start, offset));
+ DEBUG_STR_APPEND(a, string_compose ("wrote MidiEvent to Buffer (time=%1, start=%2 offset=%3)
", ev_time, start, offset));
for (size_t i=0; i < ev_size; ++i) {
DEBUG_STR_APPEND(a,hex);
DEBUG_STR_APPEND(a,"0x");
for (size_t i=0; i < ev_size; ++i) {
DEBUG_STR_APPEND(a,hex);
DEBUG_STR_APPEND(a,"0x");
@@
-113,10
+113,9
@@
MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
DEBUG_STR_APPEND(a,' ');
}
DEBUG_STR_APPEND(a,'\n');
DEBUG_STR_APPEND(a,' ');
}
DEBUG_STR_APPEND(a,'\n');
- DEBUG_TRACE (DEBUG::Midi
DiskstreamIO
, DEBUG_STR(a).str());
+ DEBUG_TRACE (DEBUG::Midi
RingBuffer
, DEBUG_STR(a).str());
}
#endif
}
#endif
-
if (success) {
_tracker.track(write_loc);
++count;
if (success) {
_tracker.track(write_loc);
++count;
@@
-212,7
+211,7
@@
MidiRingBuffer<T>::flush (framepos_t /*start*/, framepos_t end)
assert (success);
ev_time = *(reinterpret_cast<T*>((uintptr_t)peekbuf));
assert (success);
ev_time = *(reinterpret_cast<T*>((uintptr_t)peekbuf));
-
+
if (ev_time >= end) {
break;
}
if (ev_time >= end) {
break;
}
@@
-230,7
+229,7
@@
MidiRingBuffer<T>::dump(ostream& str)
size_t rspace;
if ((rspace = this->read_space()) == 0) {
size_t rspace;
if ((rspace = this->read_space()) == 0) {
- str <<
"
MRB::dump: empty\n";
+ str <<
this << "
MRB::dump: empty\n";
return;
}
return;
}