amend 311adde (LV2-1.0.0 compat)

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

diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index d1ee5d8122662a8eff6c6e3f0f23d1ce49caf246..ea4a07dd1f66cd883a0aa4a4ba1f87d9d1cc92eb 100644 (file)
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -21,7 +21,6 @@
 #include "pbd/error.h"
 #include <glibmm/threads.h>
 
-#include <midi++/manager.h>
 #include <midi++/mmc.h>
 
 #include "ardour/audioengine.h"
@@ -90,11 +89,11 @@ Session::pre_export ()
        _exporting = true;
        export_status->running = true;
        export_status->Finished.connect_same_thread (*this, boost::bind (&Session::finalize_audio_export, this));
-       
+
        /* disable MMC output early */
 
-       _pre_export_mmc_enabled = MIDI::Manager::instance()->mmc()->send_enabled ();
-       MIDI::Manager::instance()->mmc()->enable_send (false);
+       _pre_export_mmc_enabled = _mmc->send_enabled ();
+       _mmc->enable_send (false);
 
        return 0;
 }
@@ -105,14 +104,14 @@ Session::start_audio_export (framepos_t position)
 {
        if (!_exporting) {
                pre_export ();
-               _export_started = false;
        }
+       _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 */
@@ -193,13 +192,13 @@ Session::process_export_fw (pframes_t nframes)
 {
        if (!_export_started) {
                _export_started = true;
-               set_transport_speed (1.0, false);
+               set_transport_speed (1.0, 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 ();
@@ -236,8 +235,8 @@ Session::finalize_audio_export ()
        _engine.freewheel (false);
 
        export_freewheel_connection.disconnect();
-       
-       MIDI::Manager::instance()->mmc()->enable_send (_pre_export_mmc_enabled);
+
+       _mmc->enable_send (_pre_export_mmc_enabled);
 
        /* maybe write CUE/TOC */