use ustring more; handle embedding of "paired" files as per mantis #1362

[ardour.git] / gtk2_ardour / imageframe_time_axis.h

diff --git a/gtk2_ardour/imageframe_time_axis.h b/gtk2_ardour/imageframe_time_axis.h
index 3b64e32f96ed6b2d3fe9633b9548416fe0a5f4cd..cefd0c5d097f44333d42c716e4958e1b5a8a852d 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis.h
+++ b/gtk2_ardour/imageframe_time_axis.h
@@ -23,7 +23,7 @@
 
 #include <list>
 
-#include <libgnomecanvas/libgnomecanvas.h>
+//#include <libgnomecanvas.h>
 
 #include "ardour_dialog.h"
 #include "enums.h"
@@ -63,7 +63,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
                 * @param sess the current session
                 * @param canvas the parent canvas item
                 */
-               ImageFrameTimeAxis(std::string track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
+               ImageFrameTimeAxis(const string & track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
                
                /**
                 * Destructor
@@ -127,7 +127,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
                 * @param track_id the track_id of the MarkerTimeAxis to search for
                 * @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
                 */
-               MarkerTimeAxis* get_named_marker_time_axis(std::string track_id) ;
+               MarkerTimeAxis* get_named_marker_time_axis(const string & track_id) ;
                
                /**
                 * Removes the named markerTimeAxis from those associated with this ImageFrameTimeAxis
@@ -136,7 +136,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
                 * @param src the identity of the object that initiated the change
                 * @return the removed MarkerTimeAxis
                 */
-               MarkerTimeAxis* remove_named_marker_time_axis(std::string track_id, void* src) ;
+               MarkerTimeAxis* remove_named_marker_time_axis(const string & track_id, void* src) ;
                
                /**
                 * Removes tav from the list of MarkerTimaAxis associated with this ImageFrameTimeAxis