# HG changeset patch
# User Chris Cannam
# Date 1412345367 -3600
# Node ID dc1695b90a585e91f4ba5d897d7a302a7bb74c46
# Parent  58c4d69b4dd8ff05908097ea2d5c520067b12aa4
Add milliseconds as CSV import timing option

diff -r 58c4d69b4dd8 -r dc1695b90a58 data/fileio/CSVFileReader.cpp
--- a/data/fileio/CSVFileReader.cpp	Wed Oct 01 14:06:28 2014 +0100
+++ b/data/fileio/CSVFileReader.cpp	Fri Oct 03 15:09:27 2014 +0100
@@ -101,6 +101,12 @@
         double time = numeric.toDouble(&ok);
         if (!ok) time = StringBits::stringToDoubleLocaleFree(numeric, &ok);
         calculatedFrame = int(time * sampleRate + 0.5);
+    
+    } else if (timeUnits == CSVFormat::TimeMilliseconds) {
+
+        double time = numeric.toDouble(&ok);
+        if (!ok) time = StringBits::stringToDoubleLocaleFree(numeric, &ok);
+        calculatedFrame = int((time / 1000.0) * sampleRate + 0.5);
         
     } else {
         
@@ -149,7 +155,8 @@
         } else {
             windowSize = 1;
         }
-	if (timeUnits == CSVFormat::TimeSeconds) {
+	if (timeUnits == CSVFormat::TimeSeconds ||
+            timeUnits == CSVFormat::TimeMilliseconds) {
 	    sampleRate = m_mainModelSampleRate;
 	}
     }
diff -r 58c4d69b4dd8 -r dc1695b90a58 data/fileio/CSVFormat.h
--- a/data/fileio/CSVFormat.h	Wed Oct 01 14:06:28 2014 +0100
+++ b/data/fileio/CSVFormat.h	Fri Oct 03 15:09:27 2014 +0100
@@ -37,8 +37,9 @@
 
     enum TimeUnits {
 	TimeSeconds,
+        TimeMilliseconds,
 	TimeAudioFrames,
-	TimeWindows
+	TimeWindows,
     };
 
     enum ColumnPurpose {