fix up marshall/unmarshall of note data for MidiModel::DiffCommand

[ardour.git] / libs / evoral / evoral / Note.hpp

diff --git a/libs/evoral/evoral/Note.hpp b/libs/evoral/evoral/Note.hpp
index d9d4b070ff5d034135a8d249c01c8054d4f64ce2..b636df46e2bbbfa4f55e680be16d5bc5bc07752f 100644 (file)
--- a/libs/evoral/evoral/Note.hpp
+++ b/libs/evoral/evoral/Note.hpp
@@ -24,7 +24,6 @@
 
 namespace Evoral {
 
-
 /** An abstract (protocol agnostic) note.
  *
  * Currently a note is defined as (on event, length, off event).
@@ -32,35 +31,35 @@ namespace Evoral {
 template<typename Time>
 class Note {
 public:
-       Note(uint8_t chan=0, Time time=0, EventLength len=0, uint8_t note=0, uint8_t vel=0x40);
+       Note(uint8_t chan=0, Time time=0, Time len=0, uint8_t note=0, uint8_t vel=0x40);
        Note(const Note<Time>& copy);
        ~Note();
 
        const Note<Time>& operator=(const Note<Time>& copy);
 
        inline bool operator==(const Note<Time>& other) {
-               return time() == other.time() && 
-                note() == other.note() && 
-                length() == other.length() &&
-                velocity() == other.velocity() &&
-                channel()  == other.channel();
+               return musical_time_equal (time(), other.time()) && 
+                       note() == other.note() && 
+                       musical_time_equal (length(), other.length()) && 
+                       velocity() == other.velocity() &&
+                       channel()  == other.channel();
        }
 
        inline Time        time()     const { return _on_event.time(); }
        inline Time        end_time() const { return _off_event.time(); }
        inline uint8_t     note()     const { return _on_event.note(); }
        inline uint8_t     velocity() const { return _on_event.velocity(); }
-       inline EventLength length()   const { return _off_event.time() - _on_event.time(); }
+       inline Time        length()   const { return _off_event.time() - _on_event.time(); }
        inline uint8_t     channel()  const {
                assert(_on_event.channel() == _off_event.channel()); 
            return _on_event.channel(); 
        }
 
-       inline void set_time(Time t)          { _off_event.time() = t + length(); _on_event.time() = t; }
-       inline void set_note(uint8_t n)       { _on_event.buffer()[1] = n; _off_event.buffer()[1] = n; }
-       inline void set_velocity(uint8_t n)   { _on_event.buffer()[2] = n; }
-       inline void set_length(EventLength l) { _off_event.time() = _on_event.time() + l; }
-       inline void set_channel(uint8_t c)    { _on_event.set_channel(c);  _off_event.set_channel(c); }
+       inline void set_time(Time t)        { _off_event.time() = t + length(); _on_event.time() = t; }
+       inline void set_note(uint8_t n)     { _on_event.buffer()[1] = n; _off_event.buffer()[1] = n; }
+       inline void set_velocity(uint8_t n) { _on_event.buffer()[2] = n; }
+       inline void set_length(Time l)      { _off_event.time() = _on_event.time() + l; }
+       inline void set_channel(uint8_t c)  { _on_event.set_channel(c);  _off_event.set_channel(c); }
 
        inline       Event<Time>& on_event()        { return _on_event; }
        inline const Event<Time>& on_event()  const { return _on_event; }
@@ -73,8 +72,16 @@ private:
        MIDIEvent<Time> _off_event;
 };
 
-
 } // namespace Evoral
 
+template<typename Time>
+std::ostream& operator<<(std::ostream& o, const Evoral::Note<Time>& n) {
+       o << "Note: pitch = " << (int) n.note()
+         << " @ " << n.time() << " .. " << n.end_time() 
+         << " velocity " << (int) n.velocity() 
+         << " chn " << (int) n.channel();
+       return o;
+}
+
 #endif // EVORAL_NOTE_HPP