diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/export_graph_builder.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/export_status.h | 22 |
2 files changed, 8 insertions, 15 deletions
diff --git a/libs/ardour/ardour/export_graph_builder.h b/libs/ardour/ardour/export_graph_builder.h index bce6838d02..b4ef0a1d94 100644 --- a/libs/ardour/ardour/export_graph_builder.h +++ b/libs/ardour/ardour/export_graph_builder.h @@ -63,6 +63,7 @@ class ExportGraphBuilder int process (framecnt_t frames, bool last_cycle); bool process_normalize (); // returns true when finished + bool will_normalize() { return !normalizers.empty(); } void reset (); void set_current_timespan (boost::shared_ptr<ExportTimespan> span); 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; |