Split pretty much the entire GUI in 3. Audio and Midi "editor strips" and

associated stuff are now separated (with common things in base classes).

Extremely dirty and in progress, but builds, runs, and audio/midi tracks/busses
all look (and really are) distinct in the GUI.


git-svn-id: svn://localhost/ardour2/branches/midi@691 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 22 insertions, 39 deletions

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index c607c78166..3eae76a802 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -54,19 +54,17 @@ namespace Gtk {
 }
 
 class PublicEditor;
-class AudioRegionSelection;
+class RegionSelection;
 class TimeSelection;
 class PointSelection;
 class TimeAxisViewItem;
 class Selection;
 class Selectable;
 
-/**
- * TimeAxisView defines the abstract base class for time-axis views.
+/** Abstract base class for time-axis views (horizontal editor 'strips')
  *
  * This class provides the basic LHS controls and display methods. This should be
  * extended to create functional time-axis based views.
- *
  */
 class TimeAxisView : public virtual AxisView
 {
@@ -103,13 +101,13 @@ class TimeAxisView : public virtual AxisView
 	PublicEditor& editor;
 	
 	TrackHeight height_style; 
-	uint32_t height;  /* in canvas units */
-	uint32_t effective_height;  /* in canvas units */
-	double  y_position;
-	int     order;
+	uint32_t    height;  /* in canvas units */
+	uint32_t    effective_height;  /* in canvas units */
+	double      y_position;
+	int         order;
 	
-	ArdourCanvas::Group   *canvas_display;
- 	Gtk::VBox       *control_parent;
+	ArdourCanvas::Group *canvas_display;
+ 	Gtk::VBox           *control_parent;
 
 	/* The Standard LHS Controls */
 	Gtk::Frame    controls_frame;
@@ -121,14 +119,13 @@ class TimeAxisView : public virtual AxisView
 	Gtk::HBox     name_hbox;
 	Gtk::Frame    name_frame;
  	Gtk::Entry    name_entry;
-
+	
 	void hide_name_label ();
 	void hide_name_entry ();
 	void show_name_label ();
 	void show_name_entry ();
 
-	/**
-	 * Display this TrackView as the nth component of the parent box, at y.
+	/** Display this TrackView as the nth component of the parent box, at y.
 	 *
 	 * @param y 
 	 * @param nth
@@ -139,9 +136,7 @@ class TimeAxisView : public virtual AxisView
 
 	bool touched (double top, double bot);
 
-	/**
-	 * Hides this TrackView
-	 */
+	/** Hides this TrackView */
 	virtual void hide ();
 	bool hidden() const { return _hidden; }
 
@@ -157,8 +152,7 @@ class TimeAxisView : public virtual AxisView
 	virtual void set_height (TrackHeight h);
 	void reset_height();
 
-	/**
-	 * Steps through the defined heights for this TrackView.
+	/** 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
@@ -183,7 +177,7 @@ class TimeAxisView : public virtual AxisView
 	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 void set_selected_regionviews (AudioRegionSelection&) {}
+	virtual void set_selected_regionviews (RegionSelection&) {}
 	virtual void set_selected_points (PointSelection&) {}
 
 	virtual ARDOUR::Region* find_next_region (jack_nframes_t pos, ARDOUR::RegionPoint, int32_t dir) {
@@ -226,49 +220,39 @@ class TimeAxisView : public virtual AxisView
 	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.
+	/** Handle mouse relaese on our LHS control name ebox.
 	 * 
 	 *@ param ev the event
 	 */
 	virtual bool controls_ebox_button_release (GdkEventButton *ev);
 	virtual bool controls_ebox_scroll (GdkEventScroll *ev);
 
-	/**
-	 * Displays the standard LHS control menu at when.
+	/** Display the standard LHS control menu at when.
 	 *
 	 * @param when the popup activation time
 	 */
 	virtual void popup_display_menu (guint32 when);
 
-	/**
-	 * Build the standard LHS control menu.
+	/** Build the standard LHS control menu.
 	 * Subclasses should extend this method to add their own menu options.
-	 *
 	 */
 	virtual void build_display_menu ();
 
-	/**
-         * Do anything that needs to be done to dynamically reset
-	 * the LHS control menu.
+	/** Do whatever needs to be done to dynamically reset the LHS control menu.
 	 */
 	virtual bool handle_display_menu_map_event (GdkEventAny *ev) { return false; }
 
-	/**
-	 * Build the standard LHS control size menu for the default heights options.
-	 *
+	/** 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
+	/** Displays the standard LHS controls size menu for the track heights
 	 *
-	 * @parem when the popup activation time
+	 * @param when the popup activation time
 	 */
  	void popup_size_menu(guint32 when);
 
-	/**
-	 * Handle the size option of out main menu.
+	/** Handle the size option of our main menu.
 	 * 
 	 * @param ev the event
 	 */
@@ -283,8 +267,7 @@ class TimeAxisView : public virtual AxisView
 
 	TimeAxisView* parent;
 
-	/* find the parent with state */
-
+	/** Find the parent with state */
 	TimeAxisView* get_parent_with_state();
 
 	std::vector<TimeAxisView*> children;