X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_streamview.h;h=443a39063b80d5a4dafce23efc81ec0a508e1ad1;hb=e161bc0596b6cb8facdefc56435553f76ee643c3;hp=ce21c7dacbe7f888db50ebd2b28610cb6bea4fa7;hpb=832aa18a813f5ed4cb8e1228c52d89ee6d8946c7;p=ardour.git

diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index ce21c7dacb..443a39063b 100644
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -26,8 +26,8 @@
 #include <boost/weak_ptr.hpp>
 
 #include "ardour/location.h"
+#include "point_selection.h"
 #include "editing.h"
-#include "simplerect.h"
 #include "streamview.h"
 
 namespace Gdk {
@@ -35,12 +35,10 @@ namespace Gdk {
 }
 
 namespace ARDOUR {
-	class Route;
-	class Diskstream;
-	class Crossfade;
-	class PeakData;
 	class AudioRegion;
+	class Route;
 	class Source;
+	struct PeakData;
 }
 
 class PublicEditor;
@@ -48,67 +46,38 @@ class Selectable;
 class AudioTimeAxisView;
 class AudioRegionView;
 class RegionSelection;
-class CrossfadeView;
 class Selection;
 
 class AudioStreamView : public StreamView
 {
   public:
 	AudioStreamView (AudioTimeAxisView&);
-	~AudioStreamView ();
-
-	int set_samples_per_unit (gdouble spp);
 
 	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));
-
 	void show_all_fades ();
 	void hide_all_fades ();
 
-	void show_all_xfades ();
-	void hide_all_xfades ();
-	void hide_xfades_involving (AudioRegionView&);
-	void reveal_xfades_involving (AudioRegionView&);
+	std::pair<std::list<AudioRegionView*>, std::list<AudioRegionView*> > hide_xfades_with (boost::shared_ptr<ARDOUR::AudioRegion> ar);
 
 	RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
+	void set_selected_points (PointSelection&);
 
   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_layered (boost::weak_ptr<ARDOUR::Diskstream>);
-	void playlist_switched (boost::weak_ptr<ARDOUR::Diskstream>);
-
-	void add_crossfade (boost::weak_ptr<ARDOUR::Crossfade>);
-	void remove_crossfade (boost::shared_ptr<ARDOUR::Region>);
+	void redisplay_track ();
 
 	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::map<boost::shared_ptr<ARDOUR::Crossfade>, CrossfadeView*> CrossfadeViewList;
-	CrossfadeViewList crossfade_views;
-	bool              crossfades_visible;
-
 	std::map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
 
 	bool outline_region;