Another round of whitespace fixes

gtk2_ardour/ardour_window.cc

@@ -54,7 +54,6 @@ ArdourWindow::ArdourWindow (Gtk::Window& parent, string title)
 
 ArdourWindow::~ArdourWindow ()
 {
-	// WM::Manager::instance().remove (proxy);
 }
 
 bool

gtk2_ardour/automation_region_view.cc

@@ -122,7 +122,7 @@ AutomationRegionView::get_fill_color() const
 void
 AutomationRegionView::mouse_mode_changed ()
 {
-	// Adjust sample colour (become more transparent for internal tools)
+	/* Adjust frame colour (become more transparent for internal tools) */
 	set_frame_color();
 }
 

gtk2_ardour/editor_canvas_events.cc

@@ -801,7 +801,7 @@ Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, Re
 {
 	bool ret = false;
 
-	/* sample handles are not active when in internal edit mode, because actual notes
+	/* frame handles are not active when in internal edit mode, because actual notes
 	   might be in the area occupied by the handle - we want them to be editable as normal.
 	*/
 
@@ -809,7 +809,7 @@ Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, Re
 		return false;
 	}
 
-	/* NOTE: sample handles pretend to be the colored trim bar from an event handling
+	/* NOTE: frame handles pretend to be the colored trim bar from an event handling
 	   perspective. XXX change this ??
 	*/
 

gtk2_ardour/editor_mouse.cc

@@ -501,9 +501,8 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
 					_mouse_changed_selection = set_selected_regionview_from_click (press, op);
 				} else {
 					/* don't change the selection unless the
-						 clicked track is not currently selected. if
-						 so, "collapse" the selection to just this
-						 track
+					 * clicked track is not currently selected. if
+					 * so, "collapse" the selection to just this track
 					 */
 					if (!selection->selected (clicked_axisview)) {
 						set_selected_track_as_side_effect (Selection::Set);

gtk2_ardour/midi_region_view.cc

@@ -2996,8 +2996,9 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_
 		}
 
 		if (current_x < 0) {
-			// This works even with snapping because RegionView::snap_sample_to_sample()
-			// snaps forward if the snapped sample is before the beginning of the region
+			/* This works even with snapping because RegionView::snap_sample_to_sample()
+			 * snaps forward if the snapped sample is before the beginning of the region
+			 */
 			current_x = 0;
 		}
 		if (current_x > trackview.editor().sample_to_pixel(_region->length())) {
@@ -3045,7 +3046,8 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_
 			}
 
 			const Temporal::Beats beats = Temporal::Beats (tmap.exact_beat_at_sample (snapped_x + midi_region()->position(), divisions)
-								     - midi_region()->beat()) + midi_region()->start_beats();
+			                                               - midi_region()->beat())
+			                              + midi_region()->start_beats();
 
 			Temporal::Beats len         = Temporal::Beats();
 
@@ -4159,7 +4161,8 @@ MidiRegionView::set_step_edit_cursor_width (Temporal::Beats beats)
 	_step_edit_cursor_width = beats;
 
 	if (_step_edit_cursor) {
-		_step_edit_cursor->set_x1 (_step_edit_cursor->x0() + trackview.editor().sample_to_pixel (
+		_step_edit_cursor->set_x1 (_step_edit_cursor->x0()
+		                           + trackview.editor().sample_to_pixel (
 		                             region_beats_to_region_samples (_step_edit_cursor_position + beats)
 		                             - region_beats_to_region_samples (_step_edit_cursor_position)));
 	}