Mercurial > hg > svcore
diff base/Pitch.cpp @ 1057:5c5d4863b428 tonioni
Merge from cxx11 branch
author | Chris Cannam |
---|---|
date | Mon, 23 Mar 2015 11:26:28 +0000 |
parents | cc27f35aa75c |
children | 48e9f538e6e9 |
line wrap: on
line diff
--- a/base/Pitch.cpp Mon Mar 23 10:04:48 2015 +0000 +++ b/base/Pitch.cpp Mon Mar 23 11:26:28 2015 +0000 @@ -141,7 +141,7 @@ QString plain = (useFlats ? flatNotes : notes)[note].arg(octave); - int ic = lrint(centsOffset); + long ic = lrint(centsOffset); if (ic == 0) return plain; else if (ic > 0) return QString("%1+%2c").arg(plain).arg(ic); else return QString("%1%2c").arg(plain).arg(ic); @@ -176,7 +176,7 @@ } } - int ic = lrint(cents); + long ic = lrint(cents); if (ic == 0) { if (semis >= 12) {