ardour/livetrax
13
0
Fork 0
Code

Fix track selection interaction with route groups.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5276 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-06-26 12:13:41 +00:00
parent 30208b8771
commit 0758c7e16a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/editor.cc
View File

@ -3941,10 +3941,9 @@ Editor::mouse_select_button_release (GdkEventButton* ev)
Editor::TrackViewList *
Editor::get_valid_views (TimeAxisView* track, RouteGroup* group)
{
TrackViewList *v;
TrackViewList::iterator i;
v = new TrackViewList;
TrackViewList* v = new TrackViewList;
if (track == 0 && group == 0) {
@ -3954,7 +3953,7 @@ Editor::get_valid_views (TimeAxisView* track, RouteGroup* group)
v->push_back (*i);
}
} else if ((track != 0 && group == 0) || (track != 0 && group != 0 && !group->is_active())) {
} else if ((track != 0 && group == 0) || (track != 0 && group != 0 && !group->active_property (RouteGroup::Select))) {
/* just the view for this track
*/
@ -3965,9 +3964,9 @@ Editor::get_valid_views (TimeAxisView* track, RouteGroup* group)
/* views for all tracks in the route group */
for (i = track_views.begin(); i != track_views.end (); ++i) {
for (i = track_views.begin(); i != track_views.end (); ++i) {
if (group == 0 || (*i)->route_group() == group) {
if (group == 0 || ((*i)->route_group() == group && group->active_property (RouteGroup::Select))) {
v->push_back (*i);
}
}