Fix MIDI recording display when zoom/etc changes.

[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 871e83eec83407125f97b0c650b05e21906e0cdb..d30cceccb76b0de39b6b3782d68ef46150ee6059 100644 (file)
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -29,6 +29,7 @@
 
 #include "gtkmm2ext/keyboard.h"
 
+#include "ardour_ui.h"
 #include "automation_region_view.h"
 #include "editing.h"
 #include "editor.h"
@@ -57,6 +58,10 @@ 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 ());
 }
 
 AutomationRegionView::~AutomationRegionView ()
@@ -75,6 +80,7 @@ AutomationRegionView::init (bool /*wfd*/)
 
        set_height (trackview.current_height());
 
+       fill_color_name = "midi frame base";
        set_colors ();
 
        _enable_display = true;
@@ -96,6 +102,27 @@ AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> lis
        _line->set_offset (_region->start ());
 }
 
+uint32_t
+AutomationRegionView::get_fill_color() const
+{
+       const std::string mod_name = (_dragging ? "dragging region" :
+                                     trackview.editor().internal_editing() ? "editable region" :
+                                     "midi frame base");
+       if (_selected) {
+               return ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
+       } else if (high_enough_for_name || !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
+               return ARDOUR_UI::config()->color_mod ("midi frame base", mod_name);
+       }
+       return ARDOUR_UI::config()->color_mod (fill_color, mod_name);
+}
+
+void
+AutomationRegionView::mouse_mode_changed ()
+{
+       // Adjust frame colour (become more transparent for internal tools)
+       set_frame_color();
+}
+
 bool
 AutomationRegionView::canvas_group_event (GdkEvent* ev)
 {
@@ -103,14 +130,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 +149,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 +207,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 ();
 }
@@ -208,9 +236,10 @@ AutomationRegionView::paste (framepos_t                                      pos
 
        /* add multi-paste offset if applicable */
        pos += view->editor().get_paste_offset(
-               pos, paste_count, _line->time_converter().to(slist->length()));
+               pos, paste_count, _source_relative_time_converter.to(slist->length()));
 
-       const double model_pos = _line->time_converter().from(pos - _line->time_converter().origin_b());
+       const double model_pos = _source_relative_time_converter.from(
+               pos - _source_relative_time_converter.origin_b());
 
        XMLNode& before = my_list->get_state();
        my_list->paste(*slist, model_pos, times);
@@ -281,7 +310,7 @@ AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed)
 
 
 void
-AutomationRegionView::entered (bool)
+AutomationRegionView::entered ()
 {
        if (_line) {
                _line->track_entered();