comparison layer/FlexiNoteLayer.cpp @ 749:03423269a9d0 tonioni

Implement "Form Note from Selection"; remove Snap Notes to Pitch Track because every other editing operation *should* now be doing that automatically

     
     finish(command);
 }
 
 void
-FlexiNoteLayer::mergeNotes(View *v, Selection s)
+FlexiNoteLayer::mergeNotes(View *v, Selection s, bool inclusive)
 {
     FlexiNoteModel::PointList points =
         m_model->getPoints(s.getStartFrame(), s.getEndFrame());
 
     FlexiNoteModel::PointList::iterator i = points.begin();
-    while (i != points.end() && i->frame + i->duration < s.getStartFrame()) {
-        ++i;
-    }
+    if (inclusive) {
+        while (i != points.end() && i->frame + i->duration < s.getStartFrame()) {
+            ++i;
+        }
+    } else {
+        while (i != points.end() && i->frame < s.getStartFrame()) {
+            ++i;
+        }
+    }
+        
     if (i == points.end()) return;
 
     FlexiNoteModel::EditCommand *command = 
         new FlexiNoteModel::EditCommand(m_model, tr("Merge Notes"));
 
     FlexiNote newNote(*i);
 
     while (i != points.end()) {
 
-        if (i->frame >= s.getEndFrame()) break;
+        if (inclusive) {
+            if (i->frame >= s.getEndFrame()) break;
+        } else {
+            if (i->frame + i->duration > s.getEndFrame()) break;
+        }
 
         newNote.duration = i->frame + i->duration - newNote.frame;
         command->deletePoint(*i);
 
         ++i;