From 8a7e452265ca079aafe8fa6dce58ed54ca7fe824 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 8 Apr 2019 20:25:05 +0200 Subject: Yet another "Rect frame" (not a sample) --- gtk2_ardour/audio_region_view.cc | 8 ++-- gtk2_ardour/editor.h | 2 +- gtk2_ardour/editor_canvas_events.cc | 2 +- gtk2_ardour/midi_region_view.cc | 16 ++++---- gtk2_ardour/public_editor.h | 2 +- gtk2_ardour/region_view.cc | 28 +++++++------- gtk2_ardour/time_axis_view_item.cc | 74 ++++++++++++++++++------------------- gtk2_ardour/time_axis_view_item.h | 6 +-- 8 files changed, 69 insertions(+), 69 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 42e4c5a303..094c2003cd 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -682,8 +682,8 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, s redraw_start_xfade_to (ar, width, points, effective_height, handle_left); /* ensure trim handle stays on top */ - if (sample_handle_start) { - sample_handle_start->raise_to_top(); + if (frame_handle_start) { + frame_handle_start->raise_to_top(); } } @@ -768,8 +768,8 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, redraw_end_xfade_to (ar, width, points, effective_height, handle_right, pwidth); /* ensure trim handle stays on top */ - if (sample_handle_end) { - sample_handle_end->raise_to_top(); + if (frame_handle_end) { + frame_handle_end->raise_to_top(); } } diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 6fd513d682..37cc40275d 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1566,7 +1566,7 @@ private: bool canvas_fade_out_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*, bool trim = false); bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); bool canvas_wave_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); - bool canvas_sample_handle_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); + bool canvas_frame_handle_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); bool canvas_region_view_name_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); bool canvas_feature_line_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*); diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index fbdb730b4a..5009295337 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -797,7 +797,7 @@ Editor::canvas_selection_end_trim_event (GdkEvent *event, ArdourCanvas::Item* it } bool -Editor::canvas_sample_handle_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv) +Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv) { bool ret = false; diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index e1a30599d9..fc1b525e18 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -465,11 +465,11 @@ MidiRegionView::enter_internal (uint32_t state) } // Lower sample handles below notes so they don't steal events - if (sample_handle_start) { - sample_handle_start->lower_to_bottom(); + if (frame_handle_start) { + frame_handle_start->lower_to_bottom(); } - if (sample_handle_end) { - sample_handle_end->lower_to_bottom(); + if (frame_handle_end) { + frame_handle_end->lower_to_bottom(); } } @@ -486,11 +486,11 @@ MidiRegionView::leave_internal() } // Raise sample handles above notes so they catch events - if (sample_handle_start) { - sample_handle_start->raise_to_top(); + if (frame_handle_start) { + frame_handle_start->raise_to_top(); } - if (sample_handle_end) { - sample_handle_end->raise_to_top(); + if (frame_handle_end) { + frame_handle_end->raise_to_top(); } } diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index aed2fb94c1..6678105067 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -394,7 +394,7 @@ public: virtual bool canvas_fade_out_handle_event (GdkEvent* event, ArdourCanvas::Item*, AudioRegionView*, bool) = 0; virtual bool canvas_region_view_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_wave_view_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; - virtual bool canvas_sample_handle_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; + virtual bool canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_region_view_name_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; virtual bool canvas_feature_line_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*) = 0; diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index a671cce0c0..128b848aa8 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -156,18 +156,18 @@ RegionView::init (bool wfd) name_highlight->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this)); } - if (sample_handle_start) { - sample_handle_start->set_data ("regionview", this); - sample_handle_start->set_data ("isleft", (void*) 1); - sample_handle_start->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_sample_handle_event), sample_handle_start, this)); - sample_handle_start->raise_to_top(); + if (frame_handle_start) { + frame_handle_start->set_data ("regionview", this); + frame_handle_start->set_data ("isleft", (void*) 1); + frame_handle_start->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this)); + frame_handle_start->raise_to_top(); } - if (sample_handle_end) { - sample_handle_end->set_data ("regionview", this); - sample_handle_end->set_data ("isleft", (void*) 0); - sample_handle_end->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_sample_handle_event), sample_handle_end, this)); - sample_handle_end->raise_to_top(); + if (frame_handle_end) { + frame_handle_end->set_data ("regionview", this); + frame_handle_end->set_data ("isleft", (void*) 0); + frame_handle_end->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this)); + frame_handle_end->raise_to_top(); } if (name_text) { @@ -821,12 +821,12 @@ RegionView::update_coverage_samples (LayerDisplay d) cr->set_x1 (trackview.editor().sample_to_pixel (end - position)); } - if (sample_handle_start) { - sample_handle_start->raise_to_top (); + if (frame_handle_start) { + frame_handle_start->raise_to_top (); } - if (sample_handle_end) { - sample_handle_end->raise_to_top (); + if (frame_handle_end) { + frame_handle_end->raise_to_top (); } if (name_highlight) { diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 42abcf700a..7c1a4a05ea 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -231,19 +231,19 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co double top = TimeAxisViewItem::GRAB_HANDLE_TOP; double width = TimeAxisViewItem::GRAB_HANDLE_WIDTH; - sample_handle_start = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height())); - CANVAS_DEBUG_NAME (sample_handle_start, "TAVI frame handle start"); - sample_handle_start->set_outline (false); - sample_handle_start->set_fill (false); - sample_handle_start->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::sample_handle_crossing), sample_handle_start)); - - sample_handle_end = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height())); - CANVAS_DEBUG_NAME (sample_handle_end, "TAVI frame handle end"); - sample_handle_end->set_outline (false); - sample_handle_end->set_fill (false); - sample_handle_end->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::sample_handle_crossing), sample_handle_end)); + frame_handle_start = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height())); + CANVAS_DEBUG_NAME (frame_handle_start, "TAVI frame handle start"); + frame_handle_start->set_outline (false); + frame_handle_start->set_fill (false); + frame_handle_start->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::sample_handle_crossing), frame_handle_start)); + + frame_handle_end = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height())); + CANVAS_DEBUG_NAME (frame_handle_end, "TAVI frame handle end"); + frame_handle_end->set_outline (false); + frame_handle_end->set_fill (false); + frame_handle_end->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::sample_handle_crossing), frame_handle_end)); } else { - sample_handle_start = sample_handle_end = 0; + frame_handle_start = frame_handle_end = 0; } //set_color (base_color); @@ -560,9 +560,9 @@ TimeAxisViewItem::set_height (double height) frame->set_y0 (0.0); frame->set_y1 (height); - if (sample_handle_start) { - sample_handle_start->set_y1 (height); - sample_handle_end->set_y1 (height); + if (frame_handle_start) { + frame_handle_start->set_y1 (height); + frame_handle_end->set_y1 (height); } if (selection_frame) { @@ -741,18 +741,18 @@ TimeAxisViewItem::set_trim_handle_colors() { #if 1 /* Leave them transparent for now */ - if (sample_handle_start) { - sample_handle_start->set_fill_color (0x00000000); - sample_handle_end->set_fill_color (0x00000000); + if (frame_handle_start) { + frame_handle_start->set_fill_color (0x00000000); + frame_handle_end->set_fill_color (0x00000000); } #else - if (sample_handle_start) { + if (frame_handle_start) { if (position_locked) { - sample_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandleLocked()); - sample_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandleLocked()); + frame_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandleLocked()); + frame_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandleLocked()); } else { - sample_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandle()); - sample_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandle()); + frame_handle_start->set_fill_color (UIConfiguration::instance().get_TrimHandle()); + frame_handle_end->set_fill_color (UIConfiguration::instance().get_TrimHandle()); } } #endif @@ -820,9 +820,9 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) frame->set_x1 (std::max(1.0, pixel_width)); } - if (sample_handle_start) { - sample_handle_start->hide(); - sample_handle_end->hide(); + if (frame_handle_start) { + frame_handle_start->hide(); + frame_handle_end->hide(); } } else { @@ -838,24 +838,24 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) } } - if (sample_handle_start) { + if (frame_handle_start) { if (pixel_width < (3 * TimeAxisViewItem::GRAB_HANDLE_WIDTH)) { /* * there's less than GRAB_HANDLE_WIDTH of the region between - * the right-hand end of sample_handle_start and the left-hand - * end of sample_handle_end, so disable the handles + * the right-hand end of frame_handle_start and the left-hand + * end of frame_handle_end, so disable the handles */ - sample_handle_start->hide(); - sample_handle_end->hide(); + frame_handle_start->hide(); + frame_handle_end->hide(); } else { - sample_handle_start->show(); - sample_handle_end->set_x0 (pixel_width - (TimeAxisViewItem::GRAB_HANDLE_WIDTH)); - sample_handle_end->set_x1 (pixel_width); - sample_handle_end->show(); + frame_handle_start->show(); + frame_handle_end->set_x0 (pixel_width - (TimeAxisViewItem::GRAB_HANDLE_WIDTH)); + frame_handle_end->set_x1 (pixel_width); + frame_handle_end->show(); - sample_handle_start->raise_to_top (); - sample_handle_end->raise_to_top (); + frame_handle_start->raise_to_top (); + frame_handle_end->raise_to_top (); } } } diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h index a099cb8380..c1d9d32c98 100644 --- a/gtk2_ardour/time_axis_view_item.h +++ b/gtk2_ardour/time_axis_view_item.h @@ -223,9 +223,9 @@ protected: ArdourCanvas::Text* name_text; ArdourCanvas::Rectangle* name_highlight; - /* with these two values, if sample_handle_start == 0 then sample_handle_end will also be 0 */ - ArdourCanvas::Rectangle* sample_handle_start; ///< `sample' (fade) handle for the start of the item, or 0 - ArdourCanvas::Rectangle* sample_handle_end; ///< `sample' (fade) handle for the end of the item, or 0 + /* with these two values, if frame_handle_start == 0 then frame_handle_end will also be 0 */ + ArdourCanvas::Rectangle* frame_handle_start; ///< `sample' (fade) handle for the start of the item, or 0 + ArdourCanvas::Rectangle* frame_handle_end; ///< `sample' (fade) handle for the end of the item, or 0 bool sample_handle_crossing (GdkEvent*, ArdourCanvas::Rectangle*); -- cgit v1.2.3