Make smf_track_get_next_event gracefully handle empty tracks.

[ardour.git] / gtk2_ardour / imageframe_time_axis.cc

diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc
index 018fae68959e169c849bd65171cd050d64cfaa09..735855421fd347c0c6de3569741efbe992725228 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis.cc
+++ b/gtk2_ardour/imageframe_time_axis.cc
@@ -81,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) ;
 }
 
 /**
@@ -107,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 ;
 }
 
 //---------------------------------------------------------------------------------------//
@@ -133,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) ;