smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-07 22:25:46 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Excluding whatever is not bus from arrange view, compact meter bridge and mixer bridge view

Browse source
This commit is contained in:
VKamyshniy 2014-07-29 14:06:51 +03:00
parent a3a63735db
commit f9ed8e9ded
3 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gtk2_ardour/compact_meter_bridge.cc
View file

@ -67,12 +67,12 @@ using PBD::atoi;
struct SignalOrderRouteSorter {
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
if (a->is_master() || a->is_monitor()) {
if (a->is_master() || a->is_monitor() || !boost::dynamic_pointer_cast<Track>(a)) {
/* "a" is a special route (master, monitor, etc), and comes
* last in the mixer ordering
*/
return false;
} else if (b->is_master() || b->is_monitor()) {
} else if (b->is_master() || b->is_monitor() || !boost::dynamic_pointer_cast<Track>(b)) {
/* everything comes before b */
return true;
}
@ -170,7 +170,8 @@ CompactMeterbridge::add_strips (RouteList& routes)
// Now create the strips for newly added routes
for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
if (route->is_auditioner() || route->is_monitor() || route->is_master()) {
if (route->is_auditioner() || route->is_monitor() || route->is_master()
|| !boost::dynamic_pointer_cast<Track> (route)) {
continue;
}
@ -188,7 +189,8 @@ CompactMeterbridge::add_strips (RouteList& routes)
size_t serial_number = 0;
for (RouteList::iterator x = copy.begin(); x != copy.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
if (route->is_auditioner() || route->is_monitor() || route->is_master()) {
if (route->is_auditioner() || route->is_monitor() || route->is_master() ||
!boost::dynamic_pointer_cast<Track>(route)) {
continue;
}
std::map <boost::shared_ptr<ARDOUR::Route>, CompactMeterStrip*>::iterator i = _strips.find (route);
@ -237,7 +239,8 @@ CompactMeterbridge::sync_order_keys ()
size_t serial_number = 0;
for (RouteList::iterator x = copy.begin(); x != copy.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
if (route->is_auditioner() || route->is_monitor() || route->is_master()) {
if (route->is_auditioner() || route->is_monitor() || route->is_master() ||
!boost::dynamic_pointer_cast<Track> (route)) {
continue;
}
std::map <boost::shared_ptr<ARDOUR::Route>, CompactMeterStrip*>::iterator i = _strips.find (route);

3
gtk2_ardour/editor.cc
View file

@ -5078,7 +5078,8 @@ Editor::add_routes (RouteList& routes)
for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
if (route->is_auditioner() || route->is_monitor()) {
if (route->is_auditioner() || route->is_monitor() ||
!boost::dynamic_pointer_cast<Track> (route)) {
continue;
}

13
gtk2_ardour/mixer_bridge_view.cc
View file

@ -67,12 +67,12 @@ using PBD::atoi;
struct SignalOrderRouteSorter {
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
if (a->is_master() || a->is_monitor()) {
if (a->is_master() || a->is_monitor() || !boost::dynamic_pointer_cast<Track>(a)) {
/* "a" is a special route (master, monitor, etc), and comes
* last in the mixer ordering
*/
return false;
} else if (b->is_master() || b->is_monitor()) {
} else if (b->is_master() || b->is_monitor() || !boost::dynamic_pointer_cast<Track>(b)) {
/* everything comes before b */
return true;
}
@ -173,7 +173,8 @@ MixerBridgeView::add_strips (RouteList& routes)
// Now create the strips for newly added routes
for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
if (route->is_auditioner() || route->is_monitor() || route->is_master()) {
if (route->is_auditioner() || route->is_monitor() || route->is_master() ||
!boost::dynamic_pointer_cast<Track> (route)) {
continue;
}
@ -190,7 +191,8 @@ MixerBridgeView::add_strips (RouteList& routes)
for (RouteList::iterator x = copy.begin(); x != copy.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
if (route->is_auditioner() || route->is_monitor() || route->is_master()) {
if (route->is_auditioner() || route->is_monitor() || route->is_master() ||
!boost::dynamic_pointer_cast<Track> (route)) {
continue;
}
std::map <boost::shared_ptr<ARDOUR::Route>, MixerStrip*>::iterator i = _strips.find (route);
@ -236,7 +238,8 @@ MixerBridgeView::sync_order_keys ()
for (RouteList::iterator x = copy.begin(); x != copy.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
if (route->is_auditioner() || route->is_monitor() || route->is_master()) {
if (route->is_auditioner() || route->is_monitor() || route->is_master() ||
!boost::dynamic_pointer_cast<Track> (route)) {
continue;
}
std::map <boost::shared_ptr<ARDOUR::Route>, MixerStrip*>::iterator i = _strips.find (route);