projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NO-OP: a ToDo comment for discussion
[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 4671769a3c82198cb0ecf72ec95bb2607ec56cfa..3b8f6fc39e10903e27a420342573f122f4e1c5c2 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, fram
ecnt_t offset, bool stop_on_overflow_in_dst)
+MidiRingBuffer<T>::read
(MidiBuffer& dst, samplepos_t start, samplepos_t end, sampl
ecnt_t offset, bool stop_on_overflow_in_dst)
{
if (this->read_space() == 0) {
return 0;
{
if (this->read_space() == 0) {
return 0;
@@
-75,7
+75,7
@@
MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
}
ev_time -= start;
}
ev_time -= start;
-
//
ev_time += offset;
+ ev_time += offset;
/* we're good to go ahead and read the data now but since we
* have the prefix data already, just skip over that
/* we're good to go ahead and read the data now but since we
* have the prefix data already, just skip over that
@@
-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
if (DEBUG_ENABLED (DEBUG::MidiRingBuffer)) {
DEBUG_STR_DECL(a);
#ifndef NDEBUG
if (DEBUG_ENABLED (DEBUG::MidiRingBuffer)) {
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");
@@
-116,7
+116,6
@@
MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
DEBUG_TRACE (DEBUG::MidiRingBuffer, DEBUG_STR(a).str());
}
#endif
DEBUG_TRACE (DEBUG::MidiRingBuffer, DEBUG_STR(a).str());
}
#endif
-
if (success) {
_tracker.track(write_loc);
++count;
if (success) {
_tracker.track(write_loc);
++count;
@@
-130,7
+129,7
@@
MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
template<typename T>
size_t
template<typename T>
size_t
-MidiRingBuffer<T>::skip_to(
fram
epos_t start)
+MidiRingBuffer<T>::skip_to(
sampl
epos_t start)
{
if (this->read_space() == 0) {
return 0;
{
if (this->read_space() == 0) {
return 0;
@@
-195,7
+194,7
@@
MidiRingBuffer<T>::skip_to(framepos_t start)
template<typename T>
void
template<typename T>
void
-MidiRingBuffer<T>::flush (
framepos_t /*start*/, fram
epos_t end)
+MidiRingBuffer<T>::flush (
samplepos_t /*start*/, sampl
epos_t end)
{
const size_t prefix_size = sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t);
{
const size_t prefix_size = sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t);
@@
-310,18
+309,18
@@
MidiRingBuffer<T>::reset_tracker ()
template<typename T>
void
template<typename T>
void
-MidiRingBuffer<T>::resolve_tracker (MidiBuffer& dst,
fram
epos_t t)
+MidiRingBuffer<T>::resolve_tracker (MidiBuffer& dst,
sampl
epos_t t)
{
_tracker.resolve_notes (dst, t);
}
template<typename T>
void
{
_tracker.resolve_notes (dst, t);
}
template<typename T>
void
-MidiRingBuffer<T>::resolve_tracker (Evoral::EventSink<
framepos_t>& dst, fram
epos_t t)
+MidiRingBuffer<T>::resolve_tracker (Evoral::EventSink<
samplepos_t>& dst, sampl
epos_t t)
{
_tracker.resolve_notes(dst, t);
}
{
_tracker.resolve_notes(dst, t);
}
-template class MidiRingBuffer<
fram
epos_t>;
+template class MidiRingBuffer<
sampl
epos_t>;
} // namespace ARDOUR
} // namespace ARDOUR