Allow group gain sharing + VCA again

[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 5a9548ed07da3781a6889f1e7ba398d0798df170..afcfd2ee5dd6ff3e6e45eb5d26382f0df009afe6 100644 (file)
--- a/libs/ardour/export_graph_builder.cc
+++ b/libs/ardour/export_graph_builder.cc
@@ -641,9 +641,18 @@ ExportGraphBuilder::SilenceHandler::SilenceHandler (ExportGraphBuilder & parent,
        max_frames_in = max_frames;
        framecnt_t sample_rate = parent.session.nominal_frame_rate();
 
+       /* work around partsing "-inf" config to "0" -- 7b1f97b
+        * silence trim 0dBFS makes no sense, anyway.
+        */
+       float est = Config->get_export_silence_threshold ();
+       if (est >= 0.f) est = -INFINITY;
+#ifdef MIXBUS
+       // Mixbus channelstrip always dithers the signal, cut above dither level
+       silence_trimmer.reset (new SilenceTrimmer<Sample>(max_frames_in, std::max (-90.f, est)));
+#else
        // 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, -90));
-
+       silence_trimmer.reset (new SilenceTrimmer<Sample>(max_frames_in, est));
+#endif
        silence_trimmer->set_trim_beginning (config.format->trim_beginning());
        silence_trimmer->set_trim_end (config.format->trim_end());