# HG changeset patch
# User Chris Cannam
# Date 1401790457 -3600
# Node ID e88a15c25a4a5323be1b339c03218c9a1001d0f3
# Parent  d75c9e0d5e7e06836f81bf9208e9891de5bbcd33# Parent  49618f39ff091e72eb94dd0d8424da44cf10e272
Merge from default branch

diff -r d75c9e0d5e7e -r e88a15c25a4a data/model/FlexiNoteModel.h
--- a/data/model/FlexiNoteModel.h	Thu May 29 16:27:52 2014 +0100
+++ b/data/model/FlexiNoteModel.h	Tue Jun 03 11:14:17 2014 +0100
@@ -235,8 +235,7 @@
     {    
     	PointList points = getPoints(startFrame, endFrame);
         NoteList notes;
-        for (PointList::iterator pli = points.begin(); pli != points.end(); ++pli) 
-        {
+        for (PointList::iterator pli = points.begin(); pli != points.end(); ++pli) {
     	    size_t duration = pli->duration;
             if (duration == 0 || duration == 1) {
                 duration = getSampleRate() / 20;
@@ -244,8 +243,7 @@
             int pitch = lrintf(pli->value);
 
             int velocity = 100;
-            if (pli->level > 0.f && pli->level <= 1.f) 
-            {
+            if (pli->level > 0.f && pli->level <= 1.f) {
                 velocity = lrintf(pli->level * 127);
             }