Merge branch 'master' into cairocanvas

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

diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index 9a277f565510c07bb650951f54f48f53c010d6fe..62eb61ab83e16654eb13890d2cddbcbe9e5feb50 100644 (file)
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -19,16 +19,17 @@
 
 
 #include "pbd/error.h"
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
+
+#include <midi++/mmc.h>
 
-#include "ardour/audio_diskstream.h"
 #include "ardour/audioengine.h"
 #include "ardour/butler.h"
-#include "ardour/export_failed.h"
 #include "ardour/export_handler.h"
 #include "ardour/export_status.h"
-#include "ardour/route.h"
+#include "ardour/process_thread.h"
 #include "ardour/session.h"
+#include "ardour/track.h"
 
 #include "i18n.h"
 
@@ -62,8 +63,6 @@ Session::pre_export ()
 {
        get_export_status (); // Init export_status
 
-       _butler->wait_until_finished ();
-
        /* take everyone out of awrite to avoid disasters */
 
        {
@@ -89,26 +88,40 @@ Session::pre_export ()
 
        _exporting = true;
        export_status->running = true;
-       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));
+       
+       /* disable MMC output early */
+
+       _pre_export_mmc_enabled = _mmc->send_enabled ();
+       _mmc->enable_send (false);
 
        return 0;
 }
 
+/** Called for each range that is being exported */
 int
-Session::start_audio_export (nframes_t position, bool realtime)
+Session::start_audio_export (framepos_t position)
 {
        if (!_exporting) {
                pre_export ();
        }
+       _export_started = false;
+
+       /* We're about to call Track::seek, so the butler must have finished everything
+          up otherwise it could be doing do_refill in its thread while we are doing
+          it here.
+       */
+       
+       _butler->wait_until_finished ();
 
        /* 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;
@@ -131,11 +144,6 @@ Session::start_audio_export (nframes_t position, bool realtime)
           since then has re-awakened it.
         */
 
-       set_transport_speed (1.0, false);
-       butler_transport_work ();
-       g_atomic_int_set (&_butler->should_do_transport_work, 0);
-       post_transport ();
-
        /* we are ready to go ... */
 
        if (!_engine.connected()) {
@@ -147,8 +155,8 @@ Session::start_audio_export (nframes_t position, bool realtime)
        return _engine.freewheel (true);
 }
 
-void
-Session::process_export (nframes_t nframes)
+int
+Session::process_export (pframes_t nframes)
 {
        if (_export_rolling && export_status->stop) {
                stop_audio_export ();
@@ -164,22 +172,37 @@ Session::process_export (nframes_t nframes)
 
                process_without_events (nframes);
        }
-       
+
        try {
                /* handle export - XXX what about error handling? */
 
                ProcessExport (nframes);
 
        } catch (std::exception & e) {
-               std::cout << e.what() << std::endl;
+               error << string_compose (_("Export ended unexpectedly: %1"), e.what()) << endmsg;
                export_status->abort (true);
+               return -1;
        }
+
+       return 0;
 }
 
 int
-Session::process_export_fw (nframes_t nframes)
+Session::process_export_fw (pframes_t nframes)
 {
+       if (!_export_started) {
+               _export_started = true;
+               set_transport_speed (1.0, false);
+               butler_transport_work ();
+               g_atomic_int_set (&_butler->should_do_transport_work, 0);
+               post_transport ();
+               return 0;
+       }
+       
+        _engine.main_thread()->get_buffers ();
        process_export (nframes);
+        _engine.main_thread()->drop_buffers ();
+
        return 0;
 }
 
@@ -195,24 +218,28 @@ Session::stop_audio_export ()
        _export_rolling = false;
        _butler->schedule_transport_work ();
 
-       if (export_status->aborted()) {
-               finalize_audio_export ();
-       }
-
        return 0;
-
 }
 
 void
 Session::finalize_audio_export ()
 {
        _exporting = false;
-       _export_rolling = false;
+
+       if (_export_rolling) {
+               stop_audio_export ();
+       }
 
        /* Clean up */
 
        _engine.freewheel (false);
+
        export_freewheel_connection.disconnect();
+       
+       _mmc->enable_send (_pre_export_mmc_enabled);
+
+       /* maybe write CUE/TOC */
+
        export_handler.reset();
        export_status.reset();
 
@@ -221,6 +248,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);
        }
 }