#include "audiographer/utils/identity_vertex.h"
+#include <boost/ptr_container/ptr_list.hpp>
#include <glibmm/threadpool.h>
namespace AudioGrapher {
void add_split_config (FileSpec const & config);
- class Encoder : public sigc::trackable {
+ class Encoder {
public:
template <typename T> boost::shared_ptr<AudioGrapher::Sink<T> > init (FileSpec const & new_config);
void add_child (FileSpec const & new_config);
FileSpec config;
std::list<FilenamePtr> filenames;
+ PBD::ScopedConnection copy_files_connection;
// Only one of these should be available at a time
FloatWriterPtr float_writer;
class SFC {
public:
// This constructor so that this can be constructed like a Normalizer
- SFC (ExportGraphBuilder &) : data_width(0) {}
- FloatSinkPtr init (FileSpec const & new_config, nframes_t max_frames);
+ SFC (ExportGraphBuilder &, FileSpec const & new_config, nframes_t max_frames);
+ FloatSinkPtr sink ();
void add_child (FileSpec const & new_config);
bool operator== (FileSpec const & other_config) const;
typedef boost::shared_ptr<AudioGrapher::SampleFormatConverter<short> > ShortConverterPtr;
FileSpec config;
- std::list<Encoder> children;
+ boost::ptr_list<Encoder> children;
int data_width;
// Only one of these should be available at a time
FloatConverterPtr float_converter;
- IntConverterPtr int_converter;
+ IntConverterPtr int_converter;
ShortConverterPtr short_converter;
};
- class Normalizer : public sigc::trackable {
+ class Normalizer {
public:
- Normalizer (ExportGraphBuilder & parent) : parent (parent) {}
- FloatSinkPtr init (FileSpec const & new_config, nframes_t max_frames);
+ Normalizer (ExportGraphBuilder & parent, FileSpec const & new_config, nframes_t max_frames);
+ FloatSinkPtr sink ();
void add_child (FileSpec const & new_config);
bool operator== (FileSpec const & other_config) const;
TmpFilePtr tmp_file;
NormalizerPtr normalizer;
ThreaderPtr threader;
- std::list<SFC> children;
+ boost::ptr_list<SFC> children;
+
+ PBD::ScopedConnection post_processing_connection;
};
// sample rate converter
class SRC {
public:
- SRC (ExportGraphBuilder & parent) : parent (parent) {}
- FloatSinkPtr init (FileSpec const & new_config, nframes_t max_frames);
+ SRC (ExportGraphBuilder & parent, FileSpec const & new_config, nframes_t max_frames);
+ FloatSinkPtr sink ();
void add_child (FileSpec const & new_config);
bool operator== (FileSpec const & other_config) const;
typedef boost::shared_ptr<AudioGrapher::SampleRateConverter> SRConverterPtr;
template<typename T>
- void add_child_to_list (FileSpec const & new_config, std::list<T> & list);
+ void add_child_to_list (FileSpec const & new_config, boost::ptr_list<T> & list);
ExportGraphBuilder & parent;
FileSpec config;
- std::list<SFC> children;
- std::list<Normalizer> normalized_children;
+ boost::ptr_list<SFC> children;
+ boost::ptr_list<Normalizer> normalized_children;
SRConverterPtr converter;
nframes_t max_frames_out;
};
// Silence trimmer + adder
class SilenceHandler {
public:
- SilenceHandler (ExportGraphBuilder & parent) : parent (parent) {}
- FloatSinkPtr init (FileSpec const & new_config, nframes_t max_frames);
+ SilenceHandler (ExportGraphBuilder & parent, FileSpec const & new_config, nframes_t max_frames);
+ FloatSinkPtr sink ();
void add_child (FileSpec const & new_config);
bool operator== (FileSpec const & other_config) const;
ExportGraphBuilder & parent;
FileSpec config;
- std::list<SRC> children;
+ boost::ptr_list<SRC> children;
SilenceTrimmerPtr silence_trimmer;
nframes_t max_frames_in;
};
// channel configuration
class ChannelConfig {
public:
- ChannelConfig (ExportGraphBuilder & parent) : parent (parent) {}
- void init (FileSpec const & new_config, ChannelMap & channel_map);
+ ChannelConfig (ExportGraphBuilder & parent, FileSpec const & new_config, ChannelMap & channel_map);
void add_child (FileSpec const & new_config);
bool operator== (FileSpec const & other_config) const;
ExportGraphBuilder & parent;
FileSpec config;
- std::list<SilenceHandler> children;
+ boost::ptr_list<SilenceHandler> children;
InterleaverPtr interleaver;
nframes_t max_frames;
};
Session const & session;
// Roots for export processor trees
- typedef std::list<ChannelConfig> ChannelConfigList;
+ typedef boost::ptr_list<ChannelConfig> ChannelConfigList;
ChannelConfigList channel_configs;
// The sources of all data, each channel is read only once
}
// No duplicate channel config found, create new one
- channel_configs.push_back (ChannelConfig (*this));
- ChannelConfig & c_config (channel_configs.back());
- c_config.init (config, channels);
+ channel_configs.push_back (new ChannelConfig (*this, config, channels));
}
/* Encoder */
Glib::ustring filename = config.filename->get_path (config.format);
writer.reset (new AudioGrapher::SndfileWriter<T> (filename, format, channels, config.format->sample_rate()));
- writer->FileWritten.connect (sigc::mem_fun (*this, &ExportGraphBuilder::Encoder::copy_files));
+ writer->FileWritten.connect_same_thread (copy_files_connection, boost::bind (&ExportGraphBuilder::Encoder::copy_files, this, _1));
}
void
/* SFC */
-ExportGraphBuilder::FloatSinkPtr
-ExportGraphBuilder::SFC::init (FileSpec const & new_config, nframes_t max_frames)
+ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &, FileSpec const & new_config, nframes_t max_frames)
+ : data_width(0)
{
config = new_config;
data_width = sndfile_data_width (Encoder::get_real_format (config));
short_converter = ShortConverterPtr (new SampleFormatConverter<short> (channels));
short_converter->init (max_frames, config.format->dither_type(), data_width);
add_child (config);
- return short_converter;
} else if (data_width == 24 || data_width == 32) {
int_converter = IntConverterPtr (new SampleFormatConverter<int> (channels));
int_converter->init (max_frames, config.format->dither_type(), data_width);
add_child (config);
- return int_converter;
} else {
float_converter = FloatConverterPtr (new SampleFormatConverter<Sample> (channels));
float_converter->init (max_frames, config.format->dither_type(), data_width);
add_child (config);
+ }
+}
+
+ExportGraphBuilder::FloatSinkPtr
+ExportGraphBuilder::SFC::sink ()
+{
+ if (data_width == 8 || data_width == 16) {
+ return short_converter;
+ } else if (data_width == 24 || data_width == 32) {
+ return int_converter;
+ } else {
return float_converter;
}
}
void
ExportGraphBuilder::SFC::add_child (FileSpec const & new_config)
{
- for (std::list<Encoder>::iterator it = children.begin(); it != children.end(); ++it) {
+ for (boost::ptr_list<Encoder>::iterator it = children.begin(); it != children.end(); ++it) {
if (*it == new_config) {
it->add_child (new_config);
return;
}
}
- children.push_back (Encoder());
+ children.push_back (new Encoder());
Encoder & encoder = children.back();
if (data_width == 8 || data_width == 16) {
/* Normalizer */
-ExportGraphBuilder::FloatSinkPtr
-ExportGraphBuilder::Normalizer::init (FileSpec const & new_config, nframes_t /*max_frames*/)
+ExportGraphBuilder::Normalizer::Normalizer (ExportGraphBuilder & parent, FileSpec const & new_config, nframes_t /*max_frames*/)
+ : parent (parent)
{
config = new_config;
max_frames_out = 4086; // TODO good chunk size
int format = ExportFormatBase::F_RAW | ExportFormatBase::SF_Float;
tmp_file.reset (new TmpFile<float> (format, config.channel_config->get_n_chans(),
config.format->sample_rate()));
- tmp_file->FileWritten.connect (sigc::hide (sigc::mem_fun (*this, &Normalizer::start_post_processing)));
+ tmp_file->FileWritten.connect_same_thread (post_processing_connection, boost::bind (&Normalizer::start_post_processing, this));
add_child (new_config);
peak_reader->add_output (tmp_file);
+}
+
+ExportGraphBuilder::FloatSinkPtr
+ExportGraphBuilder::Normalizer::sink ()
+{
return peak_reader;
}
void
ExportGraphBuilder::Normalizer::add_child (FileSpec const & new_config)
{
- for (std::list<SFC>::iterator it = children.begin(); it != children.end(); ++it) {
+ for (boost::ptr_list<SFC>::iterator it = children.begin(); it != children.end(); ++it) {
if (*it == new_config) {
it->add_child (new_config);
return;
}
}
- children.push_back (SFC (parent));
- threader->add_output (children.back().init (new_config, max_frames_out));
+ children.push_back (new SFC (parent, new_config, max_frames_out));
+ threader->add_output (children.back().sink());
}
bool
/* SRC */
-ExportGraphBuilder::FloatSinkPtr
-ExportGraphBuilder::SRC::init (FileSpec const & new_config, nframes_t max_frames)
+ExportGraphBuilder::SRC::SRC (ExportGraphBuilder & parent, FileSpec const & new_config, nframes_t max_frames)
+ : parent (parent)
{
config = new_config;
converter.reset (new SampleRateConverter (new_config.channel_config->get_n_chans()));
max_frames_out = converter->allocate_buffers (max_frames);
add_child (new_config);
-
+}
+
+ExportGraphBuilder::FloatSinkPtr
+ExportGraphBuilder::SRC::sink ()
+{
return converter;
}
template<typename T>
void
-ExportGraphBuilder::SRC::add_child_to_list (FileSpec const & new_config, std::list<T> & list)
+ExportGraphBuilder::SRC::add_child_to_list (FileSpec const & new_config, boost::ptr_list<T> & list)
{
- for (typename std::list<T>::iterator it = list.begin(); it != list.end(); ++it) {
+ for (typename boost::ptr_list<T>::iterator it = list.begin(); it != list.end(); ++it) {
if (*it == new_config) {
it->add_child (new_config);
return;
}
}
- list.push_back (T (parent));
- converter->add_output (list.back().init (new_config, max_frames_out));
+ list.push_back (new T (parent, new_config, max_frames_out));
+ converter->add_output (list.back().sink ());
}
bool
}
/* SilenceHandler */
-ExportGraphBuilder::FloatSinkPtr
-ExportGraphBuilder::SilenceHandler::init (FileSpec const & new_config, nframes_t max_frames)
+ExportGraphBuilder::SilenceHandler::SilenceHandler (ExportGraphBuilder & parent, FileSpec const & new_config, nframes_t max_frames)
+ : parent (parent)
{
config = new_config;
max_frames_in = max_frames;
silence_trimmer->add_silence_to_end (config.format->silence_end(sample_rate));
add_child (new_config);
-
+}
+
+ExportGraphBuilder::FloatSinkPtr
+ExportGraphBuilder::SilenceHandler::sink ()
+{
return silence_trimmer;
}
void
ExportGraphBuilder::SilenceHandler::add_child (FileSpec const & new_config)
{
- for (std::list<SRC>::iterator it = children.begin(); it != children.end(); ++it) {
+ for (boost::ptr_list<SRC>::iterator it = children.begin(); it != children.end(); ++it) {
if (*it == new_config) {
it->add_child (new_config);
return;
}
}
- children.push_back (SRC (parent));
- silence_trimmer->add_output (children.back().init (new_config, max_frames_in));
+ children.push_back (new SRC (parent, new_config, max_frames_in));
+ silence_trimmer->add_output (children.back().sink());
}
bool
/* ChannelConfig */
-void
-ExportGraphBuilder::ChannelConfig::init (FileSpec const & new_config, ChannelMap & channel_map)
+ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, FileSpec const & new_config, ChannelMap & channel_map)
+ : parent (parent)
{
typedef ExportChannelConfiguration::ChannelList ChannelList;
void
ExportGraphBuilder::ChannelConfig::add_child (FileSpec const & new_config)
{
- for (std::list<SilenceHandler>::iterator it = children.begin(); it != children.end(); ++it) {
+ for (boost::ptr_list<SilenceHandler>::iterator it = children.begin(); it != children.end(); ++it) {
if (*it == new_config) {
it->add_child (new_config);
return;
}
}
- children.push_back (SilenceHandler (parent));
nframes_t max_frames_out = new_config.channel_config->get_n_chans() * max_frames;
- interleaver->add_output (children.back().init (new_config, max_frames_out));
+ children.push_back (new SilenceHandler (parent, new_config, max_frames_out));
+ interleaver->add_output (children.back().sink ());
}
bool