diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-12 11:28:50 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-12 11:28:50 -0400 |
| commit | bb826f4beebfcedc50570b818c305560d2233e47 (patch) | |
| tree | 1484460f914e64fdbdce58230ffe7934bc0761f4 /libs/ardour/io.cc | |
| parent | 8c5cff60912c7e0a7256f635641399500d8d00d9 (diff) | |
| parent | f85b362351a5f9167f93b6988f2c8a4c7e03a33c (diff) | |
incomplete merge of master into windows (requires upcoming changes to master to be complete)
Diffstat (limited to 'libs/ardour/io.cc')
| -rw-r--r-- | libs/ardour/io.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index a9d37d4315..ebd295411e 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -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); @@ -1411,7 +1411,7 @@ 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); @@ -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); } |