From 0dda441598796d9143ba9065f9bef7011b54b718 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 8 Dec 2021 16:31:28 -0700 Subject: [PATCH] automation region view: eliminate use of trackview member to access PublicEditor --- gtk2_ardour/automation_region_view.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index 320b1daf60..dbe125e770 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -66,9 +66,9 @@ AutomationRegionView::AutomationRegionView (ArdourCanvas::Container* group->raise_to_top(); - trackview.editor().MouseModeChanged.connect(_mouse_mode_connection, invalidator (*this), - boost::bind (&AutomationRegionView::mouse_mode_changed, this), - gui_context ()); + PublicEditor::instance().MouseModeChanged.connect(_mouse_mode_connection, invalidator (*this), + boost::bind (&AutomationRegionView::mouse_mode_changed, this), + gui_context ()); } AutomationRegionView::~AutomationRegionView () @@ -110,7 +110,7 @@ uint32_t AutomationRegionView::get_fill_color() const { const std::string mod_name = (_dragging ? "dragging region" : - trackview.editor().internal_editing() ? "editable region" : + PublicEditor::instance().internal_editing() ? "editable region" : "midi frame base"); if (_selected) { return UIConfiguration::instance().color_mod ("selected region base", mod_name); @@ -134,9 +134,9 @@ AutomationRegionView::canvas_group_event (GdkEvent* ev) return false; } - PublicEditor& e = trackview.editor (); + PublicEditor& e (PublicEditor::instance()); - if (trackview.editor().internal_editing() && + if (e.internal_editing() && ev->type == GDK_BUTTON_RELEASE && ev->button.button == 1 && e.current_mouse_mode() == Editing::MouseDraw &&