Put some up/down buttons to the right of the summary. Might help with #3786.

[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 5bd51f786b3fd65e88c9f1e037f9d339b1dbdbb5..9630b3f19c0b0ccdd66943720933a36b2598b3fb 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -83,12 +83,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        };
 
   public:
-       static uint32_t hLargest;
-       static uint32_t hLarge;
-       static uint32_t hLarger;
-       static uint32_t hNormal;
-       static uint32_t hSmaller;
-       static uint32_t hSmall;
 
        TimeAxisView(ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas);
        virtual ~TimeAxisView ();
@@ -155,29 +149,21 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        virtual void exited () {}
 
        virtual void set_height (uint32_t h);
+       void set_height_enum (Height, bool apply_to_selection = false);
        void reset_height();
 
        std::pair<TimeAxisView*, ARDOUR::layer_t> covers_y_position (double);
 
-       /**
-        * Steps through the defined heights for this TrackView.
-        * Sets bigger to true to step up in size, set to fals eot step smaller.
-        *
-        * @param bigger true if stepping should increase in size, false otherwise
-        */
-       virtual void step_height (bool bigger);
+       virtual void step_height (bool);
 
        virtual ARDOUR::RouteGroup* route_group() const { return 0; }
        virtual boost::shared_ptr<ARDOUR::Playlist> playlist() const { return boost::shared_ptr<ARDOUR::Playlist> (); }
 
-       virtual void show_feature_lines (const ARDOUR::AnalysisFeatureList&);
-       virtual void hide_feature_lines ();
-
        virtual void set_samples_per_unit (double);
        virtual void show_selection (TimeSelection&);
        virtual void hide_selection ();
        virtual void reshow_selection (TimeSelection&);
-       virtual void show_timestretch (nframes_t start, nframes_t end);
+       virtual void show_timestretch (framepos_t start, framepos_t end);
        virtual void hide_timestretch ();
 
        virtual void hide_dependent_views (TimeAxisViewItem&) {}
@@ -185,19 +171,19 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
        /* editing operations */
 
-       virtual bool cut_copy_clear (Selection&, Editing::CutCopyOp) { return false; }
-       virtual bool paste (nframes_t, float /*times*/, Selection&, size_t /*nth*/) { return false; }
+       virtual void cut_copy_clear (Selection&, Editing::CutCopyOp) {}
+       virtual bool paste (ARDOUR::framepos_t, float /*times*/, Selection&, size_t /*nth*/) { return false; }
 
        virtual void set_selected_regionviews (RegionSelection&) {}
        virtual void set_selected_points (PointSelection&) {}
 
-       virtual boost::shared_ptr<ARDOUR::Region> find_next_region (nframes_t /*pos*/, ARDOUR::RegionPoint, int32_t /*dir*/) {
+       virtual boost::shared_ptr<ARDOUR::Region> find_next_region (framepos_t /*pos*/, ARDOUR::RegionPoint, int32_t /*dir*/) {
                return boost::shared_ptr<ARDOUR::Region> ();
        }
 
        void order_selection_trims (ArdourCanvas::Item *item, bool put_start_on_top);
 
-       virtual void get_selectables (nframes_t start, nframes_t end, double top, double bot, std::list<Selectable*>& results);
+       virtual void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable*>&);
        virtual void get_inverted_selectables (Selection&, std::list<Selectable *>& results);
 
        void add_ghost (RegionView*);
@@ -214,14 +200,17 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
        /* call this on the parent */
 
-       virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter /*param*/) { return 0; }
+       virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter) { return 0; }
 
        virtual LayerDisplay layer_display () const { return Overlaid; }
        virtual StreamView* view () const { return 0; }
 
        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:
        /* The Standard LHS Controls */
@@ -277,26 +266,9 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
         */
        virtual bool handle_display_menu_map_event (GdkEventAny * /*ev*/) { return false; }
 
-       /** Build the standard LHS control size menu for the default heights options.
-        */
-       virtual void build_size_menu();
-
-       /** Displays the standard LHS controls size menu for the track heights
-        *
-        * @param when the popup activation time
-        */
-       void popup_size_menu(guint32 when);
-
-       /** Handle the size option of our main menu.
-        *
-        * @param ev the event
-        */
-       gint size_click(GdkEventButton *ev);
-
        /* The standard LHS Track control popup-menus */
 
        Gtk::Menu *display_menu;
-       Gtk::Menu *size_menu;
 
        Gtk::Label    name_label;
 
@@ -327,18 +299,14 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        bool in_destructor;
        NamePackingBits name_packing;
 
-       static void compute_controls_size_info ();
-       static bool need_size_info;
-
        void set_heights (uint32_t h);
        void color_handler ();
 
-       std::list<ArdourCanvas::SimpleLine*> feature_lines;
-       ARDOUR::AnalysisFeatureList analysis_features;
-       void reshow_feature_lines ();
-
        void conditionally_add_to_selection ();
 
+       void build_size_menu ();
+       Gtk::Menu* _size_menu;
+
        ArdourCanvas::Group* _canvas_display;
        double _y_position;
        PublicEditor& _editor;
@@ -352,6 +320,10 @@ private:
        double _resize_drag_start;
        ArdourCanvas::Group* _ghost_group;
 
+       void compute_heights ();
+       static uint32_t extra_height;
+       static uint32_t smaller_height;
+
        static int const _max_order;
 
 }; /* class TimeAxisView */