diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-04 00:32:52 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-04 00:32:52 -0400 |
| commit | aaea166135ace01709f7e0be64f40be80f4107ec (patch) | |
| tree | 0e794ef7a723e4aaf909b841a6816e405b4ceca1 /gtk2_ardour/automation_region_view.cc | |
| parent | 1d8bac08c0c00d44e22c581768a275e1b21a99a7 (diff) | |
initial commit of hand merging, plus getting "ancient" waf script to work correctly
Diffstat (limited to 'gtk2_ardour/automation_region_view.cc')
| -rw-r--r-- | gtk2_ardour/automation_region_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index 5c9fc767df..f48fec43b9 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -52,7 +52,7 @@ AutomationRegionView::AutomationRegionView (ArdourCanvas::Group* create_line(list); } - group->signal_event().connect (sigc::mem_fun (this, &AutomationRegionView::canvas_event), false); + group->Event.connect (sigc::mem_fun (this, &AutomationRegionView::canvas_event)); group->raise_to_top(); } @@ -69,7 +69,7 @@ AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/) compute_colors (basic_color); - reset_width_dependent_items ((double) _region->length() / samples_per_unit); + reset_width_dependent_items ((double) _region->length() / frames_per_pixel); set_height (trackview.current_height()); @@ -114,7 +114,7 @@ AutomationRegionView::canvas_event (GdkEvent* ev) 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 = std::max (y, 0.0); |