X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_region_view.cc;h=e3e41b442801028c6eb47aefc01709749e747c52;hb=ae3c50c495ffadbc62103cc1d3a61af2b48f423e;hp=d44615d79a5147faebc42fcef19500b4e7e90cfd;hpb=b426873f6fd05ad546e49317cc6dc7ee59df60fa;p=ardour.git diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index d44615d79a..e3e41b4428 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -36,8 +36,9 @@ #include "gui_thread.h" #include "midi_automation_line.h" #include "public_editor.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" AutomationRegionView::AutomationRegionView (ArdourCanvas::Container* parent, AutomationTimeAxisView& time_axis, @@ -51,16 +52,23 @@ AutomationRegionView::AutomationRegionView (ArdourCanvas::Container* , _source_relative_time_converter(region->session().tempo_map(), region->position() - region->start()) , _parameter(param) { + TimeAxisViewItem::set_position (_region->position(), this); + if (list) { assert(list->parameter() == param); create_line(list); } group->raise_to_top(); + + trackview.editor().MouseModeChanged.connect(_mouse_mode_connection, invalidator (*this), + boost::bind (&AutomationRegionView::mouse_mode_changed, this), + gui_context ()); } AutomationRegionView::~AutomationRegionView () { + in_destructor = true; RegionViewGoingAway (this); /* EMIT_SIGNAL */ } @@ -75,6 +83,7 @@ AutomationRegionView::init (bool /*wfd*/) set_height (trackview.current_height()); + fill_color_name = "midi frame base"; set_colors (); _enable_display = true; @@ -90,12 +99,33 @@ AutomationRegionView::create_line (boost::shared_ptr lis _parameter, &_source_relative_time_converter)); _line->set_colors(); - _line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE)); + _line->set_height ((uint32_t)rint(trackview.current_height() - 2.5 - NAME_HIGHLIGHT_SIZE)); _line->set_visibility (AutomationLine::VisibleAspects (AutomationLine::Line|AutomationLine::ControlPoints)); _line->set_maximum_time (_region->length()); _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 UIConfiguration::instance().color_mod ("selected region base", mod_name); + } else if (high_enough_for_name || !UIConfiguration::instance().get_color_regions_using_track_color()) { + return UIConfiguration::instance().color_mod ("midi frame base", mod_name); + } + return UIConfiguration::instance().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) { @@ -105,24 +135,10 @@ AutomationRegionView::canvas_group_event (GdkEvent* ev) PublicEditor& e = trackview.editor (); - if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseObject) { - - /* 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_MOTION_NOTIFY && e.drags()->active()) { - /* we probably shouldn't have to handle this here, but... */ - e.drags()->motion_handler(ev, false); - return true; - - } else if (ev->type == GDK_BUTTON_RELEASE) { - if (e.drags()->end_grab (ev)) { - return true; - } else if (e.current_mouse_mode() != Editing::MouseDraw) { - return false; - } + if (trackview.editor().internal_editing() && + ev->type == GDK_BUTTON_RELEASE && + e.current_mouse_mode() == Editing::MouseDraw && + !e.drags()->active()) { double x = ev->button.x; double y = ev->button.y; @@ -140,7 +156,7 @@ AutomationRegionView::canvas_group_event (GdkEvent* ev) return true; } - return false; + return RegionView::canvas_group_event (ev); } /** @param when Position in frames, where 0 is the start of the region. @@ -167,24 +183,25 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double /* snap frame */ - when = snap_frame_to_frame (when - _region->start ()) + _region->start (); + when = snap_frame_to_frame (when - _region->start ()).frame + _region->start (); /* map using line */ double when_d = when; _line->view_to_model_coord (when_d, y); - view->session()->begin_reversible_command (_("add automation event")); XMLNode& before = _line->the_list()->get_state(); - _line->the_list()->add (when_d, y, with_guard_points, false); + if (_line->the_list()->editor_add (when_d, y, with_guard_points)) { + view->editor().begin_reversible_command (_("add automation event")); - XMLNode& after = _line->the_list()->get_state(); + XMLNode& after = _line->the_list()->get_state(); - view->session()->commit_reversible_command ( - new MementoCommand (_line->memento_command_binder(), &before, &after)); + view->session()->add_command (new MementoCommand (_line->memento_command_binder(), &before, &after)); + view->editor().commit_reversible_command (); - view->session()->set_dirty (); + view->session()->set_dirty (); + } } bool @@ -203,9 +220,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); @@ -221,7 +239,7 @@ AutomationRegionView::set_height (double h) RegionView::set_height(h); if (_line) { - _line->set_height ((uint32_t)rint(h - NAME_HIGHLIGHT_SIZE)); + _line->set_height ((uint32_t)rint(h - 2.5 - NAME_HIGHLIGHT_SIZE)); } } @@ -276,7 +294,7 @@ AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed) void -AutomationRegionView::entered (bool) +AutomationRegionView::entered () { if (_line) { _line->track_entered();