X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_view.h;h=db83264e46764061a3efbc383f3da05cb2780713;hb=5a3a2fad4fd1c217a5771caa64efe92a0b305275;hp=9229295343d8ccea51c99f6993e9239cdfb517c8;hpb=60f817b0d2411947c257ecbf0b0376589ea77acd;p=ardour.git

diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h
index 9229295343..db83264e46 100644
--- a/gtk2_ardour/imageframe_view.h
+++ b/gtk2_ardour/imageframe_view.h
@@ -15,18 +15,18 @@
     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__
 #define __gtk_ardour_imageframe_view_h__
 
 #include <string>
-#include <gtkmm.h>
+#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"
@@ -59,14 +59,14 @@ class ImageFrameView : public TimeAxisViewItem
 		 * @param height the width of the origianl rgb_data image data
 		 * @param num_channels the number of color channels within rgb_data
 		 */
-		ImageFrameView(std::string item_id,
-			GnomeCanvasGroup *parent,
+		ImageFrameView(const std::string & item_id,
+			 ArdourCanvas::Group *parent,
 			ImageFrameTimeAxis *tv,
 			ImageFrameTimeAxisGroup* group,
 			double spu,
 		        Gdk::Color& base_color,
-			jack_nframes_t start,
-			jack_nframes_t duration,
+			nframes_t start,
+			nframes_t duration,
 			unsigned char* rgb_data,
 			uint32_t width,
 			uint32_t height,
@@ -90,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
@@ -99,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
@@ -149,7 +149,7 @@ class ImageFrameView : public TimeAxisViewItem
 		 * @param src the identity of the object that initiated the change
 		 * @return the removed marker item
 		 */
-		MarkerView* remove_named_marker_view_item(std::string markId, void* src) ;
+		MarkerView* remove_named_marker_view_item(const std::string & markId, void* src) ;
 		
 		/**
 		 * Removes item from the list of marker views assocaited with this item
@@ -166,7 +166,7 @@ class ImageFrameView : public TimeAxisViewItem
 		 *
 		 * @param markId the id/name of the item to search for
 		 */
-		bool has_marker_view_item(std::string markId) ;
+		bool has_marker_view_item(const std::string & markId) ;
 
 		
 		//---------------------------------------------------------------------------------//
@@ -205,7 +205,7 @@ class ImageFrameView : public TimeAxisViewItem
 		// ------- Our canvas element -----------
 		
 		/** the CanvasImageFrame to display the image */
-		GnomeCanvasItem* imageframe ;
+		ArdourCanvas::ImageFrame* imageframe ;
   		
 } ; /* class ImageFrameView */