diff layer/FlexiNoteLayer.h @ 754:efbb6b8f943b tony_integration

Merge from branch tonioni

--- a/layer/FlexiNoteLayer.h	Tue Mar 11 17:34:23 2014 +0000
+++ b/layer/FlexiNoteLayer.h	Mon Mar 31 13:00:42 2014 +0100
@@ -28,7 +28,7 @@
 
 class View;
 class QPainter;
-
+class SparseTimeValueModel;
 
 class FlexiNoteLayer : public SingleColourLayer,
                        public VerticalScaleLayer
@@ -78,6 +78,10 @@
     virtual bool paste(View *v, const Clipboard &from, int frameOffset,
                        bool interactive);
 
+    void splitNotesAt(View *v, int frame);
+    void snapSelectedNotesToPitchTrack(View *v, Selection s);
+    void mergeNotes(View *v, Selection s, bool inclusive);
+
     virtual const Model *getModel() const { return m_model; }
     void setModel(FlexiNoteModel *model);
 
@@ -169,7 +173,8 @@
     bool getPointToDrag(View *v, int x, int y, FlexiNoteModel::Point &) const;
     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;
-    void updateNoteValue(View *v, FlexiNoteModel::Point &note) const;
+    SparseTimeValueModel *getAssociatedPitchModel(View *v) const;
+    bool updateNoteValue(View *v, FlexiNoteModel::Point &note) const;
 
     FlexiNoteModel *m_model;
     bool m_editing;