From 562f55c9170eabfac66436702c9388b28eb198f5 Mon Sep 17 00:00:00 2001 From: GZharun Date: Mon, 19 Jan 2015 10:41:57 +0200 Subject: [PATCH] [Summary] Removed unused variables, added NULL ptr checks --- gtk2_ardour/editor_routes.cc | 7 ++----- gtk2_ardour/gain_meter.cc | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index cd8f29d5d9..2551102e3e 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -1592,10 +1592,7 @@ EditorRoutes::move_selected_tracks_relatively (const PBD::ID& source_track_id, c if (source_track_id == target_track_id) { return; } - - RouteTimeAxisView* source_rtv = _editor->get_route_view_by_route_id(source_track_id); - Selection& selection = _editor->get_selection(); - + RouteList routes; RouteList routes_to_move; TreeModel::Children rows = _model->children(); @@ -1607,7 +1604,7 @@ EditorRoutes::move_selected_tracks_relatively (const PBD::ID& source_track_id, c RouteTimeAxisView* rtv = dynamic_cast(tv); // selected tracks: add to the move list but if it's not a target - if (selection.selected(tv) && + if (_editor->get_selection().selected(tv) && route->id() != target_track_id ) { routes_to_move.push_back(route); continue; diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 2ff255afcb..0986cdac01 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -439,7 +439,7 @@ GainMeter::gain_activated () TimeAxisView* tv = ARDOUR_UI::instance()->the_editor().get_route_view_by_route_id (_route->id() ); // if route is a part of selection and affected_by_selection is set - if (affected_by_selection && selection.selected(tv) && selection.tracks.size() > 1 ) { + if (affected_by_selection && tv && selection.selected(tv) && selection.tracks.size() > 1 ) { RouteList routes; TrackViewList track_list = selection.tracks; @@ -526,7 +526,7 @@ GainMeter::gain_adjusted () TimeAxisView* tv = ARDOUR_UI::instance()->the_editor().get_route_view_by_route_id (_route->id() ); // if route is a part of selection and affected_by_selection is set - if (affected_by_selection && selection.selected(tv) && selection.tracks.size() > 1 ) { + if (affected_by_selection && tv && selection.selected(tv) && selection.tracks.size() > 1 ) { RouteList routes; TrackViewList track_list = selection.tracks; @@ -816,7 +816,7 @@ GainMeter::gain_slider_button_press (GdkEventButton* ev) TimeAxisView* tv = ARDOUR_UI::instance()->the_editor().get_route_view_by_route_id (_route->id() ); // if route is a part of selection and affected_by_selection is set - if (affected_by_selection && selection.selected(tv) && selection.tracks.size() > 1 ) { + if (affected_by_selection && tv && selection.selected(tv) && selection.tracks.size() > 1 ) { RouteList routes; TrackViewList track_list = selection.tracks;