comparison data/fileio/DataFileReaderFactory.h @ 929:59e7fe1b1003 warnfix_no_size_t

Unsigned removals and warning fixes in data/
author Chris Cannam
date Tue, 17 Jun 2014 14:33:42 +0100
parents 183ee2a55fc7
children 26cf6d5251ec
comparison
equal deleted inserted replaced
928:6a94bb528e9d 929:59e7fe1b1003
46 * Note that this function is non-interactive -- the user is not 46 * Note that this function is non-interactive -- the user is not
47 * asked for file format preferences. 47 * asked for file format preferences.
48 */ 48 */
49 static DataFileReader *createReader(QString path, 49 static DataFileReader *createReader(QString path,
50 MIDIFileImportPreferenceAcquirer *, 50 MIDIFileImportPreferenceAcquirer *,
51 size_t mainModelSampleRate); 51 int mainModelSampleRate);
52 52
53 /** 53 /**
54 * Read the given path, if a suitable reader is available. 54 * Read the given path, if a suitable reader is available.
55 * Return NULL if no reader succeeded in reading this file. 55 * Return NULL if no reader succeeded in reading this file.
56 * 56 *
58 * asked for file format preferences. If the CSV file reader is 58 * asked for file format preferences. If the CSV file reader is
59 * used, it is with default format. 59 * used, it is with default format.
60 */ 60 */
61 static Model *load(QString path, 61 static Model *load(QString path,
62 MIDIFileImportPreferenceAcquirer *acquirer, 62 MIDIFileImportPreferenceAcquirer *acquirer,
63 size_t mainModelSampleRate); 63 int mainModelSampleRate);
64 64
65 /** 65 /**
66 * Read the given path, if a suitable reader is available. 66 * Read the given path, if a suitable reader is available.
67 * Return NULL if no reader succeeded in reading this file. 67 * Return NULL if no reader succeeded in reading this file.
68 * Do not attempt the general CSV reader. 68 * Do not attempt the general CSV reader.
69 */ 69 */
70 static Model *loadNonCSV(QString path, 70 static Model *loadNonCSV(QString path,
71 MIDIFileImportPreferenceAcquirer *acquirer, 71 MIDIFileImportPreferenceAcquirer *acquirer,
72 size_t mainModelSampleRate); 72 int mainModelSampleRate);
73 73
74 /** 74 /**
75 * Read the given path using the CSV reader with the given format. 75 * Read the given path using the CSV reader with the given format.
76 * Return NULL if it failed in reading this file. 76 * Return NULL if it failed in reading this file.
77 */ 77 */
78 static Model *loadCSV(QString path, 78 static Model *loadCSV(QString path,
79 CSVFormat format, 79 CSVFormat format,
80 size_t mainModelSampleRate); 80 int mainModelSampleRate);
81 81
82 protected: 82 protected:
83 static DataFileReader *createReader(QString path, bool csv, 83 static DataFileReader *createReader(QString path, bool csv,
84 MIDIFileImportPreferenceAcquirer *, 84 MIDIFileImportPreferenceAcquirer *,
85 CSVFormat format, 85 CSVFormat format,
86 size_t mainModelSampleRate); 86 int mainModelSampleRate);
87 }; 87 };
88 88
89 #endif 89 #endif
90 90