Mercurial > hg > svcore
diff data/fileio/MIDIFileReader.h @ 1359:1c9bbbb6116a 3.0-integration
Use W64 instead of WAV for decoded files; use Ogg reader in preference to WAV one for Ogg files (WAV reader works, via libsndfile, but doesn't load metadata); fix Ogg reader to use QFile open instead of non-Win32-compatible API; add more encoder tests, audio writer test, midi reader test
author | Chris Cannam |
---|---|
date | Tue, 10 Jan 2017 10:58:25 +0000 |
parents | 26cf6d5251ec |
children | 48e9f538e6e9 |
line wrap: on
line diff
--- a/data/fileio/MIDIFileReader.h Mon Jan 09 18:51:42 2017 +0000 +++ b/data/fileio/MIDIFileReader.h Tue Jan 10 10:58:25 2017 +0000 @@ -12,15 +12,14 @@ COPYING included with this distribution for more information. */ - /* This is a modified version of a source file from the Rosegarden MIDI and audio sequencer and notation editor. This file copyright 2000-2006 Richard Bown and Chris Cannam. */ -#ifndef _MIDI_FILE_READER_H_ -#define _MIDI_FILE_READER_H_ +#ifndef SV_MIDI_FILE_READER_H +#define SV_MIDI_FILE_READER_H #include "DataFileReader.h" #include "base/RealTime.h" @@ -61,7 +60,7 @@ public: MIDIFileReader(QString path, - MIDIFileImportPreferenceAcquirer *pref, + MIDIFileImportPreferenceAcquirer *pref, // may be null sv_samplerate_t mainModelSampleRate); virtual ~MIDIFileReader();