make MIDI rubber band selects use the correct canvas item so that event processing...

[ardour.git] / gtk2_ardour / imageframe_view.h

diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h
index 281e09ebb8bb78f5764c4346713239fafb12afe8..88641a4b179146790b2a5d6b605867be36cf87f9 100644 (file)
--- a/gtk2_ardour/imageframe_view.h
+++ b/gtk2_ardour/imageframe_view.h
@@ -22,11 +22,9 @@
 
 #include <string>
 #include <gdkmm/color.h>
-#include <libgnomecanvas/libgnomecanvas.h>
 #include <sigc++/signal.h>
 #include <list>
 
-#include "canvas.h"
 #include "enums.h"
 #include "time_axis_view_item.h"
 #include "marker_view.h"
@@ -65,8 +63,8 @@ class ImageFrameView : public TimeAxisViewItem
                        ImageFrameTimeAxisGroup* group,
                        double spu,
                        Gdk::Color& base_color,
-                       nframes_t start,
-                       nframes_t duration,
+                       framepos_t start,
+                       framecnt_t duration,
                        unsigned char* rgb_data,
                        uint32_t width,
                        uint32_t height,
@@ -78,7 +76,7 @@ class ImageFrameView : public TimeAxisViewItem
                 */
                ~ImageFrameView() ;
 
-               static sigc::signal<void,ImageFrameView*> GoingAway;
+               static PBD::Signal1<void,ImageFrameView*> CatchDeletion;
 
                //---------------------------------------------------------------------------------------//
                // Position and duration Accessors/Mutators
@@ -90,7 +88,7 @@ class ImageFrameView : public TimeAxisViewItem
                 * @param src the identity of the object that initiated the change
                 * @return true if the position change was a success, false otherwise
                 */
-               virtual bool set_position(nframes64_t pos, void* src, double* delta = 0) ;
+               virtual bool set_position(framepos_t pos, void* src, double* delta = 0) ;
 
                /**
                 * Sets the duration of this item
@@ -99,7 +97,7 @@ class ImageFrameView : public TimeAxisViewItem
                 * @param src the identity of the object that initiated the change
                 * @return true if the duration change was succesful, false otherwise
                 */
-               virtual bool set_duration(nframes64_t dur, void* src) ;
+               virtual bool set_duration(framepos_t dur, void* src) ;
 
                //---------------------------------------------------------------------------------------//
                // Parent Component Methods