ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

reimplement MidiRingBuffer::dump() 

git-svn-id: svn://localhost/ardour2/branches/3.0@9283 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-04-04 21:43:40 +00:00
parent 806b94bec1
commit ab376e10a7
2 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/midi_ring_buffer.h
View File

@ -51,7 +51,7 @@ public:
inline bool read_contents(uint32_t size, uint8_t* buf); inline bool read_contents(uint32_t size, uint8_t* buf);
size_t read(MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset=0); size_t read(MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset=0);
// void dump(std::ostream& dst); void dump(std::ostream& dst);
/** Set the channel filtering mode. /** Set the channel filtering mode.
* @param mask If mode is FilterChannels, each bit represents a midi channel: * @param mask If mode is FilterChannels, each bit represents a midi channel:

90
libs/ardour/midi_ring_buffer.cc
View File

@ -164,7 +164,6 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
return count; return count;
} }
#if 0
template<typename T> template<typename T>
void void
MidiRingBuffer<T>::dump(ostream& str) MidiRingBuffer<T>::dump(ostream& str)
@ -179,70 +178,69 @@ MidiRingBuffer<T>::dump(ostream& str)
T ev_time; T ev_time;
Evoral::EventType ev_type; Evoral::EventType ev_type;
uint32_t ev_size; uint32_t ev_size;
size_t read_ptr = g_atomic_int_get (&this->_read_ptr);
str << "Dump @ " << read_ptr << endl; RingBufferNPT<uint8_t>::rw_vector vec;
RingBufferNPT<uint8_t>::get_read_vector (&vec);
while (1) { if (vec.len[0] == 0) {
uint8_t* wp; return;
uint8_t* data; }
size_t write_ptr;
#define space(r,w) ((w > r) ? (w - r) : ((w - r + this->_size) % this->_size)) str << this << ": Dump size = " << vec.len[0] + vec.len[1]
<< " r@ " << RingBufferNPT<uint8_t>::get_read_ptr()
<< " w@" << RingBufferNPT<uint8_t>::get_write_ptr() << endl;
write_ptr = g_atomic_int_get (&this->_write_ptr);
if (space (read_ptr, write_ptr) < sizeof (T)) {
break;
}
wp = &this->_buf[read_ptr]; uint8_t *buf = new uint8_t[vec.len[0] + vec.len[1]];
memcpy (&ev_time, wp, sizeof (T)); memcpy (buf, vec.buf[0], vec.len[0]);
read_ptr = (read_ptr + sizeof (T)) % this->_size;
str << "time " << ev_time;
write_ptr = g_atomic_int_get (&this->_write_ptr); if (vec.len[1]) {
if (space (read_ptr, write_ptr) < sizeof (ev_type)) { memcpy (buf+vec.len[1], vec.buf[1], vec.len[1]);
break; }
}
wp = &this->_buf[read_ptr]; uint8_t* data = buf;
memcpy (&ev_type, wp, sizeof (ev_type)); const uint8_t* end = buf + vec.len[0] + vec.len[1];
read_ptr = (read_ptr + sizeof (ev_type)) % this->_size;
while (data < end) {
memcpy (&ev_time, data, sizeof (T));
data += sizeof (T);
str << "\ttime " << ev_time;
if (data >= end) {
str << "(incomplete)\n ";
break;
}
memcpy (&ev_type, data, sizeof (ev_type));
data += sizeof (ev_type);
str << " type " << ev_type; str << " type " << ev_type;
write_ptr = g_atomic_int_get (&this->_write_ptr); if (data >= end) {
if (space (read_ptr, write_ptr) < sizeof (ev_size)) { str << "(incomplete)\n";
str << "!OUT!\n"; break;
break; }
}
wp = &this->_buf[read_ptr]; memcpy (&ev_size, data, sizeof (ev_size));
memcpy (&ev_size, wp, sizeof (ev_size)); data += sizeof (ev_size);
read_ptr = (read_ptr + sizeof (ev_size)) % this->_size;
str << " size " << ev_size; str << " size " << ev_size;
write_ptr = g_atomic_int_get (&this->_write_ptr); if (data >= end) {
if (space (read_ptr, write_ptr) < ev_size) { str << "(incomplete)\n";
str << "!OUT!\n"; break;
break; }
}
data = new uint8_t[ev_size]; for (uint32_t i = 0; i != ev_size && data < end; ++i) {
wp = &this->_buf[read_ptr];
memcpy (data, wp, ev_size);
read_ptr = (read_ptr + ev_size) % this->_size;
for (uint32_t i = 0; i != ev_size; ++i) {
str << ' ' << hex << (int) data[i] << dec; str << ' ' << hex << (int) data[i] << dec;
} }
str << endl; data += ev_size;
delete [] data; str << endl;
} }
delete [] buf;
} }
#endif
template class MidiRingBuffer<framepos_t>; template class MidiRingBuffer<framepos_t>;