Make split region work across edit groups even if the region is not selected when...

[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 eff2e5fb6a53647f58c31c7881c416f75bb32cad..baf8327e672d03128edd86548667aa0b698297a9 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_gtk_time_axis_h__
@@ -31,15 +30,17 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
 
+#include <gtkmm2ext/focus_entry.h>
+
 #include <ardour/types.h>
 #include <ardour/region.h>
+#include <ardour/parameter.h>
 
 #include "prompter.h"
 #include "axis_view.h"
 #include "enums.h"
 #include "editing.h"
 #include "canvas.h"
-#include "color.h"
 
 namespace ARDOUR {
        class Session;
@@ -118,7 +119,7 @@ class TimeAxisView : public virtual AxisView
        Gtk::VBox     controls_vbox;
        Gtk::HBox     name_hbox;
        Gtk::Frame    name_frame;
-       Gtk::Entry    name_entry;
+       Gtkmm2ext::FocusEntry name_entry;
        
        void hide_name_label ();
        void hide_name_entry ();
@@ -152,7 +153,16 @@ class TimeAxisView : public virtual AxisView
        virtual void set_height (TrackHeight h);
        void reset_height();
 
-       /** Steps through the defined heights for this TrackView.
+       /**
+        * Returns a TimeAxisView* if this object covers y, or one of its children does.
+        *  If the covering object is a child axis, then the child is returned.
+        * Returns 0 otherwise.
+        */
+
+       TimeAxisView* covers_y_position (double y);
+
+       /**
+        * 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
@@ -160,13 +170,13 @@ class TimeAxisView : public virtual AxisView
        virtual void step_height (bool bigger);
 
        virtual ARDOUR::RouteGroup* edit_group() const { return 0; }
-       virtual ARDOUR::Playlist* playlist() const { return 0; }
+       virtual boost::shared_ptr<ARDOUR::Playlist> playlist() const { return boost::shared_ptr<ARDOUR::Playlist> (); }
 
        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 (jack_nframes_t start, jack_nframes_t end);
+       virtual void show_timestretch (nframes_t start, nframes_t end);
        virtual void hide_timestretch ();
 
        virtual void hide_dependent_views (TimeAxisViewItem&) {}
@@ -175,22 +185,23 @@ class TimeAxisView : public virtual AxisView
        /* editing operations */
        
        virtual bool cut_copy_clear (Selection&, Editing::CutCopyOp) { return false; }
-       virtual bool paste (jack_nframes_t, float times, Selection&, size_t nth) { return false; }
+       virtual bool paste (nframes_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 (jack_nframes_t pos, ARDOUR::RegionPoint, int32_t dir) {
+       virtual boost::shared_ptr<ARDOUR::Region> find_next_region (nframes_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 (jack_nframes_t start, jack_nframes_t end, double top, double bot, list<Selectable*>& results);
+       virtual void get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results);
        virtual void get_inverted_selectables (Selection&, list<Selectable *>& results);
 
        /* state/serialization management */
 
+       TimeAxisView* get_parent () { return parent; }
        void set_parent (TimeAxisView& p);
        bool has_state () const;
 
@@ -199,7 +210,9 @@ class TimeAxisView : public virtual AxisView
 
        /* call this on the parent */
 
-       virtual XMLNode* get_child_xml_node (const string & childname) { return 0; }
+       virtual XMLNode* get_automation_child_xml_node (ARDOUR::Parameter param) { return 0; }
+       
+       typedef std::vector<boost::shared_ptr<TimeAxisView> > Children;
 
   protected:
 
@@ -270,11 +283,11 @@ class TimeAxisView : public virtual AxisView
        /** Find the parent with state */
        TimeAxisView* get_parent_with_state();
 
-       std::vector<TimeAxisView*> children;
+       Children children;
        bool is_child (TimeAxisView*);
 
-       void remove_child (TimeAxisView*);
-       void add_child (TimeAxisView*);
+       void remove_child (boost::shared_ptr<TimeAxisView>);
+       void add_child (boost::shared_ptr<TimeAxisView>);
 
        /* selection display */
 
@@ -295,7 +308,7 @@ class TimeAxisView : public virtual AxisView
        static bool need_size_info;
 
        void set_height_pixels (uint32_t h);
-       void color_handler (ColorID, uint32_t);
+       void color_handler ();
 
 }; /* class TimeAxisView */