Mercurial > hg > svgui

diff layer/FlexiNoteLayer.h @ 747:bc049f1f080e tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add Merge Notes
author Chris Cannam
date Thu, 27 Mar 2014 16:30:26 +0000
parents 8d5df70b5ed7
children 03423269a9d0
line wrap: on
line diff
--- a/layer/FlexiNoteLayer.h	Thu Mar 27 15:59:46 2014 +0000
+++ b/layer/FlexiNoteLayer.h	Thu Mar 27 16:30:26 2014 +0000
@@ -80,6 +80,7 @@
 
     void splitNotesAt(View *v, int frame);
     void snapSelectedNotesToPitchTrack(View *v, Selection s);
+    void mergeNotes(View *v, Selection s);
 
     virtual const Model *getModel() const { return m_model; }
     void setModel(FlexiNoteModel *model);
@@ -173,7 +174,7 @@
     bool getNoteToEdit(View *v, int x, int y, FlexiNoteModel::Point &) const;
     void getRelativeMousePosition(View *v, FlexiNoteModel::Point &note, int x, int y, bool &closeToLeft, bool &closeToRight, bool &closeToTop, bool &closeToBottom) const;
     SparseTimeValueModel *getAssociatedPitchModel(View *v) const;
-    void updateNoteValue(View *v, FlexiNoteModel::Point &note) const;
+    bool updateNoteValue(View *v, FlexiNoteModel::Point &note) const;
 
     FlexiNoteModel *m_model;
     bool m_editing;