Fix #4094: show total export progress instead of per timespan progress

git-svn-id: svn://localhost/ardour2/branches/3.0@9710 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 15 deletions

diff --git a/libs/ardour/ardour/export_status.h b/libs/ardour/ardour/export_status.h
index 1613fffe52..a42327c8aa 100644
--- a/libs/ardour/ardour/export_status.h
+++ b/libs/ardour/ardour/export_status.h
@@ -22,20 +22,15 @@
 #define __ardour_export_status_h__
 
 #include <list>
-#include "pbd/signals.h"
-
 #include <stdint.h>
 
+#include "ardour/types.h"
+
+#include "pbd/signals.h"
+
 namespace ARDOUR
 {
 
-enum ExportStage {
-	export_None,
-	export_ReadTimespan,
-	export_PostProcess,
-	export_Write
-};
-
 struct ExportStatus {
 
 	ExportStatus ();
@@ -57,17 +52,14 @@ struct ExportStatus {
 
 	/* Progress info */
 
-	volatile ExportStage    stage;
 	volatile float          progress;
+	volatile bool           normalizing;
 
 	volatile uint32_t       total_timespans;
 	volatile uint32_t       timespan;
 
-	volatile uint32_t       total_channel_configs;
-	volatile uint32_t       channel_config;
-
-	volatile uint32_t       total_formats;
-	volatile uint32_t       format;
+	volatile framecnt_t     total_frames;
+	volatile framecnt_t     processed_frames;
 
   private:
 	volatile bool          _aborted;