Merge branch 'master' into windows

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

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 01a4a64a389554e35da4f721b2f3c4497eb94a27..1349d49a0ce1c36667c4cff1b57f151ebd188778 100644 (file)
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -25,7 +25,7 @@
 #include <errno.h>
 
 #include <glibmm.h>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "pbd/xml++.h"
 #include "pbd/replace_all.h"
@@ -44,7 +44,7 @@
 
 #include "i18n.h"
 
-#define BLOCK_PROCESS_CALLBACK() Glib::Mutex::Lock em (AudioEngine::instance()->process_lock())
+#define BLOCK_PROCESS_CALLBACK() Glib::Threads::Mutex::Lock em (AudioEngine::instance()->process_lock())
 
 using namespace std;
 using namespace ARDOUR;
@@ -86,7 +86,7 @@ IO::IO (Session& s, const XMLNode& node, DataType dt, bool sendish)
 
 IO::~IO ()
 {
-       Glib::Mutex::Lock lm (io_lock);
+       Glib::Threads::Mutex::Lock lm (io_lock);
 
        BLOCK_PROCESS_CALLBACK ();
 
@@ -104,7 +104,7 @@ IO::disconnect_check (boost::shared_ptr<Port> a, boost::shared_ptr<Port> b)
           we assume that its safely locked by our own ::disconnect().
        */
 
-       Glib::Mutex::Lock tm (io_lock, Glib::TRY_LOCK);
+       Glib::Threads::Mutex::Lock tm (io_lock, Glib::Threads::TRY_LOCK);
 
        if (tm.locked()) {
                /* we took the lock, so we cannot be here from inside
@@ -194,7 +194,7 @@ IO::disconnect (boost::shared_ptr<Port> our_port, string other_port, void* src)
        }
 
         {
-                Glib::Mutex::Lock lm (io_lock);
+                Glib::Threads::Mutex::Lock lm (io_lock);
 
                 /* check that our_port is really one of ours */
 
@@ -227,7 +227,7 @@ IO::connect (boost::shared_ptr<Port> our_port, string other_port, void* src)
        }
 
        {
-               Glib::Mutex::Lock lm (io_lock);
+               Glib::Threads::Mutex::Lock lm (io_lock);
 
                /* check that our_port is really one of ours */
 
@@ -264,7 +264,7 @@ IO::remove_port (boost::shared_ptr<Port> port, void* src)
                BLOCK_PROCESS_CALLBACK ();
 
                {
-                       Glib::Mutex::Lock lm (io_lock);
+                       Glib::Threads::Mutex::Lock lm (io_lock);
 
                        if (_ports.remove(port)) {
                                change.type = IOChange::Type (change.type | IOChange::ConfigurationChanged);
@@ -332,7 +332,7 @@ IO::add_port (string destination, void* src, DataType type)
 
 
                {
-                       Glib::Mutex::Lock lm (io_lock);
+                       Glib::Threads::Mutex::Lock lm (io_lock);
 
                        /* Create a new port */
 
@@ -377,7 +377,7 @@ int
 IO::disconnect (void* src)
 {
        {
-               Glib::Mutex::Lock lm (io_lock);
+               Glib::Threads::Mutex::Lock lm (io_lock);
 
                for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) {
                        i->disconnect_all ();
@@ -395,7 +395,9 @@ IO::disconnect (void* src)
 int
 IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed)
 {
+#ifndef WIN32
        assert (!AudioEngine::instance()->process_lock().trylock());
+#endif
 
        boost::shared_ptr<Port> port;
 
@@ -466,7 +468,9 @@ IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed)
 int
 IO::ensure_ports (ChanCount count, bool clear, void* src)
 {
+#ifndef WIN32
        assert (!AudioEngine::instance()->process_lock().trylock());
+#endif
 
        bool changed = false;
 
@@ -479,7 +483,7 @@ IO::ensure_ports (ChanCount count, bool clear, void* src)
        change.before = _ports.count ();
 
        {
-               Glib::Mutex::Lock im (io_lock);
+               Glib::Threads::Mutex::Lock im (io_lock);
                if (ensure_ports_locked (count, clear, changed)) {
                        return -1;
                }
@@ -501,7 +505,9 @@ IO::ensure_ports (ChanCount count, bool clear, void* src)
 int
 IO::ensure_io (ChanCount count, bool clear, void* src)
 {
+#ifndef WIN32
        assert (!AudioEngine::instance()->process_lock().trylock());
+#endif
 
        return ensure_ports (count, clear, src);
 }
@@ -521,7 +527,7 @@ IO::state (bool /*full_state*/)
        vector<string>::iterator ci;
        int n;
        LocaleGuard lg (X_("POSIX"));
-       Glib::Mutex::Lock lm (io_lock);
+       Glib::Threads::Mutex::Lock lm (io_lock);
 
        node->add_property("name", _name);
        id().print (buf, sizeof (buf));
@@ -883,7 +889,7 @@ IO::create_ports (const XMLNode& node, int version)
        get_port_counts (node, version, n, c);
 
        {
-               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
                if (ensure_ports (n, true, this)) {
                        error << string_compose(_("%1: cannot create I/O ports"), _name) << endmsg;
@@ -912,7 +918,7 @@ IO::make_connections (const XMLNode& node, int version, bool in)
                        if (prop) {
                                boost::shared_ptr<Bundle> b = find_possible_bundle (prop->value());
                                if (b) {
-                                       connect_ports_to_bundle (b, this);
+                                       connect_ports_to_bundle (b, true, this);
                                }
                        }
 
@@ -1099,7 +1105,7 @@ IO::set_ports (const string& str)
        }
 
        {
-               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
                // FIXME: audio-only
                if (ensure_ports (ChanCount(DataType::AUDIO, nports), true, this)) {
@@ -1241,12 +1247,18 @@ IO::latency () const
 }
 
 int
-IO::connect_ports_to_bundle (boost::shared_ptr<Bundle> c, void* src)
+IO::connect_ports_to_bundle (boost::shared_ptr<Bundle> c, bool exclusive, void* src)
 {
        BLOCK_PROCESS_CALLBACK ();
 
        {
-               Glib::Mutex::Lock lm2 (io_lock);
+               Glib::Threads::Mutex::Lock lm2 (io_lock);
+
+               if (exclusive) {
+                       for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) {
+                               i->disconnect_all ();
+                       }
+               }
 
                c->connect (_bundle, _session.engine());
 
@@ -1278,7 +1290,7 @@ IO::disconnect_ports_from_bundle (boost::shared_ptr<Bundle> c, void* src)
        BLOCK_PROCESS_CALLBACK ();
 
        {
-               Glib::Mutex::Lock lm2 (io_lock);
+               Glib::Threads::Mutex::Lock lm2 (io_lock);
 
                c->disconnect (_bundle, _session.engine());
 
@@ -1314,7 +1326,7 @@ IO::disable_connecting ()
 int
 IO::enable_connecting ()
 {
-       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
+       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock());
        connecting_legal = true;
        boost::optional<int> r = ConnectingLegal ();
        return r.get_value_or (0);
@@ -1336,9 +1348,9 @@ IO::build_legal_port_name (DataType type)
        string suffix;
 
        if (type == DataType::AUDIO) {
-               suffix = _("audio");
+               suffix = X_("audio");
        } else if (type == DataType::MIDI) {
-               suffix = _("midi");
+               suffix = X_("midi");
        } else {
                throw unknown_type();
        }
@@ -1633,7 +1645,9 @@ IO::process_input (boost::shared_ptr<Processor> proc, framepos_t start_frame, fr
        }
 
        _buffers.get_jack_port_addresses (_ports, nframes);
-       proc->run (_buffers, start_frame, end_frame, nframes, true);
+       if (proc) {
+               proc->run (_buffers, start_frame, end_frame, nframes, true);
+       }
 }
 
 void
@@ -1720,6 +1734,6 @@ IO::physically_connected () const
 bool
 IO::has_port (boost::shared_ptr<Port> p) const
 {
-       Glib::Mutex::Lock lm (io_lock);
+       Glib::Threads::Mutex::Lock lm (io_lock);
        return _ports.contains (p);
 }