smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

minor code-tidying tweak - continue if port handle is null, rather than nest inside conditional

Browse source
This commit is contained in:
Paul Davis 2016-10-21 16:31:16 -04:00
parent 4ab80e16e9
commit 7df9917a11
1 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

50
gtk2_ardour/port_group.cc
View file

@ -543,8 +543,10 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
we excluded them earlier.
*/
string lp = p, monitor = _("Monitor");
boost::to_lower (lp);
string lp = p;
string monitor = _("Monitor");
boost::to_lower (lp);
boost::to_lower (monitor);
if ((lp.find (monitor) != string::npos) &&
@ -560,29 +562,35 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
*/
PortEngine::PortHandle ph = AudioEngine::instance()->port_engine().get_port_by_name (p);
if (ph) {
DataType t (AudioEngine::instance()->port_engine().port_data_type (ph));
if (t != DataType::NIL) {
if (port_has_prefix (p, X_("system:")) ||
port_has_prefix (p, X_("alsa_pcm:")) ||
port_has_prefix (p, X_("alsa_midi:"))) {
extra_system[t].push_back (p);
} else if (port_has_prefix (p, lpnc)) {
/* we own this port (named after the program) */
if (!ph) {
continue;
}
/* Hide scene ports from non-Tracks Live builds */
if (!ARDOUR::Profile->get_trx()) {
if (p.find (_("Scene ")) != string::npos) {
++s;
continue;
}
DataType t (AudioEngine::instance()->port_engine().port_data_type (ph));
if (t != DataType::NIL) {
if (port_has_prefix (p, X_("system:")) ||
port_has_prefix (p, X_("alsa_pcm:")) ||
port_has_prefix (p, X_("alsa_midi:"))) {
extra_system[t].push_back (p);
} else if (port_has_prefix (p, lpnc)) {
/* we own this port (named after the program) */
/* Hide scene ports from non-Tracks Live builds */
if (!ARDOUR::Profile->get_trx()) {
if (p.find (_("Scene ")) != string::npos) {
++s;
continue;
}
extra_program[t].push_back (p);
} else {
extra_other[t].push_back (p);
}
extra_program[t].push_back (p);
} else {
extra_other[t].push_back (p);
}
}
}