From abf7a7898447524c4a60d951d0759586d0821ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Dom=C3=ADnguez?= Date: Tue, 27 Aug 2024 00:57:39 +0200 Subject: [PATCH] Replace boost::ptr_list with std::list --- libs/ardour/ardour/export_graph_builder.h | 4 ++-- libs/ardour/export_graph_builder.cc | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/ardour/ardour/export_graph_builder.h b/libs/ardour/ardour/export_graph_builder.h index cedd019e4c..5ba13de5f0 100644 --- a/libs/ardour/ardour/export_graph_builder.h +++ b/libs/ardour/ardour/export_graph_builder.h @@ -179,7 +179,7 @@ class LIBARDOUR_API ExportGraphBuilder FileSpec config; int data_width; - boost::ptr_list children; + std::list children; NormalizerPtr normalizer; LimiterPtr limiter; @@ -228,7 +228,7 @@ class LIBARDOUR_API ExportGraphBuilder ThreaderPtr threader; LoudnessReaderPtr loudness_reader; - boost::ptr_list children; + std::list children; PBD::ScopedConnectionList post_processing_connection; }; diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc index 0cf7e1509e..a428e5f7df 100644 --- a/libs/ardour/export_graph_builder.cc +++ b/libs/ardour/export_graph_builder.cc @@ -700,14 +700,14 @@ ExportGraphBuilder::SFC::sink () void ExportGraphBuilder::SFC::add_child (FileSpec const & new_config) { - for (boost::ptr_list::iterator it = children.begin(); it != children.end(); ++it) { + for (std::list::iterator it = children.begin(); it != children.end(); ++it) { if (*it == new_config) { it->add_child (new_config); return; } } - children.push_back (new Encoder()); + children.push_back (Encoder()); Encoder & encoder = children.back(); if (data_width == 8 || data_width == 16) { @@ -722,7 +722,7 @@ ExportGraphBuilder::SFC::add_child (FileSpec const & new_config) void ExportGraphBuilder::SFC::remove_children (bool remove_out_files) { - boost::ptr_list::iterator iter = children.begin (); + std::list::iterator iter = children.begin (); while (iter != children.end() ) { @@ -830,21 +830,21 @@ ExportGraphBuilder::Intermediate::add_child (FileSpec const & new_config) use_peak |= new_config.format->normalize (); use_loudness |= new_config.format->normalize_loudness (); - for (boost::ptr_list::iterator it = children.begin(); it != children.end(); ++it) { + for (std::list::iterator it = children.begin(); it != children.end(); ++it) { if (*it == new_config) { it->add_child (new_config); return; } } - children.push_back (new SFC (parent, new_config, max_samples_out)); + children.push_back (SFC (parent, new_config, max_samples_out)); threader->add_output (children.back().sink()); } void ExportGraphBuilder::Intermediate::remove_children (bool remove_out_files) { - boost::ptr_list::iterator iter = children.begin (); + std::list::iterator iter = children.begin (); while (iter != children.end() ) { iter->remove_children (remove_out_files); @@ -875,7 +875,7 @@ ExportGraphBuilder::Intermediate::process() void ExportGraphBuilder::Intermediate::prepare_post_processing() { - for (boost::ptr_list::iterator i = children.begin(); i != children.end(); ++i) { + for (std::list::iterator i = children.begin(); i != children.end(); ++i) { if (use_peak) { (*i).set_peak_dbfs (peak_reader->get_peak()); } @@ -891,7 +891,7 @@ ExportGraphBuilder::Intermediate::prepare_post_processing() void ExportGraphBuilder::Intermediate::start_post_processing() { - for (boost::ptr_list::iterator i = children.begin(); i != children.end(); ++i) { + for (std::list::iterator i = children.begin(); i != children.end(); ++i) { (*i).set_duration (tmp_file->get_samples_written() / config.channel_config->get_n_chans()); }