diff options
author | Carl Hetherington <carl@carlh.net> | 2009-01-21 02:27:21 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-01-21 02:27:21 +0000 |
commit | d6637dad5a239d74038fdf9e5800e5108ba0c44f (patch) | |
tree | 8371648bdc73dc98407c6924fefa00934e344902 /libs/ardour/io.cc | |
parent | 4476461443061703e9ef268ade72511dff3e3ae5 (diff) |
Rework Port class hierarchy a bit. Hopefully now simpler, and should
support connection of JACK ports with internal ones.
git-svn-id: svn://localhost/ardour2/branches/3.0@4417 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/io.cc')
-rw-r--r-- | libs/ardour/io.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 2b8f12680f..671ade36ea 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -1965,13 +1965,13 @@ IO::set_name (const string& requested_name) } for (PortSet::iterator i = _inputs.begin(); i != _inputs.end(); ++i) { - string current_name = i->short_name(); + string current_name = i->name(); current_name.replace (current_name.find (_name), _name.length(), name); i->set_name (current_name); } for (PortSet::iterator i = _outputs.begin(); i != _outputs.end(); ++i) { - string current_name = i->short_name(); + string current_name = i->name(); current_name.replace (current_name.find (_name), _name.length(), name); i->set_name (current_name); } @@ -2028,7 +2028,7 @@ IO::output_latency () const /* io lock not taken - must be protected by other means */ for (PortSet::const_iterator i = _outputs.begin(); i != _outputs.end(); ++i) { - if ((latency = _session.engine().get_port_total_latency (*i)) > max_latency) { + if ((latency = i->total_latency ()) > max_latency) { max_latency = latency; } } @@ -2047,7 +2047,7 @@ IO::input_latency () const /* io lock not taken - must be protected by other means */ for (PortSet::const_iterator i = _inputs.begin(); i != _inputs.end(); ++i) { - if ((latency = _session.engine().get_port_total_latency (*i)) > max_latency) { + if ((latency = i->total_latency ()) > max_latency) { max_latency = latency; } } @@ -2473,7 +2473,7 @@ IO::find_input_port_hole (const char* base) snprintf (buf, jack_port_name_size(), _("%s %u"), base, n); for ( ; i != _inputs.end(); ++i) { - if (i->short_name() == buf) { + if (i->name() == buf) { break; } } @@ -2506,7 +2506,7 @@ IO::find_output_port_hole (const char* base) snprintf (buf, jack_port_name_size(), _("%s %u"), base, n); for ( ; i != _outputs.end(); ++i) { - if (i->short_name() == buf) { + if (i->name() == buf) { break; } } |