prep for beta1

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

diff --git a/libs/evoral/evoral/Sequence.hpp b/libs/evoral/evoral/Sequence.hpp
index 298ef48e52ec979e75c6a035fbdbdf79d9e188ac..9f12de292adbe84014d92928c9bf6fb503469cb8 100644 (file)
--- a/libs/evoral/evoral/Sequence.hpp
+++ b/libs/evoral/evoral/Sequence.hpp
@@ -97,7 +97,14 @@ public:
 
        void start_write();
        bool writing() const { return _writing; }
-        void end_write (Time when=0, bool delete_stuck=false, bool resolve=false);
+
+        enum StuckNoteOption {
+               Relax,
+               DeleteStuckNotes,
+               ResolveStuckNotes
+       };
+
+        void end_write (StuckNoteOption, Time when = 0);
 
        void append(const Event<Time>& ev, Evoral::event_id_t evid);
 
@@ -291,6 +298,8 @@ protected:
        inline       Pitches& pitches(uint8_t chan)       { return _pitches[chan&0xf]; }
        inline const Pitches& pitches(uint8_t chan) const { return _pitches[chan&0xf]; }
 
+       virtual void control_list_marked_dirty ();
+
 private:
        friend class const_iterator;
 
@@ -306,8 +315,6 @@ private:
        void get_notes_by_pitch (Notes&, NoteOperator, uint8_t val, int chan_mask = 0) const;
        void get_notes_by_velocity (Notes&, NoteOperator, uint8_t val, int chan_mask = 0) const;
 
-       void control_list_marked_dirty ();
-
        const TypeMap& _type_map;
 
        Notes        _notes;       // notes indexed by time