X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=7ea0f580f51fa7bd4d7bb95d547af6be9e12ab74;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=90c05761c085f496d623880a534af741c7a002e8;hpb=f7e5d4eba296dd1821239388ba55cad201a9cda5;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 90c05761c0..7ea0f580f5 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -24,6 +24,7 @@
 #include <list>
 
 #include <gtkmm/box.h>
+#include <gtkmm/fixed.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/eventbox.h>
@@ -41,6 +42,8 @@
 #include "ardour/region.h"
 #include "evoral/Parameter.hpp"
 
+#include "canvas/line.h"
+
 #include "prompter.h"
 #include "axis_view.h"
 #include "enums.h"
@@ -75,6 +78,8 @@ class RegionView;
 class GhostRegion;
 class StreamView;
 class ArdourDialog;
+class ItemCounts;
+class PasteContext;
 
 /** Abstract base class for time-axis views (horizontal editor 'strips')
  *
@@ -101,9 +106,6 @@ class TimeAxisView : public virtual AxisView
 	/** @return maximum allowable value of order */
 	static int max_order () { return _max_order; }
 
-	virtual void enter_internal_edit_mode () {}
-	virtual void leave_internal_edit_mode () {}
-
 	ArdourCanvas::Container* canvas_display () { return _canvas_display; }
 	ArdourCanvas::Container* ghost_group () { return _ghost_group; }
 
@@ -119,7 +121,7 @@ class TimeAxisView : public virtual AxisView
 
 	uint32_t current_height() const { return height; }
 
-	void idle_resize (uint32_t);
+	void idle_resize (int32_t);
 
 	virtual guint32 show_at (double y, int& nth, Gtk::VBox *parent);
 	virtual void hide ();
@@ -162,7 +164,15 @@ class TimeAxisView : public virtual AxisView
 	/* editing operations */
 
 	virtual void cut_copy_clear (Selection&, Editing::CutCopyOp) {}
-	virtual bool paste (ARDOUR::framepos_t, float /*times*/, Selection&, size_t /*nth*/) { return false; }
+
+	/** Paste a selection.
+	 *  @param pos Position to paste to (session frames).
+	 *  @param selection Selection to paste.
+	 *  @param ctx Paste context.
+	 */
+	virtual bool paste (ARDOUR::framepos_t pos,
+	                    const Selection&   selection,
+	                    PasteContext&      ctx) { return false; }
 
 	virtual void set_selected_regionviews (RegionSelection&) {}
 	virtual void set_selected_points (PointSelection&) {}
@@ -201,16 +211,20 @@ class TimeAxisView : public virtual AxisView
 
 	protected:
 	static Glib::RefPtr<Gtk::SizeGroup> controls_meters_size_group;
+	static Glib::RefPtr<Gtk::SizeGroup> midi_scroomer_size_group;
+	static unsigned int name_width_px;
 	/* The Standard LHS Controls */
 	Gtk::Table             controls_table;
 	Glib::RefPtr<Gtk::SizeGroup> controls_button_size_group;
 	Gtk::EventBox          controls_ebox;
 	Gtk::VBox              controls_vbox;
 	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 */
 	std::string            controls_base_unselected_name;
@@ -225,6 +239,7 @@ class TimeAxisView : public virtual AxisView
 	bool                  _hidden;
 	bool                   in_destructor;
 	Gtk::Menu*            _size_menu;
+	ArdourCanvas::Line*       _canvas_separator;
 	ArdourCanvas::Container*  _canvas_display;
 	double                _y_position;
 	PublicEditor&         _editor;
@@ -289,9 +304,10 @@ private:
 	int                  _order;
 	uint32_t             _effective_height;
 	double               _resize_drag_start;
+	bool                 _did_resize;
 	GdkCursor*           _preresize_cursor;
 	bool                 _have_preresize_cursor;
-	bool                  _ebox_release_can_act;
+	bool                 _ebox_release_can_act;
 
 	static uint32_t button_height;
 	static uint32_t extra_height;