Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / automation_region_view.cc

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index 2b21b6f83f88a1f387bc584a7201f080c943c266..ec1fa523a451742fddcaa552c8645f89d9b8c8b3 100644 (file)
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -75,6 +75,7 @@ AutomationRegionView::init (bool /*wfd*/)
 
        set_height (trackview.current_height());
 
+       _fill_color_name = "midi frame base";
        set_colors ();
 
        _enable_display = true;
@@ -103,14 +104,14 @@ AutomationRegionView::canvas_group_event (GdkEvent* ev)
                return false;
        }
 
+       PublicEditor& e = trackview.editor ();
+
        if (!trackview.editor().internal_editing()) {
                // not in internal edit mode, so just act like a normal region
                return RegionView::canvas_group_event (ev);
        }
 
-       PublicEditor& e = trackview.editor ();
-
-       if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseObject) {
+       if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseContent) {
 
                /* XXX: icky dcast to Editor */
                e.drags()->set (new EditorRubberbandSelectDrag (dynamic_cast<Editor*> (&e), group), ev);
@@ -122,10 +123,11 @@ AutomationRegionView::canvas_group_event (GdkEvent* ev)
                e.drags()->motion_handler(ev, false);
                return true;
 
-       } else if (ev->type == GDK_BUTTON_RELEASE) {
+       } else if (ev->type == GDK_BUTTON_RELEASE && e.current_mouse_mode() == Editing::MouseDraw) {
                if (e.drags()->end_grab (ev)) {
                        return true;
-               } else if (e.current_mouse_mode() != Editing::MouseDraw) {
+               } else if (e.current_mouse_mode() != Editing::MouseDraw &&
+                          e.current_mouse_mode() != Editing::MouseContent) {
                        return RegionView::canvas_group_event (ev);
                }
 
@@ -179,15 +181,15 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double
        double when_d = when;
        _line->view_to_model_coord (when_d, y);
 
-       view->session()->begin_reversible_command (_("add automation event"));
+       view->editor().begin_reversible_command (_("add automation event"));
        XMLNode& before = _line->the_list()->get_state();
 
        _line->the_list()->add (when_d, y, with_guard_points, false);
 
        XMLNode& after = _line->the_list()->get_state();
 
-       view->session()->commit_reversible_command (
-               new MementoCommand<ARDOUR::AutomationList> (_line->memento_command_binder(), &before, &after));
+       view->session()->add_command (new MementoCommand<ARDOUR::AutomationList> (_line->memento_command_binder(), &before, &after));
+       view->editor().commit_reversible_command ();
 
        view->session()->set_dirty ();
 }
@@ -282,7 +284,7 @@ AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed)
 
 
 void
-AutomationRegionView::entered (bool)
+AutomationRegionView::entered ()
 {
        if (_line) {
                _line->track_entered();