Mercurial > hg > svcore

diff data/fileio/CSVFileReader.h @ 1047:26cf6d5251ec cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further dedicated-types fixes
author Chris Cannam
date Tue, 10 Mar 2015 17:02:52 +0000
parents cc27f35aa75c
children 7f8eb7379280 e22bfe8ca248
line wrap: on
line diff
--- a/data/fileio/CSVFileReader.h	Tue Mar 10 13:22:10 2015 +0000
+++ b/data/fileio/CSVFileReader.h	Tue Mar 10 17:02:52 2015 +0000
@@ -34,7 +34,7 @@
      * Construct a CSVFileReader to read the CSV file at the given
      * path, with the given format.
      */
-    CSVFileReader(QString path, CSVFormat format, int mainModelSampleRate);
+    CSVFileReader(QString path, CSVFormat format, sv_samplerate_t mainModelSampleRate);
 
     /**
      * Construct a CSVFileReader to read from the given
@@ -42,7 +42,7 @@
      * CSVFileReader will not close or delete it and it must outlive
      * the CSVFileReader.
      */
-    CSVFileReader(QIODevice *device, CSVFormat format, int mainModelSampleRate);
+    CSVFileReader(QIODevice *device, CSVFormat format, sv_samplerate_t mainModelSampleRate);
 
     virtual ~CSVFileReader();
 
@@ -58,9 +58,9 @@
     QString m_filename;
     QString m_error;
     mutable int m_warnings;
-    int m_mainModelSampleRate;
+    sv_samplerate_t m_mainModelSampleRate;
 
-    sv_frame_t convertTimeValue(QString, int lineno, int sampleRate,
+    sv_frame_t convertTimeValue(QString, int lineno, sv_samplerate_t sampleRate,
                                 int windowSize) const;
 };