Use XMLNode::get/set_property API in ExportFormatSpecification

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

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index 3bdfdc90901179c4b774eb76f9e409c7743523c2..1f10aaa2d37a2841136fce45e174df1a8459c84a 100644 (file)
--- 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<Route> 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 <PortExportChannel> pep = boost::dynamic_pointer_cast<PortExportChannel> (*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<AudioPort> 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
@@ -425,6 +454,14 @@ ExportHandler::finish_timespan ()
                        delete (se);
                }
 
+               // XXX THIS IS IN REALTIME CONTEXT, CALLED FROM
+               // AudioEngine::process_callback()
+               // freewheeling, yes, but still uploading here is NOT
+               // a good idea.
+               //
+               // even less so, since SoundcloudProgress is using
+               // connect_same_thread() - GUI updates from the RT thread
+               // will cause crashes. http://pastebin.com/UJKYNGHR
                if (fmt->soundcloud_upload()) {
                        SoundcloudUploader *soundcloud_uploader = new SoundcloudUploader;
                        std::string token = soundcloud_uploader->Get_Auth_Token(soundcloud_username, soundcloud_password);