diff options
author | Robin Gareus <robin@gareus.org> | 2016-07-18 17:31:50 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2016-07-18 17:37:13 +0200 |
commit | 8c944c08eacf8372fc714c9c00257ec13a263ae8 (patch) | |
tree | 12a63721f31c54985a329037bf62359ad3432c2e /libs | |
parent | b64dcac17ec6ab503198d933ef893760fb02ae22 (diff) |
Normalize API rename part 2
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/export_graph_builder.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/export_status.h | 4 | ||||
-rw-r--r-- | libs/ardour/export_graph_builder.cc | 6 | ||||
-rw-r--r-- | libs/ardour/export_handler.cc | 6 | ||||
-rw-r--r-- | libs/ardour/export_status.cc | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/libs/ardour/ardour/export_graph_builder.h b/libs/ardour/ardour/export_graph_builder.h index 8b6f6ceb79..c9671d729b 100644 --- a/libs/ardour/ardour/export_graph_builder.h +++ b/libs/ardour/ardour/export_graph_builder.h @@ -71,7 +71,7 @@ class LIBARDOUR_API ExportGraphBuilder bool post_process (); // returns true when finished bool need_postprocessing () const { return !intermediates.empty(); } bool realtime() const { return _realtime; } - unsigned get_normalize_cycle_count() const; + unsigned get_postprocessing_cycle_count() const; void reset (); void cleanup (bool remove_out_files = false); @@ -155,7 +155,7 @@ class LIBARDOUR_API ExportGraphBuilder void remove_children (bool remove_out_files); bool operator== (FileSpec const & other_config) const; - unsigned get_normalize_cycle_count() const; + unsigned get_postprocessing_cycle_count() const; /// Returns true when finished bool process (); diff --git a/libs/ardour/ardour/export_status.h b/libs/ardour/ardour/export_status.h index 4782f49cb4..99642a2d7c 100644 --- a/libs/ardour/ardour/export_status.h +++ b/libs/ardour/ardour/export_status.h @@ -78,8 +78,8 @@ class LIBARDOUR_API ExportStatus { volatile framecnt_t total_frames_current_timespan; volatile framecnt_t processed_frames_current_timespan; - volatile uint32_t total_normalize_cycles; - volatile uint32_t current_normalize_cycle; + volatile uint32_t total_postprocessing_cycles; + volatile uint32_t current_postprocessing_cycle; AnalysisResults result_map; diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc index 521916706c..7c5a434bee 100644 --- a/libs/ardour/export_graph_builder.cc +++ b/libs/ardour/export_graph_builder.cc @@ -98,11 +98,11 @@ ExportGraphBuilder::post_process () } unsigned -ExportGraphBuilder::get_normalize_cycle_count() const +ExportGraphBuilder::get_postprocessing_cycle_count() const { unsigned max = 0; for (std::list<Intermediate *>::const_iterator it = intermediates.begin(); it != intermediates.end(); ++it) { - max = std::max(max, (*it)->get_normalize_cycle_count()); + max = std::max(max, (*it)->get_postprocessing_cycle_count()); } return max; } @@ -516,7 +516,7 @@ ExportGraphBuilder::Intermediate::operator== (FileSpec const & other_config) con } unsigned -ExportGraphBuilder::Intermediate::get_normalize_cycle_count() const +ExportGraphBuilder::Intermediate::get_postprocessing_cycle_count() const { return static_cast<unsigned>(std::ceil(static_cast<float>(tmp_file->get_frames_written()) / max_frames_out)); diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index 8e24c80967..ac2f7b0bd3 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -275,8 +275,8 @@ ExportHandler::process_timespan (framecnt_t frames) if (last_cycle) { post_processing = graph_builder->need_postprocessing (); if (post_processing) { - export_status->total_normalize_cycles = graph_builder->get_normalize_cycle_count(); - export_status->current_normalize_cycle = 0; + export_status->total_postprocessing_cycles = graph_builder->get_postprocessing_cycle_count(); + export_status->current_postprocessing_cycle = 0; } else { finish_timespan (); return 0; @@ -300,7 +300,7 @@ ExportHandler::post_process () } } - export_status->current_normalize_cycle++; + export_status->current_postprocessing_cycle++; return 0; } diff --git a/libs/ardour/export_status.cc b/libs/ardour/export_status.cc index 170073974b..808d6f144c 100644 --- a/libs/ardour/export_status.cc +++ b/libs/ardour/export_status.cc @@ -50,8 +50,8 @@ ExportStatus::init () total_frames_current_timespan = 0; processed_frames_current_timespan = 0; - total_normalize_cycles = 0; - current_normalize_cycle = 0; + total_postprocessing_cycles = 0; + current_postprocessing_cycle = 0; result_map.clear(); } |