Tweak transmission of MMC on locate. Should fix #3121.

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

diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index da18ceb3cbc141ea090bb92df05612989b0bcce9..75c8fd0dd75404d53d3beaa37bd405122334210a 100644 (file)
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -17,21 +17,18 @@
 
 */
 
-#include <sigc++/bind.h>
 
 #include "pbd/error.h"
 #include <glibmm/thread.h>
 
-#include "ardour/audio_diskstream.h"
 #include "ardour/audioengine.h"
 #include "ardour/butler.h"
 #include "ardour/export_failed.h"
-#include "ardour/export_file_io.h"
 #include "ardour/export_handler.h"
 #include "ardour/export_status.h"
-#include "ardour/export_utilities.h"
-#include "ardour/route.h"
 #include "ardour/session.h"
+#include "ardour/track.h"
+#include "ardour/process_thread.h"
 
 #include "i18n.h"
 
@@ -92,14 +89,14 @@ Session::pre_export ()
 
        _exporting = true;
        export_status->running = true;
-       export_status->Aborting.connect (sigc::hide_return (sigc::mem_fun (*this, &Session::stop_audio_export)));
-       export_status->Finished.connect (sigc::hide_return (sigc::mem_fun (*this, &Session::finalize_audio_export)));
+       export_status->Aborting.connect_same_thread (*this, boost::bind (&Session::stop_audio_export, this));
+       export_status->Finished.connect_same_thread (*this, boost::bind (&Session::finalize_audio_export, this));
 
        return 0;
 }
 
 int
-Session::start_audio_export (nframes_t position, bool realtime)
+Session::start_audio_export (nframes_t position, bool /* realtime */)
 {
        if (!_exporting) {
                pre_export ();
@@ -108,10 +105,11 @@ Session::start_audio_export (nframes_t position, bool realtime)
        /* get everyone to the right position */
 
        {
-               boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
+               boost::shared_ptr<RouteList> rl = routes.reader();
 
-               for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                       if ((*i)-> seek (position, true)) {
+               for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+                       boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+                       if (tr && tr->seek (position, true)) {
                                error << string_compose (_("%1: cannot seek to %2 for export"),
                                                  (*i)->name(), position)
                                      << endmsg;
@@ -126,8 +124,6 @@ Session::start_audio_export (nframes_t position, bool realtime)
        */
 
        _transport_frame = position;
-
-       _exporting_realtime = realtime;
        export_status->stop = false;
 
        /* get transport ready. note how this is calling butler functions
@@ -147,44 +143,36 @@ Session::start_audio_export (nframes_t position, bool realtime)
                return -1;
        }
 
-       if (realtime) {
-               last_process_function = process_function;
-               process_function = &Session::process_export;
-       } else {
-               export_freewheel_connection = _engine.Freewheel.connect (sigc::mem_fun (*this, &Session::process_export_fw));
-               return _engine.freewheel (true);
-       }
-
-       return 0;
+       _engine.Freewheel.connect_same_thread (export_freewheel_connection, boost::bind (&Session::process_export_fw, this, _1));
+       _export_rolling = true;
+       return _engine.freewheel (true);
 }
 
 void
 Session::process_export (nframes_t nframes)
 {
-       try {
-
-               if (export_status->stop) {
-                       stop_audio_export ();
-                       return;
-               }
-
-               if (!_exporting_realtime) {
-                       /* make sure we've caught up with disk i/o, since
-                       we're running faster than realtime c/o JACK.
-                       */
+       if (_export_rolling && export_status->stop) {
+               stop_audio_export ();
+       }
 
-                       _butler->wait_until_finished ();
-               }
+       if (_export_rolling) {
+               /* make sure we've caught up with disk i/o, since
+               we're running faster than realtime c/o JACK.
+               */
+               _butler->wait_until_finished ();
 
                /* do the usual stuff */
 
                process_without_events (nframes);
-
-               /* handle export */
+       }
+       
+       try {
+               /* handle export - XXX what about error handling? */
 
                ProcessExport (nframes);
 
-       } catch (ExportFailed e) {
+       } catch (std::exception & e) {
+               std::cout << e.what() << std::endl;
                export_status->abort (true);
        }
 }
@@ -192,30 +180,25 @@ Session::process_export (nframes_t nframes)
 int
 Session::process_export_fw (nframes_t nframes)
 {
+        _engine.main_thread()->get_buffers ();
        process_export (nframes);
+        _engine.main_thread()->drop_buffers ();
        return 0;
 }
 
 int
 Session::stop_audio_export ()
 {
-       if (_exporting_realtime) {
-               process_function = last_process_function;
-       } else {
-               export_freewheel_connection.disconnect();
-       }
-
        /* can't use stop_transport() here because we need
           an immediate halt and don't require all the declick
           stuff that stop_transport() implements.
        */
 
        realtime_stop (true, true);
+       _export_rolling = false;
        _butler->schedule_transport_work ();
 
-       if (!export_status->aborted()) {
-               ExportReadFinished ();
-       } else {
+       if (export_status->aborted()) {
                finalize_audio_export ();
        }
 
@@ -227,17 +210,11 @@ void
 Session::finalize_audio_export ()
 {
        _exporting = false;
-       export_status->running = false;
-
-       if (!_exporting_realtime) {
-               _engine.freewheel (false);
-               _exporting_realtime = false;
-       }
+       _export_rolling = false;
 
        /* Clean up */
 
-       ProcessExport.clear();
-       ExportReadFinished.clear();
+       _engine.freewheel (false);
        export_freewheel_connection.disconnect();
        export_handler.reset();
        export_status.reset();
@@ -247,6 +224,6 @@ Session::finalize_audio_export ()
        if (post_export_sync) {
                config.set_external_sync (true);
        } else {
-               locate (post_export_position, false, false, false);
+               locate (post_export_position, false, false, false, false, false);
        }
 }