Fix insertion of processors at the point at which the processor menu was opened;...

[ardour.git] / gtk2_ardour / export_dialog.cc

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index e51f5771d3c32f011c8a77fa51f38c144a836e64..fc05b123742a4dce865b061fecec2965988726e6 100644 (file)
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -259,7 +259,7 @@ ExportDialog::update_warnings ()
                list_files_hbox.show ();
                for (std::list<string>::iterator it = warnings->conflicting_filenames.begin(); it != warnings->conflicting_filenames.end(); ++it) {
                        string::size_type pos = it->find_last_of ("/");
-                       list_files_string += "\n" + it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>";
+                       list_files_string += it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>\n";
                }
        }
 }
@@ -328,26 +328,15 @@ ExportDialog::show_progress ()
 gint
 ExportDialog::progress_timeout ()
 {
-       switch (status->stage) {
-         case export_None:
-               progress_label.set_text ("");
-               break;
-         case export_ReadTimespan:
-               progress_label.set_text (string_compose (_("Reading timespan %1 of %2"), status->timespan, status->total_timespans));
-               break;
-         case export_PostProcess:
-               progress_label.set_text (string_compose (_("Processing file %2 of %3 (%1) from timespan %4 of %5"),
-                                                        file_notebook->get_nth_format_name (status->format),
-                                                        status->format, status->total_formats,
-                                                        status->timespan, status->total_timespans));
-               break;
-         case export_Write:
-               progress_label.set_text (string_compose (_("Encoding file %2 of %3 (%1) from timespan %4 of %5"),
-                                                        file_notebook->get_nth_format_name (status->format),
-                                                        status->format, status->total_formats,
-                                                        status->timespan, status->total_timespans));
-               break;
+       std::string status_text;
+       if (status->normalizing) {
+                status_text = string_compose (_("Normalizing timespan %1 of %2"),
+                                              status->timespan, status->total_timespans);
+       } else {
+               status_text = string_compose (_("Exporting timespan %1 of %2"),
+                                             status->timespan, status->total_timespans);
        }
+       progress_label.set_text (status_text);
 
        progress_bar.set_fraction (status->progress);
        return TRUE;