fix crash when copy'ing latent plugins

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

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index a64d617ebadf7181756ab4bef40cfb10f1bab070..33b41f5c046e40dd05a23a97ea1afd494a712378 100644 (file)
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -30,7 +30,7 @@
 #include "ardour/port.h"
 #include "ardour/port_engine.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -38,6 +38,7 @@ using namespace PBD;
 
 PBD::Signal2<void,boost::shared_ptr<Port>, boost::shared_ptr<Port> > Port::PostDisconnect;
 PBD::Signal0<void> Port::PortDrop;
+PBD::Signal0<void> Port::PortSignalDrop;
 
 bool         Port::_connecting_blocked = false;
 pframes_t    Port::_global_port_buffer_offset = 0;
@@ -75,6 +76,9 @@ Port::Port (std::string const & n, DataType t, PortFlags f)
        }
 
        PortDrop.connect_same_thread (drop_connection, boost::bind (&Port::drop, this));
+       PortSignalDrop.connect_same_thread (drop_connection, boost::bind (&Port::signal_drop, this));
+       port_manager->PortConnectedOrDisconnected.connect_same_thread (engine_connection,
+                       boost::bind (&Port::port_connected_or_disconnected, this, _1, _3, _5));
 }
 
 /** Port destructor */
@@ -116,6 +120,12 @@ Port::set_pretty_name(const std::string& n)
        return false;
 }
 
+void
+Port::signal_drop ()
+{
+       engine_connection.disconnect ();
+}
+
 void
 Port::drop ()
 {
@@ -126,6 +136,26 @@ Port::drop ()
        }
 }
 
+void
+Port::port_connected_or_disconnected (boost::weak_ptr<Port> w0, boost::weak_ptr<Port> w1, bool con)
+{
+       if (con) {
+               /* we're only interested in disconnect */
+               return;
+       }
+       boost::shared_ptr<Port> p0 = w0.lock ();
+       boost::shared_ptr<Port> p1 = w1.lock ();
+       /* a cheaper, less hacky way to do boost::shared_from_this() ...  */
+       boost::shared_ptr<Port> pself = AudioEngine::instance()->get_port_by_name (name());
+
+       if (p0 == pself) {
+               PostDisconnect (p0, p1); // emit signal
+       }
+       if (p1 == pself) {
+               PostDisconnect (p1, p0); // emit signal
+       }
+}
+
 /** @return true if this port is connected to anything */
 bool
 Port::connected () const
@@ -238,8 +268,7 @@ Port::disconnect (std::string const & other)
                _connections.erase (other);
        }
 
-       /* a cheaper, less hacky way to do boost::shared_from_this() ...
-        */
+       /* a cheaper, less hacky way to do boost::shared_from_this() ...  */
        boost::shared_ptr<Port> pself = AudioEngine::instance()->get_port_by_name (name());
        boost::shared_ptr<Port> pother = AudioEngine::instance()->get_port_by_name (other);
 
@@ -478,6 +507,8 @@ Port::reestablish ()
 
        reset ();
 
+       port_manager->PortConnectedOrDisconnected.connect_same_thread (engine_connection,
+                       boost::bind (&Port::port_connected_or_disconnected, this, _1, _3, _5));
        return 0;
 }
 
@@ -556,7 +587,7 @@ Port::get_state () const
 int
 Port::set_state (const XMLNode& node, int)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if (node.name() != state_node_name) {
                return -1;