X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_time_axis.cc;h=735855421fd347c0c6de3569741efbe992725228;hb=3705a2d6307cf443acbf8419b0e0f560591f2016;hp=ae288ec9ab28738828a9ebd4f61a0b0a8eef3fba;hpb=fe13d08874f08b723df53116e5655c3d229a657e;p=ardour.git

diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc
index ae288ec9ab..735855421f 100644
--- a/gtk2_ardour/imageframe_time_axis.cc
+++ b/gtk2_ardour/imageframe_time_axis.cc
@@ -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$
 */
 
 #include <string>
@@ -82,7 +81,7 @@ ImageFrameTimeAxis::ImageFrameTimeAxis(const string & track_id, PublicEditor& ed
 	label_view() ;
 		
 	// set the initial height of this time axis
-	set_height(Normal) ;
+	set_height(hNormal) ;
 }
 
 /**
@@ -108,24 +107,15 @@ ImageFrameTimeAxis::~ImageFrameTimeAxis ()
 		iter = next ;
 	}
 	
-	if(image_action_menu)
-	{
-		delete image_action_menu ;
-		image_action_menu = 0 ;
-	}
+	delete image_action_menu ;
+	image_action_menu = 0 ;
 	
-	if (selection_group)
-	{
-		delete selection_group;
-		selection_group = 0 ;
-	}
+	delete selection_group;
+	selection_group = 0 ;
 	
 	// Destroy our Axis View helper
-	if(view)
-	{
-		delete view ;
-		view = 0 ;
-	}
+	delete view ;
+	view = 0 ;
 }
 
 //---------------------------------------------------------------------------------------//
@@ -134,10 +124,10 @@ ImageFrameTimeAxis::~ImageFrameTimeAxis ()
 /**
  * Sets the height of this TrackView to one of ths TrackHeghts
  *
- * @param h the TrackHeight value to set
+ * @param h 
  */
 void
-ImageFrameTimeAxis::set_height (TrackHeight h)
+ImageFrameTimeAxis::set_height (uint32_t h)
 {
 	VisualTimeAxis::set_height(h) ;