X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_time_axis.h;h=7cbed6a394242734053242c7de0a2ccacdc4d17f;hb=deb2033a346d5a4638b9ee4e8eba66cd1b9a54e4;hp=cfb9ebc3b720cbcf6ad6d77f8e0031cd722a8e0b;hpb=170d6b24cec9b7fe51d74b75544a097948e03082;p=ardour.git

diff --git a/gtk2_ardour/imageframe_time_axis.h b/gtk2_ardour/imageframe_time_axis.h
index cfb9ebc3b7..7cbed6a394 100644
--- a/gtk2_ardour/imageframe_time_axis.h
+++ b/gtk2_ardour/imageframe_time_axis.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_h__
@@ -23,7 +22,7 @@
 
 #include <list>
 
-#include <libgnomecanvas/libgnomecanvas.h>
+//#include <libgnomecanvas.h>
 
 #include "ardour_dialog.h"
 #include "enums.h"
@@ -63,7 +62,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
 		 * @param sess the current session
 		 * @param canvas the parent canvas item
 		 */
-		ImageFrameTimeAxis(ARDOUR::stringcr_t track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
+		ImageFrameTimeAxis(const string & track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
 		
 		/**
 		 * Destructor
@@ -77,9 +76,9 @@ class ImageFrameTimeAxis : public VisualTimeAxis
 		/**
 		 * Sets the height of this TrackView to one of ths TrackHeghts
 		 *
-		 * @param h the TrackHeight value to set
+		 * @param h the number of pixels to set the height too
 		 */	
-		virtual void set_height(TimeAxisView::TrackHeight) ;
+		virtual void set_height(uint32_t h) ;
 		
 		/**
 		 * Sets the number of samples per unit that are used.
@@ -127,7 +126,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
 		 * @param track_id the track_id of the MarkerTimeAxis to search for
 		 * @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
 		 */
-		MarkerTimeAxis* get_named_marker_time_axis(ARDOUR::stringcr_t track_id) ;
+		MarkerTimeAxis* get_named_marker_time_axis(const string & track_id) ;
 		
 		/**
 		 * Removes the named markerTimeAxis from those associated with this ImageFrameTimeAxis
@@ -136,7 +135,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
 		 * @param src the identity of the object that initiated the change
 		 * @return the removed MarkerTimeAxis
 		 */
-		MarkerTimeAxis* remove_named_marker_time_axis(ARDOUR::stringcr_t track_id, void* src) ;
+		MarkerTimeAxis* remove_named_marker_time_axis(const string & track_id, void* src) ;
 		
 		/**
 		 * Removes tav from the list of MarkerTimaAxis associated with this ImageFrameTimeAxis