Modified patch from drmoore to fix mantis 2808 (drag rectangle left behind after...

[ardour.git] / gtk2_ardour / imageframe_view.h

diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h
index 2e67ff1c6cf2e9699cbe5713c95232f04497f6d5..db83264e46764061a3efbc383f3da05cb2780713 100644 (file)
--- a/gtk2_ardour/imageframe_view.h
+++ b/gtk2_ardour/imageframe_view.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtk_ardour_imageframe_view_h__
@@ -53,7 +52,6 @@ class ImageFrameView : public TimeAxisViewItem
                 * @param tv the time axis view that this item is to be placed upon
                 * @param group the ImageFrameGroup that this item is a member of
                 * @param spu the current samples per canvas unit
-                * @param base_color the base color of this item
                 * @param start the start frame ogf this item
                 * @param duration the duration of this item
                 * @param rgb_data the rgb data of the image
@@ -62,13 +60,13 @@ class ImageFrameView : public TimeAxisViewItem
                 * @param num_channels the number of color channels within rgb_data
                 */
                ImageFrameView(const std::string & item_id,
-                       ArdourCanvas::Group *parent,
+                        ArdourCanvas::Group *parent,
                        ImageFrameTimeAxis *tv,
                        ImageFrameTimeAxisGroup* group,
                        double spu,
-                       Gdk::Color& base_color,
-                       jack_nframes_t start,
-                       jack_nframes_t duration,
+                       Gdk::Color& base_color,
+                       nframes_t start,
+                       nframes_t duration,
                        unsigned char* rgb_data,
                        uint32_t width,
                        uint32_t height,
@@ -92,7 +90,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(jack_nframes_t pos, void* src) ;
+               virtual bool set_position(nframes_t pos, void* src, double* delta = 0) ;
                
                /**
                 * Sets the duration of this item
@@ -101,7 +99,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(jack_nframes_t dur, void* src) ;
+               virtual bool set_duration(nframes_t dur, void* src) ;
                
                //---------------------------------------------------------------------------------------//
                // Parent Component Methods