part two of allow markup to be used in BoolOption items in an option editor

[ardour.git] / gtk2_ardour / visual_time_axis.h

diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h
index f728a1f4cf81bcafe52ed51015b496b8cf77f859..a692482b49af84fc5f3c734a9af87c6414b3ec1d 100644 (file)
--- a/gtk2_ardour/visual_time_axis.h
+++ b/gtk2_ardour/visual_time_axis.h
@@ -117,7 +117,7 @@ class VisualTimeAxis : public TimeAxisView
 
                /**
                 * Emitted when this Visual Time Axis has been removed
-                * This is different to the GoingAway signal in that this signal
+                * This is different to the CatchDeletion signal in that this signal
                 * is emitted during the deletion of this Time Axis, and not during
                 * the destructor, this allows us to capture the source of the deletion
                 * event
@@ -145,7 +145,7 @@ class VisualTimeAxis : public TimeAxisView
                 * @param sess the current session
                 * @param canvas the parent canvas object
                 */
-               VisualTimeAxis(const std::string & name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
+               VisualTimeAxis(const std::string & name, PublicEditor& ed, ARDOUR::Session* sess, ArdourCanvas::Canvas& canvas) ;
 
 
                //---------------------------------------------------------------------------------------//
@@ -227,10 +227,7 @@ class VisualTimeAxis : public TimeAxisView
                // Handle name entry signals
 
                void name_entry_changed() ;
-               gint name_entry_focus_out_handler(GdkEventFocus*) ;
-               gint name_entry_key_release_handler(GdkEventKey*) ;
-               gint name_entry_button_release_handler(GdkEventButton*) ;
-               gint name_entry_button_press_handler(GdkEventButton*) ;
+               bool name_entry_key_release_handler(GdkEventKey*) ;
 
                //---------------------------------------------------------------------------------------//
                // VisualTimeAxis Widgets
@@ -250,7 +247,7 @@ class VisualTimeAxis : public TimeAxisView
                 *
                 * @todo should VisualTimeAxis handle this?
                 */
-               void show_timestretch (nframes_t start, nframes_t end);
+               void show_timestretch (nframes_t start, nframes_t end, int layers, int layer);
 
                /**
                 * Not handle by purely visual TimeAxis