Fix Sequence/Event const-correctness issues

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

diff --git a/libs/evoral/evoral/Sequence.hpp b/libs/evoral/evoral/Sequence.hpp
index dd5dd17e19d5a06be66ebe339fdb6471567f2485..7c0818a7fb26459dbd39d02a58f7a558a5278d1d 100644 (file)
--- a/libs/evoral/evoral/Sequence.hpp
+++ b/libs/evoral/evoral/Sequence.hpp
@@ -28,7 +28,6 @@
 #include <glibmm/threads.h>
 
 #include "evoral/visibility.h"
-#include "evoral/types.hpp"
 #include "evoral/Note.hpp"
 #include "evoral/ControlSet.hpp"
 #include "evoral/ControlList.hpp"
@@ -134,6 +133,7 @@ public:
                }
        };
 
+#if 0 // NOT USED
        struct LaterNoteComparator {
                typedef const Note<Time>* value_type;
                inline bool operator()(const boost::shared_ptr< const Note<Time> > a,
@@ -141,12 +141,13 @@ public:
                        return a->time() > b->time();
                }
        };
+#endif
 
        struct LaterNoteEndComparator {
                typedef const Note<Time>* value_type;
                inline bool operator()(const boost::shared_ptr< const Note<Time> > a,
                                       const boost::shared_ptr< const Note<Time> > b) const {
-                       return a->end_time() > b->end_time();
+                       return a->end_time().to_double() > b->end_time().to_double();
                }
        };
 
@@ -231,9 +232,8 @@ public:
 
                void invalidate(std::set<WeakNotePtr>* notes);
 
-               const Event<Time>& operator*()  const { return *_event;  }
-               const boost::shared_ptr< Event<Time> > operator->() const  { return _event; }
-               const boost::shared_ptr< Event<Time> > get_event_pointer() { return _event; }
+               const Event<Time>& operator*() const { return *_event;  }
+               const boost::shared_ptr< const Event<Time> > operator->() const { return _event; }
 
                const const_iterator& operator++(); // prefix only