X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_time_axis.cc;h=ae288ec9ab28738828a9ebd4f61a0b0a8eef3fba;hb=02f714b8c9052e5ada0431df0be00f684294739d;hp=f15c8d79e870be384f96ff90de4ab40f8f674e80;hpb=3733c995c5269756ca5941a9db50c6a965787508;p=ardour.git

diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc
index f15c8d79e8..ae288ec9ab 100644
--- a/gtk2_ardour/imageframe_time_axis.cc
+++ b/gtk2_ardour/imageframe_time_axis.cc
@@ -47,6 +47,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace sigc;
 using namespace Gtk;
 
@@ -58,21 +59,18 @@ using namespace Gtk;
  * @param sess the current session
  * @param canvas the parent canvas item
  */
-ImageFrameTimeAxis::ImageFrameTimeAxis(std::string track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas)
+ImageFrameTimeAxis::ImageFrameTimeAxis(const string & track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas)
 	: AxisView(sess),
 	  VisualTimeAxis(track_id, ed, sess, canvas)
 {
 	_color = unique_random_color() ;
 	
-	//GTK2FIX -- how to get the group? is the canvas display really a group?
-	//selection_group = gnome_canvas_item_new (GNOME_CANVAS_GROUP(canvas_display), gnome_canvas_group_get_type (), NULL) ;
 	selection_group = new ArdourCanvas::Group (*canvas_display);
 	selection_group->hide();
 
 	// intialize our data items
 	_marked_for_display = true;
 	y_position = -1 ;
-	name_prompter = 0 ;
 
 	/* create our new image frame view */
 	view = new ImageFrameTimeAxisView(*this) ;
@@ -351,7 +349,7 @@ ImageFrameTimeAxis::add_marker_time_axis(MarkerTimeAxis* marker_track, void* src
  * @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
  */
 MarkerTimeAxis*
-ImageFrameTimeAxis::get_named_marker_time_axis(std::string track_id)
+ImageFrameTimeAxis::get_named_marker_time_axis(const string & track_id)
 {
 	MarkerTimeAxis* mta =  0 ;
 	
@@ -374,7 +372,7 @@ ImageFrameTimeAxis::get_named_marker_time_axis(std::string track_id)
  * @return the removed MarkerTimeAxis
  */
 MarkerTimeAxis*
-ImageFrameTimeAxis::remove_named_marker_time_axis(std::string track_id, void* src)
+ImageFrameTimeAxis::remove_named_marker_time_axis(const string & track_id, void* src)
 {
 	MarkerTimeAxis* mta = 0 ;