smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

Add timespan name to export status text

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11381 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Sakari Bergen 2012-01-29 09:51:30 +00:00
parent aaec2a8480
commit 71a5e435e6
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gtk2_ardour/export_dialog.cc
View file

@ -262,6 +262,8 @@ ExportDialog::update_warnings ()
list_files_string += it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>\n"; list_files_string += it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>\n";
} }
} }
} }
void void
@ -331,12 +333,12 @@ ExportDialog::progress_timeout ()
std::string status_text; std::string status_text;
float progress = 0.0; float progress = 0.0;
if (status->normalizing) { if (status->normalizing) {
status_text = string_compose (_("Normalizing timespan %1 of %2"), status_text = string_compose (_("Normalizing '%3' (timespan %1 of %2)"),
status->timespan, status->total_timespans); status->timespan, status->total_timespans, status->timespan_name);
progress = ((float) status->current_normalize_cycle) / status->total_normalize_cycles; progress = ((float) status->current_normalize_cycle) / status->total_normalize_cycles;
} else { } else {
status_text = string_compose (_("Exporting timespan %1 of %2"), status_text = string_compose (_("Exporting '%3' (timespan %1 of %2)"),
status->timespan, status->total_timespans); status->timespan, status->total_timespans, status->timespan_name);
progress = ((float) status->processed_frames_current_timespan) / status->total_frames_current_timespan; progress = ((float) status->processed_frames_current_timespan) / status->total_frames_current_timespan;
} }
progress_bar.set_text (status_text); progress_bar.set_text (status_text);

1
libs/ardour/ardour/export_status.h
View file

@ -56,6 +56,7 @@ struct ExportStatus {
volatile uint32_t total_timespans; volatile uint32_t total_timespans;
volatile uint32_t timespan; volatile uint32_t timespan;
std::string timespan_name;
volatile framecnt_t total_frames; volatile framecnt_t total_frames;
volatile framecnt_t processed_frames; volatile framecnt_t processed_frames;

1
libs/ardour/export_handler.cc
View file

@ -164,6 +164,7 @@ ExportHandler::start_timespan ()
current_timespan = config_map.begin()->first; current_timespan = config_map.begin()->first;
export_status->total_frames_current_timespan = current_timespan->get_length(); export_status->total_frames_current_timespan = current_timespan->get_length();
export_status->timespan_name = current_timespan->name();
export_status->processed_frames_current_timespan = 0; export_status->processed_frames_current_timespan = 0;
/* Register file configurations to graph builder */ /* Register file configurations to graph builder */