clean up patch change/sysex headers.

[ardour.git] / gtk2_ardour / time_axis_view.h

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index baeeb2a92abed5d18558bf72cc7d63381cacb1ce..f33379e4d63bc2660150b1d5a69f11d24721bf49 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -39,7 +39,9 @@
 #include "pbd/signals.h"
 
 #include "ardour/types.h"
+#include "ardour/presentation_info.h"
 #include "ardour/region.h"
+
 #include "evoral/Parameter.hpp"
 
 #include "canvas/line.h"
@@ -55,6 +57,7 @@ namespace ARDOUR {
        class Session;
        class RouteGroup;
        class Playlist;
+       class Stripable;
 }
 
 namespace Gtk {
@@ -135,6 +138,8 @@ class TimeAxisView : public virtual AxisView
 
        void set_selected (bool);
 
+       virtual bool selectable() const { return true; }
+
        /**
         * potential handler for entered events
         */
@@ -180,7 +185,8 @@ class TimeAxisView : public virtual AxisView
         */
        virtual bool paste (ARDOUR::framepos_t pos,
                            const Selection&   selection,
-                           PasteContext&      ctx) { return false; }
+                           PasteContext&      ctx,
+                           const int32_t sub_num) { return false; }
 
        virtual void set_selected_regionviews (RegionSelection&) {}
        virtual void set_selected_points (PointSelection&) {}
@@ -213,8 +219,6 @@ class TimeAxisView : public virtual AxisView
        typedef std::vector<boost::shared_ptr<TimeAxisView> > Children;
        Children get_child_list ();
 
-       SelectionRect* get_selection_rect(uint32_t id);
-
        static uint32_t preset_height (Height);
 
        protected:
@@ -229,9 +233,7 @@ class TimeAxisView : public virtual AxisView
        Gtk::VBox              time_axis_vbox;
        Gtk::HBox              time_axis_hbox;
        Gtk::Frame             time_axis_frame;
-       Gtk::HBox              name_hbox;
        Gtk::HBox              top_hbox;
-       Gtk::Label             name_label;
        Gtk::Fixed             scroomer_placeholder;
        bool                  _name_editing;
        uint32_t               height;  /* in canvas units */
@@ -254,17 +256,12 @@ class TimeAxisView : public virtual AxisView
 
        virtual bool can_edit_name() const;
 
-       bool name_entry_key_release (GdkEventKey *ev);
-       bool name_entry_key_press (GdkEventKey *ev);
-       bool name_entry_focus_out (GdkEventFocus *ev);
-
-       Gtk::Entry* name_entry;
        void begin_name_edit ();
-       void end_name_edit (int);
+       void end_name_edit (std::string, int);
 
        /* derived classes can override these */
 
-       virtual void name_entry_changed ();
+       virtual bool name_entry_changed (std::string const&);
 
        /** Handle mouse relaese on our LHS control name ebox.
         *
@@ -307,7 +304,7 @@ class TimeAxisView : public virtual AxisView
 
        void build_size_menu ();
 
-private:
+  private:
        Gtk::VBox*            control_parent;
        int                  _order;
        uint32_t             _effective_height;
@@ -321,6 +318,8 @@ private:
        static uint32_t extra_height;
        static int const _max_order;
 
+       SelectionRect* get_selection_rect(uint32_t id);
+
        void compute_heights ();
        bool maybe_set_cursor (int y);