X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvisual_time_axis.h;h=6d1396bc54a2e1b6c70fa398ca554c726e412ee5;hb=430bc18ba29ca4cb0d60fc9da53c88661b690920;hp=1442b011aa1e8ff86e1afc72424432c9b84f727e;hpb=170d6b24cec9b7fe51d74b75544a097948e03082;p=ardour.git

diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h
index 1442b011aa..6d1396bc54 100644
--- a/gtk2_ardour/visual_time_axis.h
+++ b/gtk2_ardour/visual_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_visual_time_axis_h__
@@ -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(ARDOUR::stringcr_t name, void* src) ;
+		virtual void set_time_axis_name(const string & name, void* src) ;
 
 		
 		//---------------------------------------------------------------------------------------//
@@ -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::signal<void,ARDOUR::stringcr_t,void*> gui_changed ;
+		sigc::signal<void,const string &,void*> gui_changed ;
 		
 		/**
 		 * Emitted when this Visual Time Axis has been removed
@@ -123,12 +122,12 @@ class VisualTimeAxis : public TimeAxisView
 		 * the destructor, this allows us to capture the source of the deletion
 		 * event
 		 */
-		sigc::signal<void,ARDOUR::stringcr_t,void*> VisualTimeAxisRemoved ;
+		sigc::signal<void,const string &,void*> VisualTimeAxisRemoved ;
 		
 		/**
 		 * Emitted when we have changed the name of this TimeAxis
 		 */
-		sigc::signal<void,ARDOUR::stringcr_t,ARDOUR::stringcr_t,void*> NameChanged ;
+		sigc::signal<void,const string &,const string &,void*> NameChanged ;
 
 		/**
 		 * Emitted when this time axis has been selected for removal
@@ -146,7 +145,7 @@ class VisualTimeAxis : public TimeAxisView
 		 * @param sess the current session
 		 * @param canvas the parent canvas object
 		 */
-		VisualTimeAxis(ARDOUR::stringcr_t name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
+		VisualTimeAxis(const string & name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
 		
 		
 		//---------------------------------------------------------------------------------------//
@@ -243,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
 		
@@ -255,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