Mercurial > hg > svcore

diff data/model/NoteData.h @ 935:f960d67ce842 tonioni

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:42:01 +0100
parents 59e7fe1b1003
children 0d3d1ec7dfde
line wrap: on
line diff
--- a/data/model/NoteData.h	Mon Jun 16 11:28:45 2014 +0100
+++ b/data/model/NoteData.h	Wed Jun 18 13:42:01 2014 +0100
@@ -21,12 +21,12 @@
 
 struct NoteData
 {
-    NoteData(size_t _start, size_t _dur, int _mp, int _vel) :
+    NoteData(int _start, int _dur, int _mp, int _vel) :
 	start(_start), duration(_dur), midiPitch(_mp), frequency(0),
 	isMidiPitchQuantized(true), velocity(_vel) { };
             
-    size_t start;     // audio sample frame
-    size_t duration;  // in audio sample frames
+    int start;     // audio sample frame
+    int duration;  // in audio sample frames
     int midiPitch; // 0-127
     float frequency; // Hz, to be used if isMidiPitchQuantized false
     bool isMidiPitchQuantized;
@@ -47,7 +47,7 @@
 {
 public:
     virtual NoteList getNotes() const = 0;
-    virtual NoteList getNotes(size_t startFrame, size_t endFrame) const = 0;
+    virtual NoteList getNotesWithin(int startFrame, int endFrame) const = 0;
 };
 
 #endif