add anonymous union to DiffCommand to allow uint8t_t and time-based arguments; use DiffCommand for note trimming

git-svn-id: svn://localhost/ardour2/branches/3.0@5638 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 10 insertions, 2 deletions

diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h
index 46d4cf794c..460e790323 100644
--- a/libs/ardour/ardour/midi_model.h
+++ b/libs/ardour/ardour/midi_model.h
@@ -119,6 +119,8 @@ public:
 		
 		void change (const boost::shared_ptr<Evoral::Note<TimeType> > note, 
 			     Property prop, uint8_t new_value);
+		void change (const boost::shared_ptr<Evoral::Note<TimeType> > note, 
+			     Property prop, TimeType new_time);
 		
 	private:
 		boost::shared_ptr<MidiModel> _model;
@@ -127,8 +129,14 @@ public:
 		struct NotePropertyChange {
 		    DiffCommand::Property property;
 		    boost::shared_ptr<Evoral::Note<TimeType> > note;
-		    uint8_t old_value;
-		    uint8_t new_value;
+		    union {
+			uint8_t old_value;
+			TimeType old_time;
+		    };
+		    union {
+			uint8_t new_value;
+			TimeType new_time;
+		    };
 		}; 
 		
 		typedef std::list<NotePropertyChange> ChangeList;