Configurable export-silence trim threshold (no GUI yet)

[ardour.git] / libs / ardour / export_graph_builder.cc

diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc
index 9e25d51513ad38cf10f6edf51117cb2f8dd3f4af..d23763a5677fc728b8d31a3b413aad53c71b6b9a 100644 (file)
--- a/libs/ardour/export_graph_builder.cc
+++ b/libs/ardour/export_graph_builder.cc
@@ -311,8 +311,11 @@ ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &parent, FileSpec const & new_c
                framecnt_t sb = config.format->silence_beginning_at (parent.timespan->get_start(), sample_rate);
                framecnt_t se = config.format->silence_end_at (parent.timespan->get_end(), sample_rate);
                framecnt_t duration = parent.timespan->get_length () + sb + se;
+               max_frames = min ((framecnt_t) 8192 * channels, max ((framecnt_t) 4096 * channels, max_frames));
+               chunker.reset (new Chunker<Sample> (max_frames));
                analyser.reset (new Analyser (config.format->sample_rate(), channels, max_frames,
-                                       (framecnt_t) ceil (duration * config.format->sample_rate () / sample_rate)));
+                                       (framecnt_t) ceil (duration * config.format->sample_rate () / (double) sample_rate)));
+               chunker->add_output (analyser);
                parent.add_analyser (config.filename->get_path (config.format), analyser);
        }
 
@@ -348,7 +351,7 @@ ExportGraphBuilder::FloatSinkPtr
 ExportGraphBuilder::SFC::sink ()
 {
        if (_analyse) {
-               return analyser;
+               return chunker;
        } else if (data_width == 8 || data_width == 16) {
                return short_converter;
        } else if (data_width == 24 || data_width == 32) {
@@ -577,7 +580,8 @@ ExportGraphBuilder::SilenceHandler::SilenceHandler (ExportGraphBuilder & parent,
        max_frames_in = max_frames;
        framecnt_t sample_rate = parent.session.nominal_frame_rate();
 
-       silence_trimmer.reset (new SilenceTrimmer<Sample>(max_frames_in));
+       // TODO silence-threshold should be per export-preset, with Config->get_silence_threshold being the default
+       silence_trimmer.reset (new SilenceTrimmer<Sample>(max_frames_in, Config->get_export_silence_threshold ()));
        silence_trimmer->set_trim_beginning (config.format->trim_beginning());
        silence_trimmer->set_trim_end (config.format->trim_end());