use ustring more; handle embedding of "paired" files as per mantis #1362

[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 796ef0cbaa8fa04b4c5b20312c131fad3b1348da..31a6e07a80fd41c269c01f89ae7fb432e5fae563 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -31,6 +31,8 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
 
+#include <gtkmm2ext/focus_entry.h>
+
 #include <ardour/types.h>
 #include <ardour/region.h>
 
@@ -120,7 +122,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 ();
@@ -157,6 +159,14 @@ class TimeAxisView : public virtual AxisView
        virtual void set_height (TrackHeight h);
        void reset_height();
 
+       /**
+        * 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.
@@ -166,7 +176,7 @@ 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&);