Merge branch 'master' into windows

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

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index d39ba7b4f967851dc30acdde4437a639ceb61439..ebd295411e9cdfaf3d5198e0c36f0a737cd86d92 100644 (file)
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -19,6 +19,7 @@
 #include <fstream>
 #include <algorithm>
 #include <cmath>
+#include <vector>
 
 #include <unistd.h>
 #include <locale.h>
@@ -395,7 +396,9 @@ IO::disconnect (void* src)
 int
 IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed)
 {
+#ifndef PLATFORM_WINDOWS
        assert (!AudioEngine::instance()->process_lock().trylock());
+#endif
 
        boost::shared_ptr<Port> port;
 
@@ -466,7 +469,9 @@ IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed)
 int
 IO::ensure_ports (ChanCount count, bool clear, void* src)
 {
+#ifndef PLATFORM_WINDOWS
        assert (!AudioEngine::instance()->process_lock().trylock());
+#endif
 
        bool changed = false;
 
@@ -501,7 +506,9 @@ IO::ensure_ports (ChanCount count, bool clear, void* src)
 int
 IO::ensure_io (ChanCount count, bool clear, void* src)
 {
+#ifndef PLATFORM_WINDOWS
        assert (!AudioEngine::instance()->process_lock().trylock());
+#endif
 
        return ensure_ports (count, clear, src);
 }
@@ -912,7 +919,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);
                                }
                        }
 
@@ -1241,13 +1248,19 @@ 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::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());
 
                /* If this is a UserBundle, make a note of what we've done */
@@ -1331,14 +1344,14 @@ IO::bundle_changed (Bundle::Change /*c*/)
 string
 IO::build_legal_port_name (DataType type)
 {
-       const int name_size = jack_port_name_size();
+       const int name_size = AudioEngine::instance()->port_name_size();
        int limit;
        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();
        }
@@ -1365,22 +1378,22 @@ IO::build_legal_port_name (DataType type)
 
        // allow up to 4 digits for the output port number, plus the slash, suffix and extra space
 
-       limit = name_size - _session.engine().client_name().length() - (suffix.length() + 5);
+       limit = name_size - AudioEngine::instance()->my_name().length() - (suffix.length() + 5);
 
-       char buf1[name_size+1];
-       char buf2[name_size+1];
+       std::vector<char> buf1(name_size+1);
+       std::vector<char> buf2(name_size+1);
 
        /* colons are illegal in port names, so fix that */
 
        string nom = _name.val();
        replace_all (nom, ":", ";");
 
-       snprintf (buf1, name_size+1, ("%.*s/%s"), limit, nom.c_str(), suffix.c_str());
+       snprintf (&buf1[0], name_size+1, ("%.*s/%s"), limit, nom.c_str(), suffix.c_str());
 
-       int port_number = find_port_hole (buf1);
-       snprintf (buf2, name_size+1, "%s %d", buf1, port_number);
+       int port_number = find_port_hole (&buf1[0]);
+       snprintf (&buf2[0], name_size+1, "%s %d", &buf1[0], port_number);
 
-       return string (buf2);
+       return string (&buf2[0]);
 }
 
 int32_t
@@ -1398,13 +1411,13 @@ IO::find_port_hole (const char* base)
         */
 
        for (n = 1; n < 9999; ++n) {
-               char buf[jack_port_name_size()];
+               std::vector<char> buf (AudioEngine::instance()->port_name_size());
                PortSet::iterator i = _ports.begin();
 
-               snprintf (buf, jack_port_name_size(), _("%s %u"), base, n);
+               snprintf (&buf[0], jack_port_name_size(), _("%s %u"), base, n);
 
                for ( ; i != _ports.end(); ++i) {
-                       if (i->name() == buf) {
+                       if (string(i->name()) == string(&buf[0])) {
                                break;
                        }
                }
@@ -1632,8 +1645,10 @@ IO::process_input (boost::shared_ptr<Processor> proc, framepos_t start_frame, fr
                return;
        }
 
-       _buffers.get_jack_port_addresses (_ports, nframes);
-       proc->run (_buffers, start_frame, end_frame, nframes, true);
+       _buffers.get_backend_port_addresses (_ports, nframes);
+       if (proc) {
+               proc->run (_buffers, start_frame, end_frame, nframes, true);
+       }
 }
 
 void