diff options
author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2012-01-29 09:51:30 +0000 |
---|---|---|
committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2012-01-29 09:51:30 +0000 |
commit | 71a5e435e656d6226feaefc4fe40ceff4dd6deea (patch) | |
tree | 0447c1330edd98aa0794a6a2648f9dc3ed8949be | |
parent | aaec2a84803230b93ff13f07514a341a10dab3ee (diff) |
Add timespan name to export status text
git-svn-id: svn://localhost/ardour2/branches/3.0@11381 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/export_dialog.cc | 10 | ||||
-rw-r--r-- | libs/ardour/ardour/export_status.h | 1 | ||||
-rw-r--r-- | libs/ardour/export_handler.cc | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index c5e20c01ae..3dea7ee1a6 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -262,6 +262,8 @@ ExportDialog::update_warnings () list_files_string += it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>\n"; } } + + } void @@ -331,12 +333,12 @@ ExportDialog::progress_timeout () std::string status_text; float progress = 0.0; if (status->normalizing) { - status_text = string_compose (_("Normalizing timespan %1 of %2"), - status->timespan, status->total_timespans); + 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; } else { - status_text = string_compose (_("Exporting timespan %1 of %2"), - status->timespan, status->total_timespans); + 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_bar.set_text (status_text); diff --git a/libs/ardour/ardour/export_status.h b/libs/ardour/ardour/export_status.h index c85d37156c..56b15eada1 100644 --- a/libs/ardour/ardour/export_status.h +++ b/libs/ardour/ardour/export_status.h @@ -56,6 +56,7 @@ struct ExportStatus { volatile uint32_t total_timespans; volatile uint32_t timespan; + std::string timespan_name; volatile framecnt_t total_frames; volatile framecnt_t processed_frames; diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index d6ade6532c..54b46ba617 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -164,6 +164,7 @@ ExportHandler::start_timespan () current_timespan = config_map.begin()->first; export_status->total_frames_current_timespan = current_timespan->get_length(); + export_status->timespan_name = current_timespan->name(); export_status->processed_frames_current_timespan = 0; /* Register file configurations to graph builder */ |