Move PBD::canonical_path to pbd/file_utils.h/cc and reimplement for Windows

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

diff --git a/libs/evoral/evoral/PatchChange.hpp b/libs/evoral/evoral/PatchChange.hpp
index f468db4e5d06062cdf0c8a1fa32c01d424904e5f..39ea4212429c5d8159bba381a363d94c977a3189 100644 (file)
--- a/libs/evoral/evoral/PatchChange.hpp
+++ b/libs/evoral/evoral/PatchChange.hpp
@@ -30,7 +30,7 @@ namespace Evoral {
  *  bank select and then a program change.
  */
 template<typename Time>
-class LIBEVORAL_API PatchChange
+class /*LIBEVORAL_API*/ PatchChange
 {
 public:
        /** @param t Time.
@@ -120,7 +120,7 @@ public:
        uint8_t channel () const { return _program_change.buffer()[0] & 0xf; }
 
        inline bool operator< (const PatchChange<Time>& o) const {
-               if (!musical_time_equal (time(), o.time())) {
+               if (time() != o.time()) {
                        return time() < o.time();
                }
 
@@ -132,7 +132,7 @@ public:
        }
 
        inline bool operator== (const PatchChange<Time>& o) const {
-               return (musical_time_equal (time(), o.time()) && program() == o.program() && bank() == o.bank());
+               return (time() == o.time() && program() == o.program() && bank() == o.bank());
        }
 
        /** The PatchChange is made up of messages() MIDI messages; this method returns them by index.
@@ -147,8 +147,7 @@ public:
                case 2:
                        return _program_change;
                default:
-                       abort ();
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                        return _program_change;
                }
        }
@@ -167,7 +166,7 @@ private:
 }
 
 template<typename Time>
-LIBEVORAL_API std::ostream& operator<< (std::ostream& o, const Evoral::PatchChange<Time>& p) {
+/*LIBEVORAL_API*/ std::ostream& operator<< (std::ostream& o, const Evoral::PatchChange<Time>& p) {
        o << "Patch Change " << p.id() << " @ " << p.time() << " bank " << (int) p.bank() << " program " << (int) p.program();
        return o;
 }