From 24ec0b974d84df061cbbe645668dc62fa7120678 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 26 Sep 2017 17:49:24 +0200 Subject: Properly aligned export (Stem + Session) Delay ports being exported by their playback latency. --- libs/ardour/export_handler.cc | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to 'libs/ardour/export_handler.cc') diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index 7301e12b68..df74bda065 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -193,7 +193,6 @@ 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; @@ -206,33 +205,6 @@ 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); } @@ -245,7 +217,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, incl_master_bus); + session.start_audio_export (process_position, realtime, region_export); } void -- cgit v1.2.3