diff options
Diffstat (limited to 'libs/evoral')
| -rw-r--r-- | libs/evoral/evoral/Event.hpp | 6 | ||||
| -rw-r--r-- | libs/evoral/src/SMF.cpp | 8 | ||||
| -rw-r--r-- | libs/evoral/src/Sequence.cpp | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/libs/evoral/evoral/Event.hpp b/libs/evoral/evoral/Event.hpp index 3e8e05fa3b..cc24ac87f7 100644 --- a/libs/evoral/evoral/Event.hpp +++ b/libs/evoral/evoral/Event.hpp @@ -199,12 +199,12 @@ protected: template<typename Time> std::ostream& operator<<(std::ostream& o, const Evoral::Event<Time>& ev) { - o << "Event type = " << ev.event_type() << " @ " << " @ " << ev.time() << "\n\t"; + o << "Event type = " << ev.event_type() << " @ " << ev.time(); o << std::hex; for (uint32_t n = 0; n < ev.size(); ++n) { - o << (int) ev.buffer()[n] << ' '; + o << ' ' << (int) ev.buffer()[n]; } - o << std::dec << std::endl; + o << std::dec; return o; } diff --git a/libs/evoral/src/SMF.cpp b/libs/evoral/src/SMF.cpp index 2103ad8eae..424b4d46f2 100644 --- a/libs/evoral/src/SMF.cpp +++ b/libs/evoral/src/SMF.cpp @@ -205,10 +205,10 @@ SMF::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const assert(midi_event_is_valid(*buf, *size)); - /*printf("SMF::read_event:\n"); + /* printf("SMF::read_event @ %u: ", *delta_t); for (size_t i = 0; i < *size; ++i) { printf("%X ", (*buf)[i]); - } printf("\n");*/ + } printf("\n") */ return event_size; } else { @@ -223,10 +223,10 @@ SMF::append_event_delta(uint32_t delta_t, uint32_t size, const uint8_t* buf) return; } - /*printf("SMF::append_event_delta:\n"); + /* printf("SMF::append_event_delta @ %u:", delta_t); for (size_t i = 0; i < size; ++i) { printf("%X ", buf[i]); - } printf("\n");*/ + } printf("\n"); */ if (!midi_event_is_valid(buf, size)) { cerr << "WARNING: SMF ignoring illegal MIDI event" << endl; diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index 3b1729cfe8..91943c03a6 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -33,7 +33,7 @@ #include "evoral/TypeMap.hpp" #include "evoral/midi_util.h" -//#define DEBUG_SEQUENCE 1 +// #define DEBUG_SEQUENCE 1 #ifdef DEBUG_SEQUENCE #include <boost/format.hpp> using boost::format; @@ -209,10 +209,10 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t _locked = false; _seq->read_unlock(); } else { - DUMP(format("New iterator = %1% : %2% @ %3%\n") - % (int)_event->event_type() - % (int)((MIDIEvent<Time>*)_event.get())->type() - % _event->time()); + DUMP(printf("New iterator = 0x%x : 0x%x @ %f\n", + (int)_event->event_type(), + (int)((MIDIEvent<Time>*)_event.get())->type(), + _event->time())); assert(midi_event_is_valid(_event->buffer(), _event->size())); } } |