some fixes/improvements for track selection; add upload target to manual makefile...

[ardour.git] / gtk2_ardour / imageframe_view.h

diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h
index c16b196c73036d5722dfee265dd32d6d9fec6181..71d9268fef358508bef3e69cc530d57df9c48993 100644 (file)
--- a/gtk2_ardour/imageframe_view.h
+++ b/gtk2_ardour/imageframe_view.h
@@ -60,14 +60,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(ARDOUR::stringcr_t item_id,
+               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,
@@ -91,7 +91,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
@@ -100,7 +100,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
@@ -150,7 +150,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(ARDOUR::stringcr_t 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
@@ -167,7 +167,7 @@ class ImageFrameView : public TimeAxisViewItem
                 *
                 * @param markId the id/name of the item to search for
                 */
-               bool has_marker_view_item(ARDOUR::stringcr_t markId) ;
+               bool has_marker_view_item(const std::string & markId) ;
 
                
                //---------------------------------------------------------------------------------//