Maybe fix assertion crash.

[ardour.git] / gtk2_ardour / imageframe_time_axis_group.h

diff --git a/gtk2_ardour/imageframe_time_axis_group.h b/gtk2_ardour/imageframe_time_axis_group.h
index a22adb666031f4514ce44e28770124c30bab31a1..147e6b52951efd211316e8baa348d33cef707059 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis_group.h
+++ b/gtk2_ardour/imageframe_time_axis_group.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 __ardour_imageframe_time_axis_group_h__
@@ -28,7 +27,7 @@
 
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <jack/jack.h>
-#include <ardour/types.h>
+#include "ardour/types.h"
 #include "imageframe_time_axis_view.h"
 
 class PublicEditor ;
@@ -104,7 +103,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                 *
                 * @param height the new height
                 */
-               int set_item_heights(gdouble height) ;
+               int set_item_heights(gdouble) ;
                
                /**
                 * Sets the current samples per unit.
@@ -119,7 +118,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                 *
                 * @param color the new base color
                 */
-               void apply_item_color(Gdk::Color& color) ;
+               void apply_item_color(Gdk::Color&) ;
                
                
                //---------------------------------------------------------------------------------------//
@@ -130,6 +129,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                 * the new ImageFrameView is returned
                 *
                 * @param item_id the unique id of the new item
+                * @param image_id the id/name of the image data we are usin
                 * @param start the position the new item should be placed upon the time line
                 * @param duration the duration the new item should be placed upon the timeline
                 * @param rgb_data the rgb data of the image
@@ -138,8 +138,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                 * @param num_channels the number of channles within the rgb_data
                 * @param src the identity of the object that initiated the change
                 */
-               ImageFrameView* add_imageframe_item(const string & item_id, jack_nframes_t start, jack_nframes_t duration,
-                       unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src) ;
+               ImageFrameView* add_imageframe_item(const string & item_id, nframes_t start, nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src) ;
                
                /**
                 * Returns the named ImageFrameView or 0 if the named view does not exist on this view helper
@@ -171,9 +170,8 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                 * if ifv is not upon this TimeAxis, this method takes no action
                 *
                 * @param ifv the ImageFrameView to remove
-                * @param src the identity of the object that initiated the change
                 */
-               void remove_imageframe_item(ImageFrameView* ifv, void* src) ;
+               void remove_imageframe_item(ImageFrameView*, void* src) ;
                
        
                //---------------------------------------------------------------------------------------//