X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_streamview.h;h=0c50986f9383fe832a3467255246eb395ce15f59;hb=ad942b104a80c74c689e0c1b5c016d1870850830;hp=a05275fa20831cafae726c506b7a53893b0798f3;hpb=4297071b3f7360b17d81ef9cf36b8d75d46d2818;p=ardour.git

diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index a05275fa20..0c50986f93 100644
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001, 2006 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
@@ -36,7 +36,6 @@ namespace Gdk {
 
 namespace ARDOUR {
 	class Route;
-	class Diskstream;
 	class Crossfade;
 	class PeakData;
 	class AudioRegion;
@@ -54,16 +53,16 @@ class Selection;
 class AudioStreamView : public StreamView
 {
   public:
-	AudioStreamView (AudioTimeAxisViewPtr);
+	AudioStreamView (AudioTimeAxisView&);
 	~AudioStreamView ();
 
 	int set_samples_per_unit (gdouble spp);
+	void horizontal_position_changed ();
 
 	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; }
 
 	void foreach_crossfadeview (void (CrossfadeView::*pmf)(void));
 
@@ -79,40 +78,36 @@ class AudioStreamView : public StreamView
 
   private:
 	void setup_rec_box ();
-	void rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr<ARDOUR::Source> src); 
-	void update_rec_regions ();
-	
+	void rec_peak_range_ready (framepos_t start, ARDOUR::framecnt_t cnt, boost::weak_ptr<ARDOUR::Source> src);
+	void update_rec_regions (ARDOUR::framepos_t, ARDOUR::framecnt_t);
+
 	RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves, bool recording = false);
 	void remove_region_view (boost::weak_ptr<ARDOUR::Region> );
 	void remove_audio_region_view (boost::shared_ptr<ARDOUR::AudioRegion> );
 
-	void undisplay_diskstream ();
-	void redisplay_diskstream ();
-	void playlist_modified_weak (boost::weak_ptr<ARDOUR::Diskstream>);
-	void playlist_modified (boost::shared_ptr<ARDOUR::Diskstream>);
-	void playlist_changed_weak (boost::weak_ptr<ARDOUR::Diskstream>);
-	void playlist_changed (boost::shared_ptr<ARDOUR::Diskstream>);
+	void undisplay_track ();
+	void redisplay_track ();
+	void playlist_layered (boost::weak_ptr<ARDOUR::Track>);
+	void playlist_switched (boost::weak_ptr<ARDOUR::Track>);
 
-	void add_crossfade (boost::shared_ptr<ARDOUR::Crossfade>);
-	void add_crossfade_weak (boost::weak_ptr<ARDOUR::Crossfade>);
+	void add_crossfade (boost::weak_ptr<ARDOUR::Crossfade>);
 	void remove_crossfade (boost::shared_ptr<ARDOUR::Region>);
 
 	void color_handler ();
 
 	void update_contents_height ();
+	void update_content_height (CrossfadeView *);
 
 	void parameter_changed (std::string const &);
 	void set_waveform_shape (ARDOUR::WaveformShape);
 	void set_waveform_scale (ARDOUR::WaveformScale);
-	
+
 	double _amplitude_above_axis;
-	
-	typedef std::list<CrossfadeView*> CrossfadeViewList;
+
+	typedef std::map<boost::shared_ptr<ARDOUR::Crossfade>, CrossfadeView*> CrossfadeViewList;
 	CrossfadeViewList crossfade_views;
 	bool              crossfades_visible;
 
-	std::list<sigc::connection>                  rec_data_ready_connections;
-	nframes_t                                    last_rec_data_frame;
 	std::map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
 
 	bool outline_region;