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 02bf48a0d672f7d33961c4f9dbf0b5aa5bd1cc7f..62eb61ab83e16654eb13890d2cddbcbe9e5feb50 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"
@@ -93,8 +92,8 @@ Session::pre_export ()
        
        /* 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;
 }
@@ -147,7 +146,7 @@ Session::start_audio_export (framepos_t position)
 
        /* we are ready to go ... */
 
-       if (!_engine.port_engine().connected()) {
+       if (!_engine.connected()) {
                return -1;
        }
 
@@ -237,7 +236,7 @@ Session::finalize_audio_export ()
 
        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 */