mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-07 23:35:03 +01:00
Another round of whitespace fixes
This commit is contained in:
parent
14b27be658
commit
01a43c6b1e
10 changed files with 116 additions and 115 deletions
|
|
@ -54,7 +54,6 @@ ArdourWindow::ArdourWindow (Gtk::Window& parent, string title)
|
||||||
|
|
||||||
ArdourWindow::~ArdourWindow ()
|
ArdourWindow::~ArdourWindow ()
|
||||||
{
|
{
|
||||||
// WM::Manager::instance().remove (proxy);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
|
|
|
||||||
|
|
@ -122,7 +122,7 @@ AutomationRegionView::get_fill_color() const
|
||||||
void
|
void
|
||||||
AutomationRegionView::mouse_mode_changed ()
|
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();
|
set_frame_color();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -801,7 +801,7 @@ Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, Re
|
||||||
{
|
{
|
||||||
bool ret = false;
|
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.
|
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;
|
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 ??
|
perspective. XXX change this ??
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -501,9 +501,8 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
|
||||||
_mouse_changed_selection = set_selected_regionview_from_click (press, op);
|
_mouse_changed_selection = set_selected_regionview_from_click (press, op);
|
||||||
} else {
|
} else {
|
||||||
/* don't change the selection unless the
|
/* don't change the selection unless the
|
||||||
clicked track is not currently selected. if
|
* clicked track is not currently selected. if
|
||||||
so, "collapse" the selection to just this
|
* so, "collapse" the selection to just this track
|
||||||
track
|
|
||||||
*/
|
*/
|
||||||
if (!selection->selected (clicked_axisview)) {
|
if (!selection->selected (clicked_axisview)) {
|
||||||
set_selected_track_as_side_effect (Selection::Set);
|
set_selected_track_as_side_effect (Selection::Set);
|
||||||
|
|
|
||||||
|
|
@ -2996,8 +2996,9 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_
|
||||||
}
|
}
|
||||||
|
|
||||||
if (current_x < 0) {
|
if (current_x < 0) {
|
||||||
// This works even with snapping because RegionView::snap_sample_to_sample()
|
/* This works even with snapping because RegionView::snap_sample_to_sample()
|
||||||
// snaps forward if the snapped sample is before the beginning of the region
|
* snaps forward if the snapped sample is before the beginning of the region
|
||||||
|
*/
|
||||||
current_x = 0;
|
current_x = 0;
|
||||||
}
|
}
|
||||||
if (current_x > trackview.editor().sample_to_pixel(_region->length())) {
|
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)
|
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();
|
Temporal::Beats len = Temporal::Beats();
|
||||||
|
|
||||||
|
|
@ -4159,7 +4161,8 @@ MidiRegionView::set_step_edit_cursor_width (Temporal::Beats beats)
|
||||||
_step_edit_cursor_width = beats;
|
_step_edit_cursor_width = beats;
|
||||||
|
|
||||||
if (_step_edit_cursor) {
|
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 + beats)
|
||||||
- region_beats_to_region_samples (_step_edit_cursor_position)));
|
- region_beats_to_region_samples (_step_edit_cursor_position)));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue