X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=38626a080d880b5dd9d30a360484b178d22a394e;hb=cd68ae78f9b56269a042939658adf0f73f0210a5;hp=c366d266400d05cd607e5e5524017173a9ddc3f3;hpb=00cba5aa3b4691e44502187f1c9f491c3392d61f;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index c366d26640..38626a080d 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -44,7 +44,6 @@
 #include "axis_view.h"
 #include "enums.h"
 #include "editing.h"
-#include "canvas.h"
 
 namespace ARDOUR {
 	class Session;
@@ -58,6 +57,12 @@ namespace Gtk {
 	class Menu;
 }
 
+namespace ArdourCanvas {
+	class Canvas;
+	class Group;
+	class Item;
+}
+
 class PublicEditor;
 class RegionSelection;
 class TimeSelection;
@@ -68,6 +73,7 @@ class Selectable;
 class RegionView;
 class GhostRegion;
 class StreamView;
+class ArdourDialog;
 
 /** Abstract base class for time-axis views (horizontal editor 'strips')
  *
@@ -99,7 +105,6 @@ class TimeAxisView : public virtual AxisView
         virtual void leave_internal_edit_mode () {}
 
 	ArdourCanvas::Group* canvas_display () { return _canvas_display; }
-	ArdourCanvas::Group* canvas_background () { return _canvas_background; }
 	ArdourCanvas::Group* ghost_group () { return _ghost_group; }
 
 	/** @return effective height (taking children into account) in canvas units, or
@@ -116,14 +121,9 @@ class TimeAxisView : public virtual AxisView
 
 	void idle_resize (uint32_t);
 
-	void show_name_label ();
-	void show_name_entry ();
-
 	virtual guint32 show_at (double y, int& nth, Gtk::VBox *parent);
 	virtual void hide ();
 
-	void clip_to_viewport ();
-
 	bool touched (double top, double bot);
 
 	/** @return true if hidden, otherwise false */
@@ -144,14 +144,15 @@ class TimeAxisView : public virtual AxisView
 
 	virtual void reset_visual_state ();
 
-	std::pair<TimeAxisView*, double> covers_y_position (double);
+	std::pair<TimeAxisView*, double> covers_y_position (double) const;
+        bool covered_by_y_range (double y0, double y1) const;
 
 	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 set_samples_per_unit (double);
+	virtual void set_samples_per_pixel (double);
 	virtual void show_selection (TimeSelection&);
 	virtual void hide_selection ();
 	virtual void reshow_selection (TimeSelection&);
@@ -204,7 +205,6 @@ class TimeAxisView : public virtual AxisView
 	Gtk::VBox              controls_vbox;
 	Gtk::VBox              time_axis_vbox;
 	Gtk::HBox              name_hbox;
- 	Gtkmm2ext::FocusEntry* name_entry;
 	Gtk::Label             name_label;
         bool                  _name_editing;
         uint32_t               height;  /* in canvas units */
@@ -213,6 +213,7 @@ class TimeAxisView : public virtual AxisView
 	Gtk::Menu*             display_menu; /* The standard LHS Track control popup-menus */
 	TimeAxisView*          parent;
 	ArdourCanvas::Group*   selection_group;
+	ArdourCanvas::Group*  _ghost_group;
 	std::list<GhostRegion*> ghosts;
 	std::list<SelectionRect*> free_selection_rects;
 	std::list<SelectionRect*> used_selection_rects;
@@ -225,22 +226,17 @@ class TimeAxisView : public virtual AxisView
 
         virtual bool can_edit_name() const;
 
-	bool name_entry_button_press (GdkEventButton *ev);
-	bool name_entry_button_release (GdkEventButton *ev);
 	bool name_entry_key_release (GdkEventKey *ev);
-	void name_entry_activated ();
-	sigc::connection name_entry_key_timeout;
-	bool name_entry_key_timed_out ();
-	guint32 last_name_entry_key_press_event;
+	bool name_entry_key_press (GdkEventKey *ev);
+	bool name_entry_focus_out (GdkEventFocus *ev);
 
-        void begin_name_edit (GdkEvent*);
-        void end_name_edit (bool push_focus);
+        Gtk::Entry* name_entry;
+        void begin_name_edit ();
+        void end_name_edit (int);
 
 	/* derived classes can override these */
 
 	virtual void name_entry_changed ();
-	virtual bool name_entry_focus_in (GdkEventFocus *ev);
-	virtual bool name_entry_focus_out (GdkEventFocus *ev);
 
 	/** Handle mouse relaese on our LHS control name ebox.
 	 *
@@ -284,14 +280,12 @@ class TimeAxisView : public virtual AxisView
 	void build_size_menu ();
 
 private:
-	ArdourCanvas::Group* _canvas_background;
  	Gtk::VBox*            control_parent;
 	int                  _order;
 	uint32_t             _effective_height;
 	double               _resize_drag_start;
 	GdkCursor*           _preresize_cursor;
 	bool                 _have_preresize_cursor;
-	ArdourCanvas::Group* _ghost_group;
         bool                  _ebox_release_can_act;
 
 	static uint32_t button_height;