remove ControlOnly port flag, since it was essentially unusable

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

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index a3ecd04b47ae2be3d2244cbde8793bf1f812b0de..2ca80e3eeec4248c613fd96cb0ef2b0921c81d6e 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -55,7 +55,7 @@
 #include "ardour/process_thread.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -412,7 +412,7 @@ AudioEngine::process_callback (pframes_t nframes)
 
 #else
        if (_session->silent()) {
-               PortManager::silence (nframes);
+               PortManager::silence (nframes, _session);
        }
 #endif
 
@@ -906,7 +906,9 @@ AudioEngine::stop (bool for_latency)
                stop_engine = false;
        } else {
                if (_backend->stop ()) {
-                       pl.release ();
+                       if (pl.locked ()) { 
+                            pl.release ();
+                        }
                        return -1;
                }
        }