ardour/livetrax
13
0
Fork 0
Code

Replace boost::ptr_list with std::list

Browse Source
This commit is contained in:
Alejandro Domínguez 2024-08-27 00:57:39 +02:00 committed by Robin Gareus
parent e326426dbc
commit abf7a78984
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/export_graph_builder.h
View File

@ -179,7 +179,7 @@ class LIBARDOUR_API ExportGraphBuilder
FileSpec config; FileSpec config;
int data_width; int data_width;
boost::ptr_list<Encoder> children; std::list<Encoder> children;
NormalizerPtr normalizer; NormalizerPtr normalizer;
LimiterPtr limiter; LimiterPtr limiter;
@ -228,7 +228,7 @@ class LIBARDOUR_API ExportGraphBuilder
ThreaderPtr threader; ThreaderPtr threader;
LoudnessReaderPtr loudness_reader; LoudnessReaderPtr loudness_reader;
boost::ptr_list<SFC> children; std::list<SFC> children;
PBD::ScopedConnectionList post_processing_connection; PBD::ScopedConnectionList post_processing_connection;
}; };

16
libs/ardour/export_graph_builder.cc
View File

@ -700,14 +700,14 @@ ExportGraphBuilder::SFC::sink ()
void void
ExportGraphBuilder::SFC::add_child (FileSpec const & new_config) ExportGraphBuilder::SFC::add_child (FileSpec const & new_config)
{ {
for (boost::ptr_list<Encoder>::iterator it = children.begin(); it != children.end(); ++it) { for (std::list<Encoder>::iterator it = children.begin(); it != children.end(); ++it) {
if (*it == new_config) { if (*it == new_config) {
it->add_child (new_config); it->add_child (new_config);
return; return;
} }
} }
children.push_back (new Encoder()); children.push_back (Encoder());
Encoder & encoder = children.back(); Encoder & encoder = children.back();
if (data_width == 8 || data_width == 16) { if (data_width == 8 || data_width == 16) {
@ -722,7 +722,7 @@ ExportGraphBuilder::SFC::add_child (FileSpec const & new_config)
void void
ExportGraphBuilder::SFC::remove_children (bool remove_out_files) ExportGraphBuilder::SFC::remove_children (bool remove_out_files)
{ {
boost::ptr_list<Encoder>::iterator iter = children.begin (); std::list<Encoder>::iterator iter = children.begin ();
while (iter != children.end() ) { while (iter != children.end() ) {
@ -830,21 +830,21 @@ ExportGraphBuilder::Intermediate::add_child (FileSpec const & new_config)
use_peak |= new_config.format->normalize (); use_peak |= new_config.format->normalize ();
use_loudness |= new_config.format->normalize_loudness (); use_loudness |= new_config.format->normalize_loudness ();
for (boost::ptr_list<SFC>::iterator it = children.begin(); it != children.end(); ++it) { for (std::list<SFC>::iterator it = children.begin(); it != children.end(); ++it) {
if (*it == new_config) { if (*it == new_config) {
it->add_child (new_config); it->add_child (new_config);
return; 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()); threader->add_output (children.back().sink());
} }
void void
ExportGraphBuilder::Intermediate::remove_children (bool remove_out_files) ExportGraphBuilder::Intermediate::remove_children (bool remove_out_files)
{ {
boost::ptr_list<SFC>::iterator iter = children.begin (); std::list<SFC>::iterator iter = children.begin ();
while (iter != children.end() ) { while (iter != children.end() ) {
iter->remove_children (remove_out_files); iter->remove_children (remove_out_files);
@ -875,7 +875,7 @@ ExportGraphBuilder::Intermediate::process()
void void
ExportGraphBuilder::Intermediate::prepare_post_processing() ExportGraphBuilder::Intermediate::prepare_post_processing()
{ {
for (boost::ptr_list<SFC>::iterator i = children.begin(); i != children.end(); ++i) { for (std::list<SFC>::iterator i = children.begin(); i != children.end(); ++i) {
if (use_peak) { if (use_peak) {
(*i).set_peak_dbfs (peak_reader->get_peak()); (*i).set_peak_dbfs (peak_reader->get_peak());
} }
@ -891,7 +891,7 @@ ExportGraphBuilder::Intermediate::prepare_post_processing()
void void
ExportGraphBuilder::Intermediate::start_post_processing() ExportGraphBuilder::Intermediate::start_post_processing()
{ {
for (boost::ptr_list<SFC>::iterator i = children.begin(); i != children.end(); ++i) { for (std::list<SFC>::iterator i = children.begin(); i != children.end(); ++i) {
(*i).set_duration (tmp_file->get_samples_written() / config.channel_config->get_n_chans()); (*i).set_duration (tmp_file->get_samples_written() / config.channel_config->get_n_chans());
} }