even more stuff compiles

This commit is contained in:
Paul Davis 2013-07-31 19:55:44 -04:00
parent b5239317d4
commit 18c68bfd12

View file

@ -499,16 +499,12 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
string lpnc = lpn; string lpnc = lpn;
lpnc += ':'; lpnc += ':';
const char ** ports = 0; vector<string> ports;
ports = AudioEngine::instance()->get_ports ("", type, inputs ? IsInput : IsOutput); 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; std::string const p = *s;
while (ports[n]) {
std::string const p = ports[n];
if (!system->has_port(p) && if (!system->has_port(p) &&
!bus->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) { if (p.find ("Midi-Through") != string::npos) {
++n; ++s;
continue; continue;
} }
@ -535,7 +531,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
if ((lp.find (N_(":monitor")) != string::npos) && if ((lp.find (N_(":monitor")) != string::npos) &&
(lp.find (lpn) != string::npos)) { (lp.find (lpn) != string::npos)) {
++n; ++s;
continue; 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) { for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {