Mercurial > hg > svcore
comparison data/fileio/CSVFormat.h @ 1007:ba404199345f tonioni
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Mon, 10 Nov 2014 09:19:49 +0000 |
| parents | dc1695b90a58 |
| children | e369dd281cf2 |
comparison
equal
deleted
inserted
replaced
| 980:6e6da0636e5e | 1007:ba404199345f |
|---|---|
| 35 ImplicitTiming | 35 ImplicitTiming |
| 36 }; | 36 }; |
| 37 | 37 |
| 38 enum TimeUnits { | 38 enum TimeUnits { |
| 39 TimeSeconds, | 39 TimeSeconds, |
| 40 TimeMilliseconds, | |
| 40 TimeAudioFrames, | 41 TimeAudioFrames, |
| 41 TimeWindows | 42 TimeWindows, |
| 42 }; | 43 }; |
| 43 | 44 |
| 44 enum ColumnPurpose { | 45 enum ColumnPurpose { |
| 45 ColumnUnknown, | 46 ColumnUnknown, |
| 46 ColumnStartTime, | 47 ColumnStartTime, |