Mercurial > hg > svcore

diff data/fileio/MIDIFileReader.h @ 936:0c1d6de8f44b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents 59e7fe1b1003
children cc27f35aa75c
line wrap: on
line diff
--- a/data/fileio/MIDIFileReader.h	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/fileio/MIDIFileReader.h	Wed Jun 18 13:51:16 2014 +0100
@@ -62,7 +62,7 @@
 public:
     MIDIFileReader(QString path,
                    MIDIFileImportPreferenceAcquirer *pref,
-                   size_t mainModelSampleRate);
+                   int mainModelSampleRate);
     virtual ~MIDIFileReader();
 
     virtual bool isOK() const;
@@ -126,9 +126,9 @@
 
     QString                m_path;
     std::ifstream         *m_midiFile;
-    size_t                 m_fileSize;
+    int                    m_fileSize;
     QString                m_error;
-    size_t                 m_mainModelSampleRate;
+    int                    m_mainModelSampleRate;
 
     MIDIFileImportPreferenceAcquirer *m_acquirer;
 };