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

[Summary] Removed unused variables, added NULL ptr checks

Browse source
This commit is contained in:
GZharun 2015-01-19 10:41:57 +02:00
parent a5393dbf35
commit 562f55c917
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/editor_routes.cc
View file

@ -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<RouteTimeAxisView*>(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;

6
gtk2_ardour/gain_meter.cc
View file

@ -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;