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, 65 insertions, 91 deletions

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 00ec2d93f2..0bec319758 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001 Paul Davis 
+    Copyright (C) 2001, 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
@@ -14,8 +14,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
 */
 
 #ifndef __ardour_streamview_h__
@@ -37,141 +35,117 @@ namespace Gdk {
 
 namespace ARDOUR {
 	class Route;
-	class AudioDiskstream;
+	class Diskstream;
 	class Crossfade;
 	class PeakData;
-	class AudioRegion;
+	class Region;
 	class Source;
 }
 
 struct RecBoxInfo {
-        ArdourCanvas::SimpleRect* rectangle;
-	jack_nframes_t start;
-	jack_nframes_t length;
+	ArdourCanvas::SimpleRect* rectangle;
+	jack_nframes_t            start;
+	jack_nframes_t            length;
 };
 
 class PublicEditor;
 class Selectable;
-class AudioTimeAxisView;
-class AudioRegionView;
-class AudioRegionSelection;
+class RouteTimeAxisView;
+class RegionView;
+class RegionSelection;
 class CrossfadeView;
 class Selection;
 
 class StreamView : public sigc::trackable
 {
-  public:
-	StreamView (AudioTimeAxisView&);
-	~StreamView ();
+public:
+	virtual ~StreamView ();
 
-	void set_waveform_shape (WaveformShape);
+	RouteTimeAxisView& trackview() { return _trackview; }
 
-	AudioTimeAxisView& trackview() { return _trackview; }
+	void attach ();
 
 	void set_zoom_all();
 
-	int set_height (gdouble);
 	int set_position (gdouble x, gdouble y);
+	virtual int set_height (gdouble);
 
-	int set_samples_per_unit (gdouble spp);
-	gdouble get_samples_per_unit () { return _samples_per_unit; }
-
-	int set_amplitude_above_axis (gdouble app);
-	gdouble get_amplitude_above_axis () { return _amplitude_above_axis; }
-
-	void set_show_waveforms (bool yn);
-	void set_show_waveforms_recording (bool yn) { use_rec_regions = yn; }
+	virtual int set_samples_per_unit (gdouble spp);
+	gdouble     get_samples_per_unit () { return _samples_per_unit; }
 
 	ArdourCanvas::Item* canvas_item() { return canvas_group; }
 
-	sigc::signal<void,AudioRegionView*> AudioRegionViewAdded;
-
 	enum ColorTarget {
 		RegionColor,
 		StreamBaseColor
 	};
 
-	void apply_color (Gdk::Color&, ColorTarget t);
-	void set_selected_regionviews (AudioRegionSelection&);
+	Gdk::Color get_region_color () const { return region_color; }
+	void       apply_color (Gdk::Color&, ColorTarget t);
+
+	RegionView*  find_view (const ARDOUR::Region&);
+	void         foreach_regionview (sigc::slot<void,RegionView*> slot);
+
+	void set_selected_regionviews (RegionSelection&);
 	void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
 	void get_inverted_selectables (Selection&, list<Selectable* >& results);
-	Gdk::Color get_region_color () const { return region_color; }
 
-	void foreach_regionview (sigc::slot<void,AudioRegionView*> slot);
-	void foreach_crossfadeview (void (CrossfadeView::*pmf)(void));
+	void add_region_view (ARDOUR::Region*);
+	void region_layered (RegionView*);
+	
+	sigc::signal<void,RegionView*> RegionViewAdded;
 
-	void attach ();
+protected:
+	StreamView (RouteTimeAxisView&);
 	
-	void region_layered (AudioRegionView*);
+//private: (FIXME?)
+
+	void         transport_changed();
+	void         rec_enable_changed();
+	void         sess_rec_enable_changed();
+	virtual void setup_rec_box () = 0;
+	void         update_rec_box ();
+	virtual void update_rec_regions () = 0;
 	
-	AudioRegionView* find_view (const ARDOUR::AudioRegion&);
-
-	void show_all_xfades ();
-	void hide_all_xfades ();
-	void hide_xfades_involving (AudioRegionView&);
-	void reveal_xfades_involving (AudioRegionView&);
+	virtual void add_region_view_internal (ARDOUR::Region*, bool wait_for_waves) = 0;
+	virtual void remove_region_view (ARDOUR::Region* );
+	void         remove_rec_region (ARDOUR::Region*);
+
+	void         display_diskstream (ARDOUR::Diskstream* );
+	virtual void undisplay_diskstream ();
+	virtual void redisplay_diskstream () = 0;
+	void         diskstream_changed ();
+	
+	void         playlist_state_changed (ARDOUR::Change);
+	virtual void playlist_changed (ARDOUR::Diskstream* );
+	virtual void playlist_modified ();
+	
+	virtual void color_handler (ColorID, uint32_t) = 0;
 
-  private:
-	AudioTimeAxisView& _trackview;
 
-	ArdourCanvas::Group* canvas_group;
+	RouteTimeAxisView&        _trackview;
+	ArdourCanvas::Group*      canvas_group;
 	ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
 
-	typedef list<AudioRegionView* > AudioRegionViewList;
-	AudioRegionViewList region_views;
-
-	typedef list<CrossfadeView*> CrossfadeViewList;
-	CrossfadeViewList crossfade_views;
+	typedef list<RegionView* > RegionViewList;
+	RegionViewList  region_views;
 
 	double _samples_per_unit;
-	double _amplitude_above_axis;
-
-	sigc::connection screen_update_connection;
-	vector<RecBoxInfo> rec_rects;
-	list<ARDOUR::AudioRegion* > rec_regions;
-	bool rec_updating;
-	bool rec_active;
-	bool use_rec_regions;
-	list<sigc::connection> peak_ready_connections;
-	jack_nframes_t last_rec_peak_frame;
-	map<ARDOUR::Source*, bool> rec_peak_ready_map;
-	
-	void update_rec_box ();
-	void transport_changed();
-	void rec_enable_changed(void*  src = 0);
-	void sess_rec_enable_changed();
-	void setup_rec_box ();
-	void rec_peak_range_ready (jack_nframes_t start, jack_nframes_t cnt, ARDOUR::Source* src); 
-	void update_rec_regions ();
-	
-	void add_region_view (ARDOUR::Region*);
-	void add_region_view_internal (ARDOUR::Region*, bool wait_for_waves);
-	void remove_region_view (ARDOUR::Region* );
-	void remove_rec_region (ARDOUR::Region*);
-	void remove_audio_region_view (ARDOUR::AudioRegion* );
-	void remove_audio_rec_region (ARDOUR::AudioRegion*);
-
-	void display_diskstream (ARDOUR::AudioDiskstream* );
-	void undisplay_diskstream ();
-	void redisplay_diskstream ();
-	void diskstream_changed (void* );
-	void playlist_state_changed (ARDOUR::Change);
-	void playlist_changed (ARDOUR::AudioDiskstream* );
-	void playlist_modified ();
-
-	bool crossfades_visible;
-	void add_crossfade (ARDOUR::Crossfade*);
-	void remove_crossfade (ARDOUR::Crossfade*);
 
-	/* XXX why are these different? */
+	sigc::connection       screen_update_connection;
+	vector<RecBoxInfo>     rec_rects;
+	list<ARDOUR::Region* > rec_regions;
+	bool                   rec_updating;
+	bool                   rec_active;
+	bool                   use_rec_regions;
 	
+	/* XXX why are these different? */
 	Gdk::Color region_color;
-	uint32_t stream_base_color;
-
-	void color_handler (ColorID, uint32_t);
+	uint32_t   stream_base_color;
 
 	vector<sigc::connection> playlist_connections;
-	sigc::connection playlist_change_connection;
+	sigc::connection         playlist_change_connection;
 };
 
 #endif /* __ardour_streamview_h__ */
+