Mercurial > hg > svcore

changeset 918:e88a15c25a4a tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Tue, 03 Jun 2014 11:14:17 +0100
parents d75c9e0d5e7e (current diff) 49618f39ff09 (diff)
children 4c7b4040bd2d
files
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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);
             }