diff options
Diffstat (limited to 'gtk2_ardour/imageframe_time_axis_view.cc')
| -rw-r--r-- | gtk2_ardour/imageframe_time_axis_view.cc | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/gtk2_ardour/imageframe_time_axis_view.cc b/gtk2_ardour/imageframe_time_axis_view.cc index 8df7a91612..b883ae919d 100644 --- a/gtk2_ardour/imageframe_time_axis_view.cc +++ b/gtk2_ardour/imageframe_time_axis_view.cc @@ -27,7 +27,6 @@ #include "imageframe_time_axis_group.h" #include "imageframe_view.h" #include "imageframe_time_axis.h" -#include "canvas-simplerect.h" #include "region_selection.h" #include "public_editor.h" #include "rgb_macros.h" @@ -60,9 +59,9 @@ ImageFrameTimeAxisView::ImageFrameTimeAxisView (ImageFrameTimeAxis& tv) canvas_rect.signal_event().connect (sigc::bind (sigc::mem_fun (_trackview.editor, &PublicEditor::canvas_imageframe_view_event), (ArdourCanvas::Item*) &canvas_rect, &tv)); - _samples_per_unit = _trackview.editor.get_current_zoom() ; + _frames_per_pixel = _trackview.editor.get_current_zoom() ; - _trackview.editor.ZoomChanged.connect (sigc::mem_fun(*this, &ImageFrameTimeAxisView::reset_samples_per_unit)) ; + _trackview.editor.ZoomChanged.connect (sigc::mem_fun(*this, &ImageFrameTimeAxisView::reset_frames_per_pixel)) ; selected_imageframe_group = 0 ; selected_imageframe_view = 0 ; @@ -147,20 +146,19 @@ ImageFrameTimeAxisView::set_position (gdouble x, gdouble y) * @param spu the new samples per canvas unit value */ int -ImageFrameTimeAxisView::set_samples_per_unit (gdouble spp) +ImageFrameTimeAxisView::set_frames_per_pixel (double fpp) { - if (spp < 1.0) { - return(-1) ; + if (fpp < 1.0) { + return -1; } - _samples_per_unit = spp; + _frames_per_pixel = fpp; - for(ImageFrameGroupList::const_iterator citer = imageframe_groups.begin(); citer != imageframe_groups.end(); ++citer) - { - (*citer)->set_item_samples_per_units(spp) ; + for (ImageFrameGroupList::const_iterator citer = imageframe_groups.begin(); citer != imageframe_groups.end(); ++citer) { + (*citer)->set_item_frames_per_pixels (fpp); } - return(0) ; + return 0; } /** @@ -184,9 +182,9 @@ ImageFrameTimeAxisView::apply_color(Gdk::Color& color) * */ void -ImageFrameTimeAxisView::reset_samples_per_unit () +ImageFrameTimeAxisView::reset_frames_per_pixel () { - set_samples_per_unit (_trackview.editor.get_current_zoom()); + set_frames_per_pixel (_trackview.editor.get_current_zoom()); } |