merge (squash) with scenechange topic branch to provide MIDI-driven scene change...

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

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 4498e4fbd87759d61d07f610c79f03e1f42be923..2cc213f7975932624527f6ee58cd1c850aa14c01 100644 (file)
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -396,7 +396,7 @@ IO::disconnect (void* src)
 int
 IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed)
 {
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
        assert (!AudioEngine::instance()->process_lock().trylock());
 #endif
 
@@ -469,7 +469,7 @@ IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed)
 int
 IO::ensure_ports (ChanCount count, bool clear, void* src)
 {
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
        assert (!AudioEngine::instance()->process_lock().trylock());
 #endif
 
@@ -506,7 +506,7 @@ IO::ensure_ports (ChanCount count, bool clear, void* src)
 int
 IO::ensure_io (ChanCount count, bool clear, void* src)
 {
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
        assert (!AudioEngine::instance()->process_lock().trylock());
 #endif
 
@@ -1344,7 +1344,7 @@ 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;
 
@@ -1378,7 +1378,7 @@ 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);
 
        std::vector<char> buf1(name_size+1);
        std::vector<char> buf2(name_size+1);
@@ -1391,7 +1391,7 @@ IO::build_legal_port_name (DataType type)
        snprintf (&buf1[0], name_size+1, ("%.*s/%s"), limit, nom.c_str(), suffix.c_str());
 
        int port_number = find_port_hole (&buf1[0]);
-       snprintf (&buf2[0], name_size+1, "%s %d", buf1, port_number);
+       snprintf (&buf2[0], name_size+1, "%s %d", &buf1[0], port_number);
 
        return string (&buf2[0]);
 }
@@ -1411,10 +1411,10 @@ IO::find_port_hole (const char* base)
         */
 
        for (n = 1; n < 9999; ++n) {
-               std::vector<char> buf(jack_port_name_size());
+               std::vector<char> buf (AudioEngine::instance()->port_name_size());
                PortSet::iterator i = _ports.begin();
 
-               snprintf (&buf[0], jack_port_name_size(), _("%s %u"), base, n);
+               snprintf (&buf[0], buf.size()+1, _("%s %u"), base, n);
 
                for ( ; i != _ports.end(); ++i) {
                        if (string(i->name()) == string(&buf[0])) {
@@ -1645,7 +1645,7 @@ IO::process_input (boost::shared_ptr<Processor> proc, framepos_t start_frame, fr
                return;
        }
 
-       _buffers.get_jack_port_addresses (_ports, nframes);
+       _buffers.get_backend_port_addresses (_ports, nframes);
        if (proc) {
                proc->run (_buffers, start_frame, end_frame, nframes, true);
        }