Move butler methods from Session to Butler.

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

diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index aed32e278b61edf9db9558dfa54781611a88076a..3eda11bab73a045c97039b0f1f03c4146b882253 100644 (file)
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999-2008 Paul Davis 
+    Copyright (C) 1999-2008 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,19 +19,19 @@
 
 #include <sigc++/bind.h>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 #include <glibmm/thread.h>
 
-#include <ardour/export_failed.h>
-#include <ardour/export_file_io.h>
-#include <ardour/export_utilities.h>
-#include <ardour/export_handler.h>
-#include <ardour/timestamps.h>
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/audioengine.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/panner.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 "i18n.h"
 
@@ -45,23 +45,27 @@ Session::get_export_handler ()
        if (!export_handler) {
                export_handler.reset (new ExportHandler (*this));
        }
-       
+
        return export_handler;
 }
 
-void
-Session::release_export_handler ()
+boost::shared_ptr<ExportStatus>
+Session::get_export_status ()
 {
-       if (!_exporting) {
-               export_handler.reset();
+       if (!export_status) {
+               export_status.reset (new ExportStatus ());
        }
+
+       return export_status;
 }
 
+
 int
 Session::pre_export ()
 {
+       get_export_status (); // Init export_status
 
-       wait_till_butler_finished ();
+       _butler->wait_until_finished ();
 
        /* take everyone out of awrite to avoid disasters */
 
@@ -85,10 +89,11 @@ Session::pre_export ()
        post_export_position = _transport_frame;
 
        Config->set_slave_source (None);
-       
+
        _exporting = true;
-       export_status.running = true;
-       export_abort_connection = export_status.Aborting.connect (sigc::mem_fun (*this, &Session::abort_audio_export));
+       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)));
 
        return 0;
 }
@@ -96,6 +101,10 @@ Session::pre_export ()
 int
 Session::start_audio_export (nframes_t position, bool realtime)
 {
+       if (!_exporting) {
+               pre_export ();
+       }
+
        /* get everyone to the right position */
 
        {
@@ -117,9 +126,9 @@ Session::start_audio_export (nframes_t position, bool realtime)
        */
 
        _transport_frame = position;
-       
+
        _exporting_realtime = realtime;
-       export_status.stop = false;
+       export_status->stop = false;
 
        /* get transport ready. note how this is calling butler functions
           from a non-butler thread. we waited for the butler to stop
@@ -129,11 +138,11 @@ Session::start_audio_export (nframes_t position, bool realtime)
 
        set_transport_speed (1.0, false);
        butler_transport_work ();
-       g_atomic_int_set (&butler_should_do_transport_work, 0);
+       g_atomic_int_set (&_butler->should_do_transport_work, 0);
        post_transport ();
 
        /* we are ready to go ... */
-       
+
        if (!_engine.connected()) {
                return -1;
        }
@@ -154,40 +163,36 @@ Session::process_export (nframes_t nframes)
 {
        try {
 
-               if (export_status.stop) {
+               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.
                        */
-                       
-                       wait_till_butler_finished ();
+
+                       _butler->wait_until_finished ();
                }
-       
+
                /* do the usual stuff */
-       
+
                process_without_events (nframes);
-       
+
                /* handle export */
-       
+
                ProcessExport (nframes);
 
        } catch (ExportFailed e) {
-
-               std::cerr << e.what() << std::endl;
-               stop_audio_export();
-               finalize_audio_export();
-
+               export_status->abort (true);
        }
 }
 
 int
 Session::process_export_fw (nframes_t nframes)
 {
-       process_export (nframes);       
+       process_export (nframes);
        return 0;
 }
 
@@ -206,12 +211,14 @@ Session::stop_audio_export ()
        */
 
        realtime_stop (true);
-       schedule_butler_transport_work ();
+       _butler->schedule_transport_work ();
 
-       if (!export_status.aborted()) {
-               ExportFinished ();
+       if (!export_status->aborted()) {
+               ExportReadFinished ();
+       } else {
+               finalize_audio_export ();
        }
-       
+
        return 0;
 
 }
@@ -220,7 +227,7 @@ void
 Session::finalize_audio_export ()
 {
        _exporting = false;
-       export_status.running = false;
+       export_status->running = false;
 
        if (!_exporting_realtime) {
                _engine.freewheel (false);
@@ -228,12 +235,12 @@ Session::finalize_audio_export ()
        }
 
        /* Clean up */
-       
+
        ProcessExport.clear();
-       ExportFinished.clear();
+       ExportReadFinished.clear();
        export_freewheel_connection.disconnect();
-       export_abort_connection.disconnect();
        export_handler.reset();
+       export_status.reset();
 
        /* restart slaving */
 
@@ -243,10 +250,3 @@ Session::finalize_audio_export ()
                locate (post_export_position, false, false, false);
        }
 }
-
-void
-Session::abort_audio_export ()
-{
-       stop_audio_export ();
-       finalize_audio_export ();
-}