Ongoing work on latency compensation

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

diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc
index 7f3f05a7db718cbf06410f09159538fb180e73d4..cf1d90ac565ea082f961c01a6525247cab3f503c 100644 (file)
--- a/libs/ardour/midiport_manager.cc
+++ b/libs/ardour/midiport_manager.cc
@@ -22,7 +22,7 @@
 #include "ardour/midiport_manager.h"
 #include "ardour/rc_configuration.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -37,6 +37,7 @@ MidiPortManager::MidiPortManager ()
 
 MidiPortManager::~MidiPortManager ()
 {
+       Glib::Threads::Mutex::Lock em (AudioEngine::instance()->process_lock());
        if (_midi_in) {
                AudioEngine::instance()->unregister_port (_midi_in);
        }
@@ -111,7 +112,7 @@ MidiPortManager::create_ports ()
 void
 MidiPortManager::set_midi_port_states (const XMLNodeList&nodes)
 {
-       XMLProperty* prop;
+       XMLProperty const * prop;
        typedef map<std::string,boost::shared_ptr<Port> > PortMap;
        PortMap ports;
        const int version = 0;