Mercurial > hg > svcore
diff data/fileio/MIDIFileReader.h @ 1450:a12fd0456f0c streaming-csv-writer
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 17 Apr 2018 10:35:42 +0100 |
parents | 48e9f538e6e9 |
children | 1dc64d3d323c |
line wrap: on
line diff
--- a/data/fileio/MIDIFileReader.h Tue Apr 17 10:03:51 2018 +0100 +++ b/data/fileio/MIDIFileReader.h Tue Apr 17 10:35:42 2018 +0100 @@ -75,10 +75,10 @@ typedef std::map<unsigned long, TempoChange> TempoMap; // key is MIDI time typedef enum { - MIDI_SINGLE_TRACK_FILE = 0x00, - MIDI_SIMULTANEOUS_TRACK_FILE = 0x01, - MIDI_SEQUENTIAL_TRACK_FILE = 0x02, - MIDI_FILE_BAD_FORMAT = 0xFF + MIDI_SINGLE_TRACK_FILE = 0x00, + MIDI_SIMULTANEOUS_TRACK_FILE = 0x01, + MIDI_SEQUENTIAL_TRACK_FILE = 0x02, + MIDI_FILE_BAD_FORMAT = 0xFF } MIDIFileFormatType; bool parseFile(); @@ -86,9 +86,9 @@ bool parseTrack(unsigned int &trackNum); Model *loadTrack(unsigned int trackNum, - Model *existingModel = 0, - int minProgress = 0, - int progressAmount = 100) const; + Model *existingModel = 0, + int minProgress = 0, + int progressAmount = 100) const; bool consolidateNoteOffEvents(unsigned int track); void updateTempoMap(unsigned int track);