X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_region_view.cc;h=383c022bdb0d1cb478278d44f29fcb47ace3af61;hb=678bb05bd6c68282448e1920fd7511a4289a1fc4;hp=ad10851c7389b04a4c37d74d0ba00f6a312692a0;hpb=5328a114c93f14178a5d5b97d7a6b95ea007552e;p=ardour.git diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index ad10851c73..383c022bdb 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 + Copyright (C) 2007 Paul Davis + 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 @@ -22,34 +22,43 @@ #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) { assert(list->parameter() == param); create_line(list); } - - group->signal_event().connect (mem_fun (this, &AutomationRegionView::canvas_event), false); + + group->signal_event().connect (sigc::mem_fun (this, &AutomationRegionView::canvas_event), false); + group->raise_to_top(); } void AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/) { _enable_display = false; - + RegionView::init(basic_color, false); compute_colors (basic_color); @@ -58,8 +67,6 @@ AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/) set_height (trackview.current_height()); - _region->StateChanged.connect (mem_fun(*this, &AutomationRegionView::region_changed)); - set_colors (); _enable_display = true; @@ -68,31 +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_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE)); + _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 = 0; - 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,18 +145,26 @@ 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")); + view->session()->begin_reversible_command (_("add automation event")); XMLNode& before = _line->the_list()->get_state(); - _line->the_list()->add (when, 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)); - view->session().set_dirty (); + /* 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 (); } void @@ -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); } @@ -149,34 +192,45 @@ void 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(); + } } -