X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fautomation_region_view.cc;h=f26923de414b3a7aa1f0f9cd3f672fdbb8775578;hb=92a5e4da48b85017647fb2c55d2d76fff47243e1;hp=bcb637602766019ba28461b202489de113478ad5;hpb=aae367b63c9b619db1e40f27dc334c6987219481;p=ardour.git diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index bcb6376027..f26923de41 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -22,19 +22,27 @@ #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 "automation_region_view.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 "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) - : RegionView(parent, time_axis, region, spu, basic_color) +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) + : RegionView(parent, time_axis, region, spu, basic_color, true) , _parameter(param) { if (list) { @@ -59,8 +67,6 @@ AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/) set_height (trackview.current_height()); - _region->StateChanged.connect (*this, boost::bind (&RegionView::region_changed, this, _1)); - set_colors (); _enable_display = true; @@ -69,30 +75,57 @@ AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/) void AutomationRegionView::create_line (boost::shared_ptr list) { - _line = boost::shared_ptr(new AutomationLine( + _line = boost::shared_ptr (new MidiAutomationLine( ARDOUR::EventTypeMap::instance().to_symbol(list->parameter()), - trackview, *get_canvas_group(), list, &_time_converter)); + trackview, *get_canvas_group(), list, + boost::dynamic_pointer_cast (_region), + _parameter, + &_time_converter)); _line->set_colors(); - _line->set_interpolation(list->interpolation()); _line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE)); _line->show(); _line->show_all_control_points(); + _line->set_maximum_time (_region->length()); + _line->set_offset (_region->start ()); } bool -AutomationRegionView::canvas_event(GdkEvent* ev) +AutomationRegionView::canvas_event (GdkEvent* ev) { - if (ev->type == GDK_BUTTON_RELEASE) { - const nframes_t when = trackview.editor().pixel_to_frame((nframes_t)ev->button.x) - - _region->position(); - add_automation_event(ev, when, ev->button.y); + 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 RubberbandSelectDrag (dynamic_cast (&e), group), ev); + + } else if (ev->type == GDK_BUTTON_RELEASE) { + + 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); + + /* 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); } return false; } +/** @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* /*event*/, nframes_t when, double y) +AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double y) { if (!_line) { boost::shared_ptr c = _region->control(_parameter, true); @@ -103,11 +136,8 @@ AutomationRegionView::add_automation_event (GdkEvent* /*event*/, nframes_t when, } assert(_line); - double x = when; - AutomationTimeAxisView* const view = automation_view(); - - view->canvas_display()->w2i (x, y); - + AutomationTimeAxisView* const view = automation_view (); + /* compute vertical fractional position */ const double h = trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2; @@ -115,16 +145,24 @@ AutomationRegionView::add_automation_event (GdkEvent* /*event*/, nframes_t when, /* map using line */ - _line->view_to_model_coord (x, y); + 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 (x, y); + _line->the_list()->add (when_d, y); XMLNode& after = _line->the_list()->get_state(); - view->session()->commit_reversible_command (new MementoCommand( - *_line->the_list(), &before, &after)); + + /* 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) + ); + view->session()->set_dirty (); } @@ -134,13 +172,18 @@ AutomationRegionView::set_height (double h) { RegionView::set_height(h); - if (_line) + if (_line) { _line->set_height ((uint32_t)rint(h - NAME_HIGHLIGHT_SIZE)); + } } bool -AutomationRegionView::set_position (nframes64_t pos, void* src, double* ignored) +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); } @@ -150,33 +193,44 @@ AutomationRegionView::reset_width_dependent_items (double pixel_width) { RegionView::reset_width_dependent_items(pixel_width); - if (_line) + if (_line) { _line->reset(); + } } void -AutomationRegionView::region_resized (ARDOUR::Change what_changed) +AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed) { - RegionView::region_resized(what_changed); + RegionView::region_resized (what_changed); - if (_line) - _line->reset(); + 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() +AutomationRegionView::entered (bool) { - if (_line) + if (_line) { _line->track_entered(); + } } void -AutomationRegionView::exited() +AutomationRegionView::exited () { - if (_line) + if (_line) { _line->track_exited(); + } } -