From 0e658529011d859e508e3ef62d29fa2fe56535eb Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 25 Oct 2016 22:33:37 +0200 Subject: Desperate hack to align master-bus on export. Another 90% solution which hopefully gives us another year :( see comments Session::start_audio_export() for explanation. --- libs/ardour/export_handler.cc | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'libs/ardour/export_handler.cc') diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index 3bdfdc9090..34333b488b 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -28,6 +28,7 @@ #include "ardour/audioengine.h" #include "ardour/audiofile_tagger.h" +#include "ardour/audio_port.h" #include "ardour/debug.h" #include "ardour/export_graph_builder.h" #include "ardour/export_timespan.h" @@ -192,6 +193,7 @@ ExportHandler::start_timespan () handle_duplicate_format_extensions(); bool realtime = current_timespan->realtime (); bool region_export = true; + bool incl_master_bus = false; for (ConfigMap::iterator it = timespan_bounds.first; it != timespan_bounds.second; ++it) { // Filenames can be shared across timespans FileSpec & spec = it->second; @@ -204,6 +206,33 @@ ExportHandler::start_timespan () default: break; } +#if 1 // hack alert -- align master bus, compensate master latency + + /* there's no easier way to get this information here. + * Ports are configured in the PortExportChannelSelector GUI, + * This ExportHandler has no context of routes. + */ + boost::shared_ptr master_bus = session.master_out (); + if (master_bus) { + const PortSet& ps = master_bus->output ()->ports(); + + const ExportChannelConfiguration::ChannelList& channels = spec.channel_config->get_channels (); + for (ExportChannelConfiguration::ChannelList::const_iterator it = channels.begin(); it != channels.end(); ++it) { + + boost::shared_ptr pep = boost::dynamic_pointer_cast (*it); + if (!pep) { + continue; + } + PortExportChannel::PortSet const& ports = pep->get_ports (); + for (PortExportChannel::PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) { + boost::shared_ptr ap = (*it).lock(); + if (ps.contains (ap)) { + incl_master_bus = true; + } + } + } + } +#endif graph_builder->add_config (spec, realtime); } @@ -216,7 +245,7 @@ ExportHandler::start_timespan () session.ProcessExport.connect_same_thread (process_connection, boost::bind (&ExportHandler::process, this, _1)); process_position = current_timespan->get_start(); // TODO check if it's a RegionExport.. set flag to skip process_without_events() - session.start_audio_export (process_position, realtime, region_export); + session.start_audio_export (process_position, realtime, region_export, incl_master_bus); } void -- cgit v1.2.3