# HG changeset patch
# User Chris Cannam
# Date 1523960851 -3600
# Node ID 89cf48de59694fea6e7503aed33993c49151681f
# Parent  316c4fd7e7bcfe25b6747c50643071fcbde7e18c# Parent  dc59239625058f77b7da23981c3e22ad577b3cba
Merge from branch streaming-csv-writer

diff -r 316c4fd7e7bc -r 89cf48de5969 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Wed Mar 21 11:18:32 2018 +0000
+++ b/main/MainWindow.cpp	Tue Apr 17 11:27:31 2018 +0100
@@ -58,6 +58,7 @@
 #include "widgets/LabelCounterInputDialog.h"
 #include "widgets/ActivityLog.h"
 #include "widgets/UnitConverter.h"
+#include "widgets/ProgressDialog.h"
 #include "audio/AudioCallbackPlaySource.h"
 #include "audio/AudioCallbackRecordTarget.h"
 #include "audio/PlaySpeedRangeMapper.h"
@@ -2726,11 +2727,19 @@
 
     if (!multiple) {
         if (asData) {
-            CSVFileWriter writer(path, model,
+            stop();
+            ProgressDialog dialog {
+                QObject::tr("Exporting audio data..."),
+                true,
+                0,
+                this,
+                Qt::ApplicationModal
+            };
+            CSVFileWriter writer(path, model, &dialog,
                                  ((QFileInfo(path).suffix() == "csv") ?
                                   "," : "\t"));
             if (selectionToWrite) {
-                writer.writeSelection(selectionToWrite);
+                writer.writeSelection(*selectionToWrite);
             } else {
                 writer.write();
             }
diff -r 316c4fd7e7bc -r 89cf48de5969 vext-lock.json
--- a/vext-lock.json	Wed Mar 21 11:18:32 2018 +0000
+++ b/vext-lock.json	Tue Apr 17 11:27:31 2018 +0100
@@ -4,10 +4,10 @@
       "pin": "8742125177ae"
     },
     "svcore": {
-      "pin": "48e9f538e6e9"
+      "pin": "743c38b209d0"
     },
     "svgui": {
-      "pin": "a34a2a25907c"
+      "pin": "05d12869043e"
     },
     "svapp": {
       "pin": "b23bebfdfaba"
diff -r 316c4fd7e7bc -r 89cf48de5969 vext-project.json
--- a/vext-project.json	Wed Mar 21 11:18:32 2018 +0000
+++ b/vext-project.json	Tue Apr 17 11:27:31 2018 +0100
@@ -16,11 +16,11 @@
         },
         "svcore": {
             "vcs": "hg",
-	    "service": "soundsoftware"
+            "service": "soundsoftware"
         },
         "svgui": {
             "vcs": "hg",
-	    "service": "soundsoftware"
+            "service": "soundsoftware"
         },
         "svapp": {
             "vcs": "hg",