X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker_time_axis.h;h=05b95bddaaf111f7534a15f68ef157a163aed768;hb=41b8a010da914eace2e300ef0a3c0800ff6183e1;hp=a48eec7d5ac40901b39f89284dfb5dd5670af551;hpb=f16caf535c3e7a697c7464ecc153bce1b341d0ef;p=ardour.git

diff --git a/gtk2_ardour/marker_time_axis.h b/gtk2_ardour/marker_time_axis.h
index a48eec7d5a..05b95bddaa 100644
--- a/gtk2_ardour/marker_time_axis.h
+++ b/gtk2_ardour/marker_time_axis.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,14 +15,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_marker_time_axis_h__
 #define __ardour_marker_time_axis_h__
 
 #include <string>
-#include <gtkmm.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 
 #include "ardour_dialog.h"
@@ -35,6 +33,9 @@
 namespace ARDOUR {
 	class Session;
 }
+namespace ARDOUR {
+	class Menu;
+}
 
 class PublicEditor;
 class ImageFrameView ;
@@ -54,7 +55,7 @@ class MarkerTimeAxis : public VisualTimeAxis
 	public:
 		//---------------------------------------------------------------------------------------//
 		// Constructor / Desctructor
-		
+
 		/**
 		 * Constructs a new MarkerTimeAxis
 		 *
@@ -64,25 +65,25 @@ class MarkerTimeAxis : public VisualTimeAxis
 		 * @param name the name/id of this time axis
 		 * @param tav the associated track view that this MarkerTimeAxis is marking up
 		 */
-		MarkerTimeAxis(PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas, std::string name, TimeAxisView* tav) ;
-		
+		MarkerTimeAxis(PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas, const std::string & name, TimeAxisView* tav) ;
+
 		/**
 		 * Destructor
 		 * Responsible for destroying any marker items upon this time axis
 		 */
 		virtual ~MarkerTimeAxis() ;
-		
-		
+
+
 		//---------------------------------------------------------------------------------------//
 		// ui methods & data
-		
+
 		/**
 		 * Sets the height of this TrackView to one of the defined TrackHeights
 		 *
-		 * @param h the TrackHeight value to set
+		 * @param h the number of pixels to set the height to
 		 */
-		virtual void set_height(TimeAxisView::TrackHeight h) ;
-		
+		virtual void set_height(uint32_t h) ;
+
 		/**
 		 * Sets the number of samples per unit that are used.
 		 * This is used to determine the sizes of items upon this time axis
@@ -90,8 +91,8 @@ class MarkerTimeAxis : public VisualTimeAxis
 		 * @param spu the number of samples per unit
 		 */
 		virtual void set_samples_per_unit(double spu) ;
-		
-		
+
+
 		/**
 		 * Show the popup edit menu
 		 *
@@ -101,8 +102,8 @@ class MarkerTimeAxis : public VisualTimeAxis
 		 * @param with_item true if an item has been selected upon the time axis, used to set context menu
 		 */
 		void popup_marker_time_axis_edit_menu(int button, int32_t time, MarkerView* clicked_mv, bool with_item) ;
-		
-		
+
+
 		//---------------------------------------------------------------------------------------//
 		// Parent/Child helper object accessors
 
@@ -112,7 +113,7 @@ class MarkerTimeAxis : public VisualTimeAxis
 		 * @return the view helper of this TimeAxis
 		 */
 		MarkerTimeAxisView* get_view() ;
-		
+
 		/**
 		 * Returns the TimeAxisView that this markerTimeAxis is marking up
 		 *
@@ -122,18 +123,18 @@ class MarkerTimeAxis : public VisualTimeAxis
 
 
 	private:
-	
+
 		/**
 		 * convenience method to select a new track color and apply it to the view and view items
 		 *
 		 */
 		void select_track_color() ;
-		
+
 		/**
 		 * Handles the building of the popup menu
 		 */
 		virtual void build_display_menu() ;
-		
+
 		/**
 		 * handles the building of the MarkerView sub menu
 		 */
@@ -141,17 +142,17 @@ class MarkerTimeAxis : public VisualTimeAxis
 
 		/** The associated TimeAxis that this MarkerTimeAxis is marking up */
 		TimeAxisView* marked_time_axis ;
-		
+
 		/** Our time axis view helper */
 		MarkerTimeAxisView *view ;
 
-		/** the popup menu available by clicking upon this time axis */		
+		/** the popup menu available by clicking upon this time axis */
 		Gtk::Menu *marker_menu ;
-		
+
 		/** specialized sub menu available when clicking upon and item upon this time axis */
 		Gtk::Menu *marker_item_menu ;
-		
-		
+
+
 } ; /* class MarkerTimeAxis */
 
 #endif /* __ardour_imageframe_time_axis_h__ */