X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_time_axis_group.cc;h=c3efbc96412794b0ae51a85f0efca5d8ec7a2adc;hb=b604dd24139b4c84f20521af91ec4c0cd721bd13;hp=301d0d2fddf6ed1bc2ce8498722825e3c0aeb32c;hpb=73192bc1a7ea55fa1864dc3826845b15c00dd2ec;p=ardour.git

diff --git a/gtk2_ardour/imageframe_time_axis_group.cc b/gtk2_ardour/imageframe_time_axis_group.cc
index 301d0d2fdd..c3efbc9641 100644
--- a/gtk2_ardour/imageframe_time_axis_group.cc
+++ b/gtk2_ardour/imageframe_time_axis_group.cc
@@ -26,7 +26,6 @@
 #include "imageframe_time_axis_view.h"
 #include "imageframe_view.h"
 #include "imageframe_time_axis.h"
-#include "canvas-simplerect.h"
 #include "region_selection.h"
 #include "public_editor.h"
 #include "gui_thread.h"
@@ -52,7 +51,7 @@ ImageFrameTimeAxisGroup::ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav,
 	selected_imageframe_item = 0;
 	is_selected = false;
 
-	ImageFrameView::CatchDeletion.connect (*this, ui_bind (&ImageFrameTimeAxisGroup::remove_imageframe_item, this, _1), gui_context());
+	ImageFrameView::CatchDeletion.connect (*this, boost::bind (&ImageFrameTimeAxisGroup::remove_imageframe_item, this, _1), gui_context());
 }
 
 /**
@@ -148,19 +147,17 @@ ImageFrameTimeAxisGroup::set_item_heights(gdouble h)
  * @param spu the new samples per canvas unit value
  */
 int
-ImageFrameTimeAxisGroup::set_item_samples_per_units(gdouble spp)
+ImageFrameTimeAxisGroup::set_item_samples_per_pixel (double fpp)
 {
-	if(spp < 1.0)
-	{
-		return(-1);
+	if (fpp < 1.0) {
+		return -1;
 	}
 
-	for(ImageFrameViewList::const_iterator citer = imageframe_views.begin(); citer != imageframe_views.end(); ++citer)
-	{
-		(*citer)->set_samples_per_unit(spp);
+	for (ImageFrameViewList::const_iterator citer = imageframe_views.begin(); citer != imageframe_views.end(); ++citer) {
+		(*citer)->set_samples_per_pixel (fpp);
 	}
 
-	return(0);
+	return 0;
 }
 
 /**