visualize port connections in mixer/processor when in < out

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

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index cdb8a4693cbb39cb0cdd5a0f0c7bf875b4bc7a69..6f5b5a63dae90167970fda91ef78b6e51a72ea5f 100644 (file)
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -1337,7 +1337,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;
 
@@ -1371,7 +1371,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);
 
        char buf1[name_size+1];
        char buf2[name_size+1];
@@ -1404,10 +1404,11 @@ IO::find_port_hole (const char* base)
         */
 
        for (n = 1; n < 9999; ++n) {
-               char buf[jack_port_name_size()];
+               size_t size = AudioEngine::instance()->port_name_size() + 1;
+               char buf[size];
                PortSet::iterator i = _ports.begin();
 
-               snprintf (buf, jack_port_name_size(), _("%s %u"), base, n);
+               snprintf (buf, size, _("%s %u"), base, n);
 
                for ( ; i != _ports.end(); ++i) {
                        if (i->name() == buf) {
@@ -1638,8 +1639,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