comparison data/fileio/CSVFormat.h @ 908:166e3fc1e962 tony_integration

Merge from default branch
author Chris Cannam
date Wed, 07 May 2014 15:18:45 +0100
parents 69cc0454ed72
children 59e7fe1b1003
comparison
equal deleted inserted replaced
904:aa2257796931 908:166e3fc1e962
24 public: 24 public:
25 enum ModelType { 25 enum ModelType {
26 OneDimensionalModel, 26 OneDimensionalModel,
27 TwoDimensionalModel, 27 TwoDimensionalModel,
28 TwoDimensionalModelWithDuration, 28 TwoDimensionalModelWithDuration,
29 TwoDimensionalModelWithDurationAndPitch,
29 ThreeDimensionalModel 30 ThreeDimensionalModel
30 }; 31 };
31 32
32 enum TimingType { 33 enum TimingType {
33 ExplicitTiming, 34 ExplicitTiming,
44 ColumnUnknown, 45 ColumnUnknown,
45 ColumnStartTime, 46 ColumnStartTime,
46 ColumnEndTime, 47 ColumnEndTime,
47 ColumnDuration, 48 ColumnDuration,
48 ColumnValue, 49 ColumnValue,
50 ColumnPitch,
49 ColumnLabel 51 ColumnLabel
50 }; 52 };
51 53
52 enum ColumnQuality { 54 enum ColumnQuality {
53 ColumnNumeric = 0x1, 55 ColumnNumeric = 0x1,