make "New Session" open NSD on the right page

[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 266cb4405d61c8d2b032d6755f3d2b975b3805c0..4b3bf0c857faaff59dd80cf61a77907601bdecec 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis.h
+++ b/gtk2_ardour/imageframe_time_axis.h
@@ -15,15 +15,14 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_imageframe_time_axis_h__
 #define __ardour_imageframe_time_axis_h__
 
 #include <list>
-#include <gtkmm.h>
-#include <libgnomecanvas/libgnomecanvas.h>
+
+//#include <libgnomecanvas.h>
 
 #include "ardour_dialog.h"
 #include "enums.h"
@@ -35,6 +34,9 @@ namespace ARDOUR
 {
        class Session ;
 }
+namespace Gtk {
+       class Menu;
+}
 
 class PublicEditor ;
 class ImageFrameView ;
@@ -60,7 +62,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
@@ -124,7 +126,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
@@ -133,7 +135,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