X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_region_view.cc;h=d30cceccb76b0de39b6b3782d68ef46150ee6059;hb=3d1f955a0cf33bc57a9159ee844f6d13297bbe22;hp=44744fa39b1e29bd0c61aa0d409bb5dabcb05113;hpb=0796ccfb652dd31ea1d94526e0e6d92863a972b0;p=ardour.git diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index 44744fa39b..d30cceccb7 100644 --- 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" @@ -39,14 +40,16 @@ #include "i18n.h" -AutomationRegionView::AutomationRegionView (ArdourCanvas::Layout* parent, - AutomationTimeAxisView& time_axis, - boost::shared_ptr region, - const Evoral::Parameter& param, - boost::shared_ptr list, - double spu, - uint32_t basic_color) +AutomationRegionView::AutomationRegionView (ArdourCanvas::Container* parent, + AutomationTimeAxisView& time_axis, + boost::shared_ptr region, + const Evoral::Parameter& param, + boost::shared_ptr list, + double spu, + uint32_t basic_color) : RegionView(parent, time_axis, region, spu, basic_color, true) + , _region_relative_time_converter(region->session().tempo_map(), region->position()) + , _source_relative_time_converter(region->session().tempo_map(), region->position() - region->start()) , _parameter(param) { if (list) { @@ -54,12 +57,16 @@ AutomationRegionView::AutomationRegionView (ArdourCanvas::Layout* create_line(list); } - group->Event.connect (sigc::mem_fun (this, &AutomationRegionView::canvas_event)); group->raise_to_top(); + + trackview.editor().MouseModeChanged.connect(_mouse_mode_connection, invalidator (*this), + boost::bind (&AutomationRegionView::mouse_mode_changed, this), + gui_context ()); } AutomationRegionView::~AutomationRegionView () { + RegionViewGoingAway (this); /* EMIT_SIGNAL */ } void @@ -73,6 +80,7 @@ AutomationRegionView::init (bool /*wfd*/) set_height (trackview.current_height()); + fill_color_name = "midi frame base"; set_colors (); _enable_display = true; @@ -94,20 +102,59 @@ AutomationRegionView::create_line (boost::shared_ptr 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_event (GdkEvent* ev) +AutomationRegionView::canvas_group_event (GdkEvent* ev) { + if (in_destructor) { + return false; + } + PublicEditor& e = trackview.editor (); - if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseObject) { + if (!trackview.editor().internal_editing()) { + // not in internal edit mode, so just act like a normal region + return RegionView::canvas_group_event (ev); + } + + if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseContent) { /* XXX: icky dcast to Editor */ e.drags()->set (new EditorRubberbandSelectDrag (dynamic_cast (&e), group), ev); + e.drags()->start_grab (ev); + return true; - } else if (ev->type == GDK_BUTTON_RELEASE) { + } else if (ev->type == GDK_MOTION_NOTIFY && e.drags()->active()) { + /* we probably shouldn't have to handle this here, but... */ + e.drags()->motion_handler(ev, false); + return true; - if (trackview.editor().drags()->active() && trackview.editor().drags()->end_grab (ev)) { + } 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 && + e.current_mouse_mode() != Editing::MouseContent) { + return RegionView::canvas_group_event (ev); } double x = ev->button.x; @@ -122,10 +169,11 @@ AutomationRegionView::canvas_event (GdkEvent* ev) /* guard points only if primary modifier is used */ bool with_guard_points = Gtkmm2ext::Keyboard::modifier_state_equals (ev->button.state, Gtkmm2ext::Keyboard::PrimaryModifier); - add_automation_event (ev, trackview.editor().pixel_to_sample (x) - _region->position() + _region->start(), y, with_guard_points); + add_automation_event (ev, e.pixel_to_sample (x) - _region->position() + _region->start(), y, with_guard_points); + return true; } - return false; + return RegionView::canvas_group_event (ev); } /** @param when Position in frames, where 0 is the start of the region. @@ -159,23 +207,46 @@ 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); + _line->the_list()->add (when_d, y, with_guard_points, false); XMLNode& after = _line->the_list()->get_state(); - /* XXX: hack! */ - boost::shared_ptr mr = boost::dynamic_pointer_cast (_region); - assert (mr); + view->session()->add_command (new MementoCommand (_line->memento_command_binder(), &before, &after)); + view->editor().commit_reversible_command (); - view->session()->commit_reversible_command ( - new MementoCommand (new ARDOUR::MidiAutomationListBinder (mr->midi_source(), _parameter), &before, &after) - ); + view->session()->set_dirty (); +} +bool +AutomationRegionView::paste (framepos_t pos, + unsigned paste_count, + float times, + boost::shared_ptr slist) +{ + AutomationTimeAxisView* const view = automation_view(); + boost::shared_ptr my_list = _line->the_list(); - view->session()->set_dirty (); + if (view->session()->transport_rolling() && my_list->automation_write()) { + /* do not paste if this control is in write mode and we're rolling */ + return false; + } + + /* add multi-paste offset if applicable */ + pos += view->editor().get_paste_offset( + pos, paste_count, _source_relative_time_converter.to(slist->length())); + + 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); + view->session()->add_command( + new MementoCommand(_line->memento_command_binder(), &before, &my_list->get_state())); + + return true; } void @@ -215,6 +286,15 @@ AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed) { RegionView::region_resized (what_changed); + if (what_changed.contains (ARDOUR::Properties::position)) { + _region_relative_time_converter.set_origin_b(_region->position()); + } + + if (what_changed.contains (ARDOUR::Properties::start) || + what_changed.contains (ARDOUR::Properties::position)) { + _source_relative_time_converter.set_origin_b (_region->position() - _region->start()); + } + if (!_line) { return; } @@ -230,7 +310,7 @@ AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed) void -AutomationRegionView::entered (bool) +AutomationRegionView::entered () { if (_line) { _line->track_entered();