Heavy-duty abstraction work to split type-specific classes into

specializations of (new, for the most part) generic bases.  (eg. most everything
from the MIDI branch except for actual MIDI things, so merges have a chance of
succeeding).  Also the new edit toolbar, and various other cleanup things I did
along the way.

Should be functionally equivalent (except the toolbar), this is just design work.

She's a big'un....



git-svn-id: svn://localhost/ardour2/trunk@727 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 27 insertions, 216 deletions

diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index 8a7cf4f9a2..2162771285 100644
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000-2006 Paul Davis 
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
     $Id$
 */
 
-#ifndef __ardour_trackview_h__
-#define __ardour_trackview_h__
+#ifndef __ardour_audio_time_axis_h__
+#define __ardour_audio_time_axis_h__
 
 #include <gtkmm/table.h>
 #include <gtkmm/button.h>
@@ -33,19 +33,14 @@
 #include <list>
 
 #include <ardour/types.h>
-#include <ardour/region.h>
 
 #include "ardour_dialog.h"
 #include "route_ui.h"
 #include "enums.h"
-#include "time_axis_view.h"
+#include "route_time_axis.h"
 #include "canvas.h"
 #include "color.h"
 
-namespace ALSA {
-	class MultiChannelDevice;
-}
-
 namespace ARDOUR {
 	class Session;
 	class AudioDiskstream;
@@ -56,247 +51,58 @@ namespace ARDOUR {
 	class AudioPlaylist;
 }
 
-namespace LADSPA {
-	class Manager;
-	class Plugin;
-}
-
 class PublicEditor;
 class AudioThing;
-class StreamView;
+class AudioStreamView;
 class Selection;
 class Selectable;
+class RegionView;
 class AudioRegionView;
 class AutomationLine;
 class AutomationGainLine;
 class AutomationPanLine;
-class RedirectAutomationLine;
 class TimeSelection;
 class AutomationTimeAxisView;
 
-class AudioTimeAxisView : public RouteUI, public TimeAxisView
+class AudioTimeAxisView : public RouteTimeAxisView
 {
   public:
  	AudioTimeAxisView (PublicEditor&, ARDOUR::Session&, boost::shared_ptr<ARDOUR::Route>, ArdourCanvas::Canvas& canvas);
  	virtual ~AudioTimeAxisView ();
+	
+	AudioStreamView* audio_view();
 
-	void show_selection (TimeSelection&);
-	void automation_control_point_changed (ARDOUR::AutomationType);
-
-	void set_samples_per_unit (double);
- 	void set_height (TimeAxisView::TrackHeight);
 	void set_show_waveforms (bool yn);
 	void set_show_waveforms_recording (bool yn);
-	void show_timestretch (jack_nframes_t start, jack_nframes_t end);
-	void hide_timestretch ();
-	void selection_click (GdkEventButton*);
-	void set_selected_regionviews (AudioRegionSelection&);
-	void set_selected_points (PointSelection&);
-	void get_selectables (jack_nframes_t start, jack_nframes_t end, double top, double bot, list<Selectable *>&);
-	void get_inverted_selectables (Selection&, list<Selectable*>&);
 	void show_all_xfades ();
 	void hide_all_xfades ();
 	void hide_dependent_views (TimeAxisViewItem&);
 	void reveal_dependent_views (TimeAxisViewItem&);
 		
-	ARDOUR::Region* find_next_region (jack_nframes_t pos, ARDOUR::RegionPoint, int32_t dir);
-
-	string name() const;
-
-	ARDOUR::RouteGroup* edit_group() const;
-
-	void build_playlist_menu (Gtk::Menu *);
-	ARDOUR::Playlist* playlist() const;
-
-	/* overridden from parent to store display state */
+	/* Overridden from parent to store display state */
 	guint32 show_at (double y, int& nth, Gtk::VBox *parent);
 	void hide ();
 	
-	/* need accessors/mutators */
-
-	StreamView      *view;
-
-	/* editing operations */
-	
-	bool cut_copy_clear (Selection&, Editing::CutCopyOp);
-	bool paste (jack_nframes_t, float times, Selection&, size_t nth);
-
-	list<TimeAxisView*>get_child_list();
-
 	void set_state (const XMLNode&);
 	XMLNode* get_child_xml_node (const string & childname);
 
-	/* the editor calls these when mapping an operation across multiple tracks */
-
-	void use_new_playlist (bool prompt);
-	void use_copy_playlist (bool prompt);
-	void clear_playlist ();
-
   private:
-	friend class StreamView;
+	friend class AudioStreamView;
 	friend class AudioRegionView;
-
-	ArdourCanvas::Canvas& parent_canvas;
-
-	bool         no_redraw;
-  
-	AutomationTimeAxisView *gain_track;
-	AutomationTimeAxisView *pan_track;
-
-	void update_automation_view (ARDOUR::AutomationType);
-	void reset_redirect_automation_curves ();
-
-	Gtk::HBox  other_button_hbox;
-
-	Gtk::Table button_table;
-
-	Gtk::Button       redirect_button;
-	Gtk::Button       edit_group_button;
-	Gtk::Button       playlist_button;
-	Gtk::Button       size_button;
-	Gtk::Button       automation_button;
-	Gtk::Button       hide_button;
-	Gtk::Button       visual_button;
-
-	void route_active_changed ();
-
-	void diskstream_changed (void *src);
-	void update_diskstream_display ();
 	
-	gint edit_click  (GdkEventButton *);
-
-	// variables to get the context menu
-	// automation buttons correctly initialized
-	bool show_gain_automation;
-	bool show_pan_automation;
-
-	void build_redirect_window ();
-	void redirect_click ();
-	void redirect_add ();
-	void redirect_remove ();
-	void redirect_edit ();
-	void redirect_relist ();
-	void redirect_row_selected (gint row, gint col, GdkEvent *ev);
-	void add_to_redirect_display (boost::shared_ptr<ARDOUR::Redirect>);
-	void redirects_changed (void *);
-
-	sigc::connection modified_connection;
-	sigc::connection state_changed_connection;
-
-	void take_name_changed (void *);
-	void route_name_changed (void *);
-	void name_entry_changed ();
-
-	void on_area_realize ();
-
-	virtual void label_view ();
-
-	Gtk::Menu edit_group_menu;
-
-	void add_edit_group_menu_item (ARDOUR::RouteGroup *, Gtk::RadioMenuItem::Group*);
-	void set_edit_group_from_menu (ARDOUR::RouteGroup *);
-
-	void reset_samples_per_unit ();
+	void route_active_changed ();
 
-	void select_track_color();
+	void build_automation_action_menu ();
+	void append_extra_display_menu_items ();
 	
-	virtual void build_display_menu ();
-
-	Gtk::CheckMenuItem* waveform_item;
-	Gtk::RadioMenuItem* traditional_item;
-	Gtk::RadioMenuItem* rectified_item;
-	
-	Gtk::RadioMenuItem* align_existing_item;
-	Gtk::RadioMenuItem* align_capture_item;
-	
-	void align_style_changed ();
-	void set_align_style (ARDOUR::AlignStyle);
-
 	void toggle_show_waveforms ();
-
 	void set_waveform_shape (WaveformShape);
 	void toggle_waveforms ();
 
-	Gtk::Menu *playlist_menu;
-	Gtk::Menu *playlist_action_menu;
-	Gtk::MenuItem *playlist_item;
-	
-	/* playlist */
-
-	void set_playlist (ARDOUR::AudioPlaylist *);
-	void playlist_click ();
-	void show_playlist_selector ();
-
-	void playlist_changed ();
-	void playlist_state_changed (ARDOUR::Change);
-	void playlist_modified ();
-
-	void add_playlist_to_playlist_menu (ARDOUR::Playlist*);
-	void rename_current_playlist ();
-
-	/* automation stuff */
-	
-	Gtk::Menu* automation_action_menu;
-	Gtk::CheckMenuItem* gain_automation_item;
-	Gtk::CheckMenuItem* pan_automation_item;
-
-	void automation_click ();
-	void clear_automation ();
-	void hide_all_automation ();
 	void show_all_automation ();
 	void show_existing_automation ();
+	void hide_all_automation ();
 
-	struct RedirectAutomationNode {
-	    uint32_t     what;
-	    Gtk::CheckMenuItem* menu_item;
-	    AutomationTimeAxisView* view;
-	    AudioTimeAxisView& parent;
-
-	    RedirectAutomationNode (uint32_t w, Gtk::CheckMenuItem* mitem, AudioTimeAxisView& p)
-		    : what (w), menu_item (mitem), view (0), parent (p) {}
-
-	    ~RedirectAutomationNode ();
-	};
-
-	struct RedirectAutomationInfo {
-	    boost::shared_ptr<ARDOUR::Redirect> redirect;
-	    bool valid;
-	    Gtk::Menu* menu;
-	    vector<RedirectAutomationNode*> lines;
-
-	    RedirectAutomationInfo (boost::shared_ptr<ARDOUR::Redirect> r) 
-		    : redirect (r), valid (true) {}
-
-	    ~RedirectAutomationInfo ();
-	};
-
-	list<RedirectAutomationInfo*> redirect_automation;
-	RedirectAutomationNode* find_redirect_automation_node (boost::shared_ptr<ARDOUR::Redirect> redirect, uint32_t what);
-	
-	Gtk::Menu subplugin_menu;
-	void add_redirect_to_subplugin_menu (boost::shared_ptr<ARDOUR::Redirect>);
-
-	void remove_ran (RedirectAutomationNode* ran);
-
-	void redirect_menu_item_toggled (AudioTimeAxisView::RedirectAutomationInfo*,
-					 AudioTimeAxisView::RedirectAutomationNode*);
-	void redirect_automation_track_hidden (RedirectAutomationNode*, boost::shared_ptr<ARDOUR::Redirect>);
-	
-	vector<RedirectAutomationLine*> redirect_automation_curves;
-	RedirectAutomationLine *find_redirect_automation_curve (boost::shared_ptr<ARDOUR::Redirect>,uint32_t);
-	void add_redirect_automation_curve (boost::shared_ptr<ARDOUR::Redirect>, uint32_t);
-	void add_existing_redirect_automation_curves (boost::shared_ptr<ARDOUR::Redirect>);
-
-	ArdourCanvas::SimpleRect *timestretch_rect;
-
-	void timestretch (jack_nframes_t start, jack_nframes_t end);
-
-	void visual_click ();
-	void hide_click ();
-	gint when_displayed (GdkEventAny*);
-
-	void speed_changed ();
-	
 	void add_gain_automation_child ();
 	void add_pan_automation_child ();
 	void add_parameter_automation_child ();
@@ -309,14 +115,19 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView
 
 	void update_pans ();
 
-	void region_view_added (AudioRegionView*);
-	void add_ghost_to_redirect (AudioRegionView*, AutomationTimeAxisView*);
-
-	void map_frozen ();
+	AutomationTimeAxisView* gain_track;
+	AutomationTimeAxisView* pan_track;
 
-	void color_handler (ColorID, uint32_t);
-	bool select_me (GdkEventButton*);
+	// Set from XML so context menu automation buttons can be correctly initialized
+	bool show_gain_automation;
+	bool show_pan_automation;
+	
+	Gtk::CheckMenuItem* waveform_item;
+	Gtk::RadioMenuItem* traditional_item;
+	Gtk::RadioMenuItem* rectified_item;
+	Gtk::CheckMenuItem* gain_automation_item;
+	Gtk::CheckMenuItem* pan_automation_item;
 };
 
-#endif /* __ardour_trackview_h__ */
+#endif /* __ardour_audio_time_axis_h__ */