diff options
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index d9b96066d3..904968b9ab 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -232,7 +232,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt) } - _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_frames_per_pixel)); + _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_pixel)); _editor.HorizontalPositionChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::horizontal_position_changed)); ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler)); @@ -890,9 +890,9 @@ RouteTimeAxisView::route_color_changed () } void -RouteTimeAxisView::reset_frames_per_pixel () +RouteTimeAxisView::reset_samples_per_pixel () { - set_frames_per_pixel (_editor.get_current_zoom()); + set_samples_per_pixel (_editor.get_current_zoom()); } void @@ -904,7 +904,7 @@ RouteTimeAxisView::horizontal_position_changed () } void -RouteTimeAxisView::set_frames_per_pixel (double fpp) +RouteTimeAxisView::set_samples_per_pixel (double fpp) { double speed = 1.0; @@ -913,10 +913,10 @@ RouteTimeAxisView::set_frames_per_pixel (double fpp) } if (_view) { - _view->set_frames_per_pixel (fpp * speed); + _view->set_samples_per_pixel (fpp * speed); } - TimeAxisView::set_frames_per_pixel (fpp * speed); + TimeAxisView::set_samples_per_pixel (fpp * speed); } void @@ -1134,7 +1134,7 @@ RouteTimeAxisView::clear_playlist () void RouteTimeAxisView::speed_changed () { - Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&RouteTimeAxisView::reset_frames_per_pixel, this)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&RouteTimeAxisView::reset_samples_per_pixel, this)); } void |