summaryrefslogtreecommitdiff
path: root/gtk2_ardour/time_axis_view_item.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2019-04-08 21:40:33 +0200
committerRobin Gareus <robin@gareus.org>2019-04-08 22:42:47 +0200
commita0b032efe2c5196764f5d499fcf2133d944ef265 (patch)
tree58f00bab2cbdba331546e603c5dccdd85fb46867 /gtk2_ardour/time_axis_view_item.cc
parent37aaa2d11b47cbaf3f33bf2e7744cc899050d666 (diff)
Revert more "frame/sample" replacements
- Coverage concerns rectangles (frames, not sample) - frame-handles are rectangles - layout container boxes are frames - inline display boxes are display_frame
Diffstat (limited to 'gtk2_ardour/time_axis_view_item.cc')
-rw-r--r--gtk2_ardour/time_axis_view_item.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 7c1a4a05ea..b89a67242e 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -235,13 +235,13 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
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_start->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::frame_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));
+ frame_handle_end->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::frame_handle_crossing), frame_handle_end));
} else {
frame_handle_start = frame_handle_end = 0;
}
@@ -611,7 +611,7 @@ TimeAxisViewItem::set_color (uint32_t base_color)
}
ArdourCanvas::Item*
-TimeAxisViewItem::get_canvas_sample()
+TimeAxisViewItem::get_canvas_frame()
{
return frame;
}
@@ -759,7 +759,7 @@ TimeAxisViewItem::set_trim_handle_colors()
}
bool
-TimeAxisViewItem::sample_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle* item)
+TimeAxisViewItem::frame_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle* item)
{
switch (ev->type) {
case GDK_LEAVE_NOTIFY: