X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_region_view.cc;h=963fe63c01caf99dee30a4b10cc4066c3f3975b3;hb=456596bced4a3647cde4613792002142f9fea4d7;hp=c556d0184808e672a1bd7fe7d40f4f6b52f068ff;hpb=73192bc1a7ea55fa1864dc3826845b15c00dd2ec;p=ardour.git diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index c556d01848..963fe63c01 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2007 Paul Davis - Author: Dave Robillard + Author: David Robillard This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,32 +17,39 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include + #include "pbd/memento_command.h" + #include "ardour/automation_control.h" #include "ardour/event_type_map.h" -#include "ardour/session.h" -#include "ardour/source.h" #include "ardour/midi_automation_list_binder.h" #include "ardour/midi_region.h" +#include "ardour/session.h" + +#include "gtkmm2ext/keyboard.h" #include "automation_region_view.h" +#include "editing.h" +#include "editor.h" +#include "editor_drag.h" #include "gui_thread.h" -#include "public_editor.h" #include "midi_automation_line.h" -#include "editor_drag.h" -#include "editor.h" -#include "editing.h" +#include "public_editor.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" -AutomationRegionView::AutomationRegionView(ArdourCanvas::Group* parent, - AutomationTimeAxisView& time_axis, - boost::shared_ptr region, - const Evoral::Parameter& param, - boost::shared_ptr list, - double spu, - Gdk::Color const & 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) { @@ -50,25 +57,30 @@ AutomationRegionView::AutomationRegionView(ArdourCanvas::Group* create_line(list); } - group->signal_event().connect (sigc::mem_fun (this, &AutomationRegionView::canvas_event), false); 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 -AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/) +AutomationRegionView::init (bool /*wfd*/) { _enable_display = false; - RegionView::init(basic_color, false); - - compute_colors (basic_color); + RegionView::init (false); - reset_width_dependent_items ((double) _region->length() / samples_per_unit); + reset_width_dependent_items ((double) _region->length() / samples_per_pixel); set_height (trackview.current_height()); - _region->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RegionView::region_changed, this, _1), gui_context()); - + fill_color_name = "midi frame base"; set_colors (); _enable_display = true; @@ -82,51 +94,73 @@ AutomationRegionView::create_line (boost::shared_ptr lis trackview, *get_canvas_group(), list, boost::dynamic_pointer_cast (_region), _parameter, - &_time_converter)); + &_source_relative_time_converter)); _line->set_colors(); - _line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE)); - _line->show(); - _line->show_all_control_points(); + _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_event(GdkEvent* ev) +AutomationRegionView::canvas_group_event (GdkEvent* ev) { - PublicEditor& e = trackview.editor (); + if (in_destructor) { + return false; + } - if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseObject) { + PublicEditor& e = trackview.editor (); - /* XXX: icky dcast to Editor */ - e.drags()->set (new RubberbandSelectDrag (dynamic_cast (&e), group), ev); - - } else if (ev->type == GDK_BUTTON_RELEASE) { + if (trackview.editor().internal_editing() && + ev->type == GDK_BUTTON_RELEASE && + e.current_mouse_mode() == Editing::MouseDraw && + !e.drags()->active()) { - if (trackview.editor().drags()->active() && trackview.editor().drags()->end_grab (ev)) { - return true; - } - double x = ev->button.x; double y = ev->button.y; - + /* convert to item coordinates in the time axis view */ - automation_view()->canvas_display()->w2i (x, y); + automation_view()->canvas_display()->canvas_to_item (x, y); /* clamp y */ - y = max (y, 0.0); - y = min (y, _height - NAME_HIGHLIGHT_SIZE); - - add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position(), y); + y = std::max (y, 0.0); + y = std::min (y, _height - NAME_HIGHLIGHT_SIZE); + + /* 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, 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. * @param y y position, relative to our TimeAxisView. */ void -AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double y) +AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double y, bool with_guard_points) { if (!_line) { boost::shared_ptr c = _region->control(_parameter, true); @@ -138,34 +172,62 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double assert(_line); AutomationTimeAxisView* const view = automation_view (); - + /* compute vertical fractional position */ const double h = trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2; y = 1.0 - (y / h); + /* snap frame */ + + when = snap_frame_to_frame (when - _region->start ()) + _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); + 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(); + + view->session()->add_command (new MementoCommand (_line->memento_command_binder(), &before, &after)); + view->editor().commit_reversible_command (); + + 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(); + + 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())); - XMLNode& after = _line->the_list()->get_state(); + const double model_pos = _source_relative_time_converter.from( + pos - _source_relative_time_converter.origin_b()); - /* XXX: hack! */ - boost::shared_ptr mr = boost::dynamic_pointer_cast (_region); - assert (mr); - - view->session()->commit_reversible_command ( - new MementoCommand (new ARDOUR::MidiAutomationListBinder (mr->midi_source(), _parameter), &before, &after) - ); - + 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())); - view->session()->set_dirty (); + return true; } void @@ -174,7 +236,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)); } } @@ -184,7 +246,7 @@ AutomationRegionView::set_position (framepos_t pos, void* src, double* ignored) if (_line) { _line->set_maximum_time (_region->length ()); } - + return RegionView::set_position(pos, src, ignored); } @@ -203,27 +265,44 @@ AutomationRegionView::reset_width_dependent_items (double pixel_width) void AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed) { - RegionView::region_resized(what_changed); + RegionView::region_resized (what_changed); - if (_line) { - _line->reset(); + 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; + } + + if (what_changed.contains (ARDOUR::Properties::start)) { + _line->set_offset (_region->start ()); + } + + if (what_changed.contains (ARDOUR::Properties::length)) { _line->set_maximum_time (_region->length()); } } void -AutomationRegionView::entered (bool) +AutomationRegionView::entered () { - if (_line) + if (_line) { _line->track_entered(); + } } void -AutomationRegionView::exited() +AutomationRegionView::exited () { - if (_line) + if (_line) { _line->track_exited(); + } } -