Fix uninitialized variable
[ardour.git] / gtk2_ardour / export_dialog.cc
index 2922edf1179313e4490850d55ab3c2a0e72309a9..6b7f13dba6d5d3c5fe44a44a5003edf749e1e2a9 100644 (file)
@@ -22,6 +22,7 @@
 #include <sigc++/signal.h>
 
 #include <gtkmm/messagedialog.h>
+#include <gtkmm/stock.h>
 
 #include "ardour/audioregion.h"
 #include "ardour/export_channel_configuration.h"
@@ -401,17 +402,17 @@ ExportDialog::progress_timeout ()
        case ExportStatus::Exporting:
                status_text = string_compose (_("Exporting '%3' (timespan %1 of %2)"),
                                              status->timespan, status->total_timespans, status->timespan_name);
-               progress = ((float) status->processed_frames_current_timespan) / status->total_frames_current_timespan;
+               progress = ((float) status->processed_samples_current_timespan) / status->total_samples_current_timespan;
                break;
        case ExportStatus::Normalizing:
                status_text = string_compose (_("Normalizing '%3' (timespan %1 of %2)"),
                                              status->timespan, status->total_timespans, status->timespan_name);
-               progress = ((float) status->current_normalize_cycle) / status->total_normalize_cycles;
+               progress = ((float) status->current_postprocessing_cycle) / status->total_postprocessing_cycles;
                break;
        case ExportStatus::Encoding:
                status_text = string_compose (_("Encoding '%3' (timespan %1 of %2)"),
                                              status->timespan, status->total_timespans, status->timespan_name);
-               progress = ((float) status->current_normalize_cycle) / status->total_normalize_cycles;
+               progress = ((float) status->current_postprocessing_cycle) / status->total_postprocessing_cycles;
                break;
        case ExportStatus::Tagging:
                status_text = string_compose (_("Tagging '%3' (timespan %1 of %2)"),