ardour/livetrax
13
0
Fork 0
Code

Fix, or at least improve, automation line drawing behaviour with MIDI regions.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7137 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-05-22 00:56:39 +00:00
parent 22a2c82045
commit 8d048aa472
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk2_ardour/automation_region_view.cc
View File

@ -85,16 +85,24 @@ bool
AutomationRegionView::canvas_event(GdkEvent* ev) AutomationRegionView::canvas_event(GdkEvent* ev)
{ {
if (ev->type == GDK_BUTTON_RELEASE) { if (ev->type == GDK_BUTTON_RELEASE) {
const nframes_t when = trackview.editor().pixel_to_frame((nframes_t)ev->button.x)
- _region->position(); double x = ev->button.x;
add_automation_event(ev, when, ev->button.y); double y = ev->button.y;
/* convert to item coordinates in the time axis view */
automation_view()->canvas_display()->w2i (x, y);
add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position(), y);
} }
return false; return false;
} }
/** @param when Position in frames, where 0 is the start of the region.
* @param y y position, relative to our TimeAxisView.
*/
void void
AutomationRegionView::add_automation_event (GdkEvent* /*event*/, nframes_t when, double y) AutomationRegionView::add_automation_event (GdkEvent *, nframes_t when, double y)
{ {
if (!_line) { if (!_line) {
boost::shared_ptr<Evoral::Control> c = _region->control(_parameter, true); boost::shared_ptr<Evoral::Control> c = _region->control(_parameter, true);
@ -105,11 +113,8 @@ AutomationRegionView::add_automation_event (GdkEvent* /*event*/, nframes_t when,
} }
assert(_line); assert(_line);
double x = when; AutomationTimeAxisView* const view = automation_view ();
AutomationTimeAxisView* const view = automation_view();
view->canvas_display()->w2i (x, y);
/* compute vertical fractional position */ /* compute vertical fractional position */
const double h = trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2; const double h = trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2;
@ -117,12 +122,13 @@ AutomationRegionView::add_automation_event (GdkEvent* /*event*/, nframes_t when,
/* map using line */ /* 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(); 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(); XMLNode& after = _line->the_list()->get_state();
view->session()->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>( view->session()->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(