diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 19:55:44 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 19:55:44 -0400 |
| commit | 18c68bfd12130b8a3e95c99d3c0472c8b7f377bc (patch) | |
| tree | ca39a69824df24ef9f413da0f5e248533a6f47d2 /gtk2_ardour/port_group.cc | |
| parent | b5239317d4657ad689ef7ef4d11c1fb6ae3e699b (diff) | |
even more stuff compiles
Diffstat (limited to 'gtk2_ardour/port_group.cc')
| -rw-r--r-- | gtk2_ardour/port_group.cc | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 24c603fa0a..a25c2e0f84 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -499,16 +499,12 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp string lpnc = lpn; lpnc += ':'; - const char ** ports = 0; - ports = AudioEngine::instance()->get_ports ("", type, inputs ? IsInput : IsOutput); + vector<string> ports; + if (AudioEngine::instance()->get_ports ("", type, inputs ? IsInput : IsOutput, ports) > 0) { - if (ports) { + for (vector<string>::const_iterator s = ports.begin(); s != ports.end(); ) { - int n = 0; - - while (ports[n]) { - - std::string const p = ports[n]; + std::string const p = *s; if (!system->has_port(p) && !bus->has_port(p) && @@ -522,7 +518,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp */ if (p.find ("Midi-Through") != string::npos) { - ++n; + ++s; continue; } @@ -535,7 +531,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp if ((lp.find (N_(":monitor")) != string::npos) && (lp.find (lpn) != string::npos)) { - ++n; + ++s; continue; } @@ -556,10 +552,8 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp } } - ++n; + ++s; } - - free (ports); } for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { |