X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fvisual_time_axis.h;h=a0dfe654de246f2f12d6a57bd46f2d0faf48d36a;hb=a99ea55e6858107ae196440aefdb98785fc58a68;hp=6d9eb5cfb6885bd11e2ae62c0818ed75f5d74e7c;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h
index 6d9eb5cfb6..a0dfe654de 100644
--- a/gtk2_ardour/visual_time_axis.h
+++ b/gtk2_ardour/visual_time_axis.h
@@ -15,22 +15,21 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_visual_time_axis_h__
 #define __ardour_visual_time_axis_h__
 
-#include <gtk--.h>
-#include <gtk-canvas.h>
-#include <gtkmmext/selector.h>
-#include <gtkmmext/popup_selector.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+
+#include <gtkmm2ext/selector.h>
 
 #include "ardour_dialog.h"
 #include "route_ui.h"
 #include "enums.h"
 #include "time_axis_view.h"
-
+#include "canvas.h"
 
 namespace ARDOUR
 {
@@ -42,7 +41,7 @@ class ImageFrameView;
 class ImageFrameTimeAxisView;
 class MarkersTimeAxisView;
 class TimeSelection;
-class AudioRegionSelection;
+class RegionSelection;
 class MarkerTimeAxis;
 class TimeAxisViewStrip;
 
@@ -85,7 +84,7 @@ class VisualTimeAxis : public TimeAxisView
 		 * @param name the new name of this TimeAxis
 		 * @param src the identity of the object that initiated the change
 		 */
-		virtual void set_time_axis_name(std::string name, void* src) ;
+		virtual void set_time_axis_name(const string & name, void* src) ;
 
 		
 		//---------------------------------------------------------------------------------------//
@@ -94,9 +93,9 @@ class VisualTimeAxis : public TimeAxisView
 		/**
 		 * Sets the height of this TrackView to one of the defined TrackHeghts
 		 *
-		 * @param h the TrackHeight value to set
+		 * @param h the number of pixels to set the height to
 		 */
-		virtual void set_height (TrackHeight h);	
+		virtual void set_height (uint32_t);	
 
 		//---------------------------------------------------------------------------------------//
 		// Selection Methods
@@ -105,7 +104,7 @@ class VisualTimeAxis : public TimeAxisView
 		/**
 		 * Not implemented
 		 */
-		virtual void set_selected_regionviews(AudioRegionSelection&) ;
+		virtual void set_selected_regionviews(RegionSelection&) ;
 	
 
 		//---------------------------------------------------------------------------------//
@@ -114,7 +113,7 @@ class VisualTimeAxis : public TimeAxisView
 		/**
 		 * Emitted when we have changed the gui, and what we have shanged
 		 */
-		SigC::Signal2<void,string,void*> gui_changed ;
+		sigc::signal<void,const string &,void*> gui_changed ;
 		
 		/**
 		 * Emitted when this Visual Time Axis has been removed
@@ -123,17 +122,17 @@ class VisualTimeAxis : public TimeAxisView
 		 * the destructor, this allows us to capture the source of the deletion
 		 * event
 		 */
-		SigC::Signal2<void,std::string,void*> VisualTimeAxisRemoved ;
+		sigc::signal<void,const string &,void*> VisualTimeAxisRemoved ;
 		
 		/**
 		 * Emitted when we have changed the name of this TimeAxis
 		 */
-		SigC::Signal3<void,std::string,std::string,void*> NameChanged ;
+		sigc::signal<void,const string &,const string &,void*> NameChanged ;
 
 		/**
 		 * Emitted when this time axis has been selected for removal
 		 */
-		//SigC::Signal2<void,std::string,void*> VisualTimeAxisRemoved ;
+		//sigc::signal<void,std::string,void*> VisualTimeAxisRemoved ;
 
 		//---------------------------------------------------------------------------------------//
 		// Constructor / Desctructor
@@ -146,7 +145,7 @@ class VisualTimeAxis : public TimeAxisView
 		 * @param sess the current session
 		 * @param canvas the parent canvas object
 		 */
-		VisualTimeAxis(std::string name, PublicEditor& ed, ARDOUR::Session& sess, Gtk::Widget* canvas) ;
+		VisualTimeAxis(const string & name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
 		
 		
 		//---------------------------------------------------------------------------------------//
@@ -203,7 +202,7 @@ class VisualTimeAxis : public TimeAxisView
 		 *
 		 * @param c the new TimeAxis color
 		 */
-		void set_time_axis_color(Gdk_Color c) ;
+		void set_time_axis_color(Gdk::Color c) ;
 		
 		
 		//---------------------------------------------------------------------------------------//
@@ -221,12 +220,6 @@ class VisualTimeAxis : public TimeAxisView
 		 *
 		 * @see start_time_axis_rename()
 		 */
-		void finish_time_axis_rename() ;
-
-		/**
-		 * Handle the (re-)displaying of the TimeAxis name label
-		 *
-		 */
 		virtual void label_view() ;
 		
 		
@@ -249,10 +242,6 @@ class VisualTimeAxis : public TimeAxisView
 		/** the name of this TimeAxis object */
 		std::string time_axis_name ;
 		
-		/** used to get a new name for this TimeAxis */
-		ArdourPrompter* name_prompter ;
-		
-		
 		//---------------------------------------------------------------------------------------//
 		// Super class methods not handled by VisualTimeAxis
 		
@@ -261,7 +250,7 @@ class VisualTimeAxis : public TimeAxisView
 		 *
 		 * @todo should VisualTimeAxis handle this?
 		 */
-		void show_timestretch (jack_nframes_t start, jack_nframes_t end);
+		void show_timestretch (nframes_t start, nframes_t end);
 		
 		/**
 		 * Not handle by purely visual TimeAxis