add method (taken from GTK GUI) to goto_nth_marker() to BasicUI

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

diff --git a/libs/evoral/evoral/Note.hpp b/libs/evoral/evoral/Note.hpp
index 6b0aeebb4ab0d17ff3305f6d112b970c6004167c..87c8a9fe83b34e2a086051f71bb2fec0f101d68f 100644 (file)
--- a/libs/evoral/evoral/Note.hpp
+++ b/libs/evoral/evoral/Note.hpp
@@ -33,18 +33,22 @@ namespace Evoral {
  * Currently a note is defined as (on event, length, off event).
  */
 template<typename Time>
-class LIBEVORAL_API Note {
+#ifdef COMPILER_MSVC
+class LIBEVORAL_LOCAL Note {
+#else
+class LIBEVORAL_TEMPLATE_API Note {
+#endif
 public:
-       Note(uint8_t chan=0, Time time=0, Time len=0, uint8_t note=0, uint8_t vel=0x40);
+       Note(uint8_t chan=0, Time time=Time(), Time len=Time(), 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 musical_time_equal (time(), other.time()) &&
+               return time() == other.time() &&
                        note() == other.note() &&
-                       musical_time_equal (length(), other.length()) &&
+                       length() == other.length() &&
                        velocity() == other.velocity() &&
                        off_velocity() == other.off_velocity() &&
                        channel()  == other.channel();
@@ -105,10 +109,8 @@ private:
        MIDIEvent<Time> _off_event;
 };
 
-} // namespace Evoral
-
 template<typename Time>
-LIBEVORAL_API std::ostream& operator<<(std::ostream& o, const Evoral::Note<Time>& n) {
+/*LIBEVORAL_API*/ std::ostream& operator<<(std::ostream& o, const Evoral::Note<Time>& n) {
        o << "Note #" << n.id() << ": pitch = " << (int) n.note()
          << " @ " << n.time() << " .. " << n.end_time()
          << " velocity " << (int) n.velocity()
@@ -116,5 +118,11 @@ LIBEVORAL_API std::ostream& operator<<(std::ostream& o, const Evoral::Note<Time>
        return o;
 }
 
+} // namespace Evoral
+
+#ifdef COMPILER_MSVC
+#include "../src/Note.impl"
+#endif
+
 #endif // EVORAL_NOTE_HPP