summaryrefslogtreecommitdiff
path: root/gtk2_ardour/imageframe_time_axis.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-04-04 00:32:52 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-04-04 00:32:52 -0400
commitaaea166135ace01709f7e0be64f40be80f4107ec (patch)
tree0e794ef7a723e4aaf909b841a6816e405b4ceca1 /gtk2_ardour/imageframe_time_axis.h
parent1d8bac08c0c00d44e22c581768a275e1b21a99a7 (diff)
initial commit of hand merging, plus getting "ancient" waf script to work correctly
Diffstat (limited to 'gtk2_ardour/imageframe_time_axis.h')
-rw-r--r--gtk2_ardour/imageframe_time_axis.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/gtk2_ardour/imageframe_time_axis.h b/gtk2_ardour/imageframe_time_axis.h
index 52c2f73e67..6866261a80 100644
--- a/gtk2_ardour/imageframe_time_axis.h
+++ b/gtk2_ardour/imageframe_time_axis.h
@@ -22,12 +22,10 @@
#include <list>
-//#include <libgnomecanvas.h>
#include "ardour_dialog.h"
#include "enums.h"
#include "time_axis_view.h"
-#include "canvas.h"
#include "visual_time_axis.h"
namespace ARDOUR
@@ -80,13 +78,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
*/
virtual void set_height(uint32_t h) ;
- /**
- * Sets the number of samples per unit that are used.
- * This is used to determine the siezes of items upon this time axis
- *
- * @param spu the number of samples per unit
- */
- virtual void set_samples_per_unit(double spu) ;
+ virtual void set_frames_per_pixel (double);
/**
* Returns the available height for images to be drawn onto