comparison data/fileio/MIDIFileReader.h @ 1069:32ab6c48efaa

Merge from branch tonioni

     Q_OBJECT
 
 public:
     MIDIFileReader(QString path,
                    MIDIFileImportPreferenceAcquirer *pref,
-                   int mainModelSampleRate);
+                   sv_samplerate_t mainModelSampleRate);
     virtual ~MIDIFileReader();
 
     virtual bool isOK() const;
     virtual QString getError() const;
     virtual Model *load() const;

     MIDIComposition        m_midiComposition;
     TempoMap               m_tempoMap;
 
     QString                m_path;
     std::ifstream         *m_midiFile;
-    int                    m_fileSize;
+    size_t                 m_fileSize;
     QString                m_error;
-    int                    m_mainModelSampleRate;
+    sv_samplerate_t        m_mainModelSampleRate;
 
     MIDIFileImportPreferenceAcquirer *m_acquirer;
 };