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

[Summary] Implemented correct usecases for inspector when multiselection is used

Browse source 
[Reviewed by QA] MKosharniy
This commit is contained in:
GZharun 2015-01-16 12:39:24 +02:00
parent 5c6275a63b
commit 82dd4514f4
2 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gtk2_ardour/editor_mixer.cc
View file

@ -165,7 +165,9 @@ Editor::show_editor_mixer (bool yn)
}
if (r) {
current_mixer_strip->set_route (r);
if (!current_mixer_strip->route() ) {
current_mixer_strip->set_route (r);
}
//current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
}
@ -218,8 +220,16 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
create_editor_mixer ();
}
if (current_mixer_strip->route() && !selection->tracks.empty() ) {
TimeAxisView* cur_view = get_route_view_by_route_id(current_mixer_strip->route()->id() );
if (selection->selected(cur_view) ) {
// nothing to do, we already show the track which is selected
return;
}
}
// if this is an automation track, then we shold the mixer strip should
// if this is an automation track, then the mixer strip should
// show the parent
boost::shared_ptr<ARDOUR::Route> route;
@ -252,11 +262,9 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
if (act) {
Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
if ( tact && tact->get_active() ) { // if inspector is visible
if (route && (current_mixer_strip->route() != route)) {
current_mixer_strip->set_route (route);
}
}
if (route && (current_mixer_strip->route() != route)) {
current_mixer_strip->set_route (route);
}
}
if (route && !route->is_master ()) {

9
gtk2_ardour/editor_selection.cc
View file

@ -1046,7 +1046,14 @@ void
Editor::track_selection_changed ()
{
if (!selection->tracks.empty() ) {
set_selected_mixer_strip (*(selection->tracks.front()));
TrackViewList::iterator iter = track_views.begin();
for (; iter != track_views.end(); ++iter) {
if (selection->selected(*iter) ) {
TimeAxisView* tv = *iter;
set_selected_mixer_strip (*tv);
}
}
} else {