X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_graph_builder.cc;h=c054d85242d1f619fc46779101fc841ca1223587;hb=cfff528ae9036252b8f30c9cb4566c5971c95f10;hp=5e8c052b637dbaf804dae5e876de058c4d263a9d;hpb=afd67800b969f9a1d5fe4fd4b7c8a0cbfe3a13b4;p=ardour.git diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc index 5e8c052b63..c054d85242 100644 --- a/libs/ardour/export_graph_builder.cc +++ b/libs/ardour/export_graph_builder.cc @@ -1,20 +1,20 @@ /* - Copyright (C) 2008-2012 Paul Davis - Author: Sakari Bergen + Copyright (C) 2008-2012 Paul Davis + Author: Sakari Bergen - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -53,8 +53,8 @@ using std::string; namespace ARDOUR { ExportGraphBuilder::ExportGraphBuilder (Session const & session) - : session (session) - , thread_pool (hardware_concurrency()) + : session (session) + , thread_pool (hardware_concurrency()) { process_buffer_frames = session.engine().samples_per_cycle(); } @@ -112,6 +112,17 @@ ExportGraphBuilder::reset () normalizers.clear (); } +void +ExportGraphBuilder::cleanup (bool remove_out_files/*=false*/) +{ + ChannelConfigList::iterator iter = channel_configs.begin(); + + while (iter != channel_configs.end() ) { + iter->remove_children(remove_out_files); + iter = channel_configs.erase(iter); + } +} + void ExportGraphBuilder::set_current_timespan (boost::shared_ptr span) { @@ -211,6 +222,33 @@ ExportGraphBuilder::Encoder::add_child (FileSpec const & new_config) filenames.push_back (new_config.filename); } +void +ExportGraphBuilder::Encoder::destroy_writer (bool delete_out_file) +{ + if (delete_out_file ) { + + if (float_writer) { + float_writer->close (); + } + + if (int_writer) { + int_writer->close (); + } + + if (short_writer) { + short_writer->close (); + } + + if (std::remove(writer_filename.c_str() ) != 0) { + std::cout << "Encoder::destroy_writer () : Error removing file: " << strerror(errno) << std::endl; + } + } + + float_writer.reset (); + int_writer.reset (); + short_writer.reset (); +} + bool ExportGraphBuilder::Encoder::operator== (FileSpec const & other_config) const { @@ -231,9 +269,9 @@ ExportGraphBuilder::Encoder::init_writer (boost::shared_ptrget_n_chans(); int format = get_real_format (config); config.filename->set_channel_config(config.channel_config); - string filename = config.filename->get_path (config.format); + writer_filename = config.filename->get_path (config.format); - writer.reset (new AudioGrapher::SndfileWriter (filename, format, channels, config.format->sample_rate(), config.broadcast_info)); + writer.reset (new AudioGrapher::SndfileWriter (writer_filename, format, channels, config.format->sample_rate(), config.broadcast_info)); writer->FileWritten.connect_same_thread (copy_files_connection, boost::bind (&ExportGraphBuilder::Encoder::copy_files, this, _1)); } @@ -250,7 +288,7 @@ ExportGraphBuilder::Encoder::copy_files (std::string orig_path) /* SFC */ ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &, FileSpec const & new_config, framecnt_t max_frames) - : data_width(0) + : data_width(0) { config = new_config; data_width = sndfile_data_width (Encoder::get_real_format (config)); @@ -306,6 +344,20 @@ ExportGraphBuilder::SFC::add_child (FileSpec const & new_config) } } +void +ExportGraphBuilder::SFC::remove_children (bool remove_out_files) +{ + boost::ptr_list::iterator iter = children.begin (); + + while (iter != children.end() ) { + + if (remove_out_files) { + iter->destroy_writer(remove_out_files); + } + iter = children.erase (iter); + } +} + bool ExportGraphBuilder::SFC::operator== (FileSpec const & other_config) const { @@ -315,7 +367,7 @@ ExportGraphBuilder::SFC::operator== (FileSpec const & other_config) const /* Normalizer */ ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t /*max_frames*/) - : parent (parent) + : parent (parent) { std::string tmpfile_path = parent.session.session_directory().export_path(); tmpfile_path = Glib::build_filename(tmpfile_path, "XXXXXX"); @@ -326,7 +378,7 @@ ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpe config = new_config; uint32_t const channels = config.channel_config->get_n_chans(); max_frames_out = 4086 - (4086 % channels); // TODO good chunk size - + buffer.reset (new AllocatingProcessContext (max_frames_out, channels)); peak_reader.reset (new PeakReader ()); normalizer.reset (new AudioGrapher::Normalizer (config.format->normalize_target())); @@ -365,11 +417,22 @@ ExportGraphBuilder::Normalizer::add_child (FileSpec const & new_config) threader->add_output (children.back().sink()); } +void +ExportGraphBuilder::Normalizer::remove_children (bool remove_out_files) +{ + boost::ptr_list::iterator iter = children.begin (); + + while (iter != children.end() ) { + iter->remove_children (remove_out_files); + iter = children.erase (iter); + } +} + bool ExportGraphBuilder::Normalizer::operator== (FileSpec const & other_config) const { return config.format->normalize() == other_config.format->normalize() && - config.format->normalize_target() == other_config.format->normalize_target(); + config.format->normalize_target() == other_config.format->normalize_target(); } unsigned @@ -398,7 +461,7 @@ ExportGraphBuilder::Normalizer::start_post_processing() /* SRC */ ExportGraphBuilder::SRC::SRC (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames) - : parent (parent) + : parent (parent) { config = new_config; converter.reset (new SampleRateConverter (new_config.channel_config->get_n_chans())); @@ -425,6 +488,27 @@ ExportGraphBuilder::SRC::add_child (FileSpec const & new_config) } } +void +ExportGraphBuilder::SRC::remove_children (bool remove_out_files) +{ + boost::ptr_list::iterator sfc_iter = children.begin(); + + while (sfc_iter != children.end() ) { + converter->remove_output (sfc_iter->sink() ); + sfc_iter->remove_children (remove_out_files); + sfc_iter = children.erase (sfc_iter); + } + + boost::ptr_list::iterator norm_iter = normalized_children.begin(); + + while (norm_iter != normalized_children.end() ) { + converter->remove_output (norm_iter->sink() ); + norm_iter->remove_children (remove_out_files); + norm_iter = normalized_children.erase (norm_iter); + } + +} + template void ExportGraphBuilder::SRC::add_child_to_list (FileSpec const & new_config, boost::ptr_list & list) @@ -448,7 +532,7 @@ ExportGraphBuilder::SRC::operator== (FileSpec const & other_config) const /* SilenceHandler */ ExportGraphBuilder::SilenceHandler::SilenceHandler (ExportGraphBuilder & parent, FileSpec const & new_config, framecnt_t max_frames) - : parent (parent) + : parent (parent) { config = new_config; max_frames_in = max_frames; @@ -487,21 +571,33 @@ ExportGraphBuilder::SilenceHandler::add_child (FileSpec const & new_config) silence_trimmer->add_output (children.back().sink()); } +void +ExportGraphBuilder::SilenceHandler::remove_children (bool remove_out_files) +{ + boost::ptr_list::iterator iter = children.begin(); + + while (iter != children.end() ) { + silence_trimmer->remove_output (iter->sink() ); + iter->remove_children (remove_out_files); + iter = children.erase (iter); + } +} + bool ExportGraphBuilder::SilenceHandler::operator== (FileSpec const & other_config) const { ExportFormatSpecification & format = *config.format; ExportFormatSpecification & other_format = *other_config.format; return (format.trim_beginning() == other_format.trim_beginning()) && - (format.trim_end() == other_format.trim_end()) && - (format.silence_beginning_time() == other_format.silence_beginning_time()) && - (format.silence_end_time() == other_format.silence_end_time()); + (format.trim_end() == other_format.trim_end()) && + (format.silence_beginning_time() == other_format.silence_beginning_time()) && + (format.silence_end_time() == other_format.silence_end_time()); } /* ChannelConfig */ ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, FileSpec const & new_config, ChannelMap & channel_map) - : parent (parent) + : parent (parent) { typedef ExportChannelConfiguration::ChannelList ChannelList; @@ -552,6 +648,19 @@ ExportGraphBuilder::ChannelConfig::add_child (FileSpec const & new_config) chunker->add_output (children.back().sink ()); } +void +ExportGraphBuilder::ChannelConfig::remove_children (bool remove_out_files) +{ + boost::ptr_list::iterator iter = children.begin(); + + while(iter != children.end() ) { + + chunker->remove_output (iter->sink ()); + iter->remove_children (remove_out_files); + iter = children.erase(iter); + } +} + bool ExportGraphBuilder::ChannelConfig::operator== (FileSpec const & other_config) const {