From eb4e854a5685c588aa01b789eb6d38be2ee57747 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 9 Apr 2019 00:31:29 +0200 Subject: Replace some more "samples" with "frames" (rectangles) --- gtk2_ardour/midi_region_view.cc | 2 +- gtk2_ardour/region_view.cc | 20 ++++++++++---------- gtk2_ardour/region_view.h | 8 ++++---- gtk2_ardour/strip_silence_dialog.cc | 4 ++-- gtk2_ardour/time_axis_view_item.h | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index e26e728fee..11c027fabf 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -485,7 +485,7 @@ MidiRegionView::leave_internal() _grabbed_keyboard = false; } - // Raise sample handles above notes so they catch events + // Raise frame handles above notes so they catch events if (frame_handle_start) { frame_handle_start->raise_to_top(); } diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 6c00e89f52..39b6e118ee 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -203,7 +203,7 @@ RegionView::~RegionView () delete *i; } - drop_silent_samples (); + drop_silent_frames (); delete editor; } @@ -218,12 +218,12 @@ RegionView::canvas_group_event (GdkEvent* event) } void -RegionView::set_silent_samples (const AudioIntervalResult& silences, double /*threshold*/) +RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/) { samplecnt_t shortest = max_samplecnt; /* remove old silent samples */ - drop_silent_samples (); + drop_silent_frames (); if (silences.empty()) { return; @@ -235,7 +235,7 @@ RegionView::set_silent_samples (const AudioIntervalResult& silences, double /*th ArdourCanvas::Rectangle* cr = new ArdourCanvas::Rectangle (group); cr->set_ignore_events (true); - _silent_samples.push_back (cr); + _silent_frames.push_back (cr); /* coordinates for the rect are relative to the regionview origin */ @@ -319,21 +319,21 @@ RegionView::set_silent_samples (const AudioIntervalResult& silences, double /*th } void -RegionView::hide_silent_samples () +RegionView::hide_silent_frames () { - for (list::iterator i = _silent_samples.begin (); i != _silent_samples.end (); ++i) { + for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { (*i)->hide (); } _silence_text->hide(); } void -RegionView::drop_silent_samples () +RegionView::drop_silent_frames () { - for (list::iterator i = _silent_samples.begin (); i != _silent_samples.end (); ++i) { + for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { delete *i; } - _silent_samples.clear (); + _silent_frames.clear (); delete _silence_text; _silence_text = 0; @@ -742,7 +742,7 @@ RegionView::set_height (double h) (*i)->set_y1 (h + 1); } - for (list::iterator i = _silent_samples.begin(); i != _silent_samples.end(); ++i) { + for (list::iterator i = _silent_frames.begin(); i != _silent_frames.end(); ++i) { (*i)->set_y1 (h + 1); } diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index e8bb0052cd..a7a8733896 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -116,9 +116,9 @@ public: void move_contents (ARDOUR::sampleoffset_t); virtual void thaw_after_trim (); - void set_silent_samples (const ARDOUR::AudioIntervalResult&, double threshold); - void drop_silent_samples (); - void hide_silent_samples (); + void set_silent_frames (const ARDOUR::AudioIntervalResult&, double threshold); + void drop_silent_frames (); + void hide_silent_frames (); struct PositionOrder { bool operator()(const RegionView* a, const RegionView* b) { @@ -188,7 +188,7 @@ protected: /** a list of rectangles used to show silent segments */ - std::list _silent_samples; + std::list _silent_frames; /** a list of rectangles used to show the current silence threshold */ std::list _silent_threshold_samples; diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc index a2f8bc7983..9ce3084fa9 100644 --- a/gtk2_ardour/strip_silence_dialog.cc +++ b/gtk2_ardour/strip_silence_dialog.cc @@ -176,7 +176,7 @@ StripSilenceDialog::drop_rects () _lock.unlock (); for (list::iterator v = views.begin(); v != views.end(); ++v) { - v->view->drop_silent_samples (); + v->view->drop_silent_frames (); } cancel_button->set_sensitive (false); @@ -223,7 +223,7 @@ StripSilenceDialog::update_silence_rects () double const y = _threshold.get_value(); for (list::iterator v = views.begin(); v != views.end(); ++v) { - v->view->set_silent_samples (v->intervals, y); + v->view->set_silent_frames (v->intervals, y); } } diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h index 61b9aeb308..bff7672a34 100644 --- a/gtk2_ardour/time_axis_view_item.h +++ b/gtk2_ardour/time_axis_view_item.h @@ -224,8 +224,8 @@ protected: ArdourCanvas::Rectangle* name_highlight; /* 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 + ArdourCanvas::Rectangle* frame_handle_start; ///< `frame' (fade) handle for the start of the item, or 0 + ArdourCanvas::Rectangle* frame_handle_end; ///< `frame' (fade) handle for the end of the item, or 0 bool frame_handle_crossing (GdkEvent*, ArdourCanvas::Rectangle*); -- cgit v1.2.3