Mercurial > hg > svcore

diff data/model/DenseTimeValueModel.cpp @ 1069:32ab6c48efaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch tonioni
author Chris Cannam
date Mon, 20 Apr 2015 09:11:34 +0100
parents cc27f35aa75c
children 9f4505ac9072
line wrap: on
line diff
--- a/data/model/DenseTimeValueModel.cpp	Mon Mar 02 17:21:34 2015 +0000
+++ b/data/model/DenseTimeValueModel.cpp	Mon Apr 20 09:11:34 2015 +0100
@@ -29,7 +29,7 @@
 }
 	
 QString
-DenseTimeValueModel::toDelimitedDataStringSubset(QString delimiter, int f0, int f1) const
+DenseTimeValueModel::toDelimitedDataStringSubset(QString delimiter, sv_frame_t f0, sv_frame_t f1) const
 {
     int ch = getChannelCount();
 
@@ -42,10 +42,10 @@
         all[c] = new float[f1 - f0];
     }
 
-    int n = getData(0, ch - 1, f0, f1 - f0, all);
+    sv_frame_t n = getData(0, ch - 1, f0, f1 - f0, all);
 
     QStringList list;
-    for (int i = 0; i < n; ++i) {
+    for (sv_frame_t i = 0; i < n; ++i) {
         QStringList parts;
         parts << QString("%1").arg(f0 + i);
         for (int c = 0; c < ch; ++c) {