X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_streamview.h;h=093762f950d037f0ab0220a5aff013773c864b9a;hb=463402914174800f6ccb9c59ffd652fce13607be;hp=ed9c8b7f7f51a6e54cef1d662565f8994c813e8e;hpb=732a482f439f6df818b90634a5abb1b5d64ff05e;p=ardour.git

diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index ed9c8b7f7f..093762f950 100644
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -26,9 +26,8 @@
 #include <boost/weak_ptr.hpp>
 
 #include <ardour/location.h>
-#include "enums.h"
+#include "editing.h"
 #include "simplerect.h"
-#include "color.h"
 #include "streamview.h"
 
 namespace Gdk {
@@ -58,10 +57,10 @@ class AudioStreamView : public StreamView
 	AudioStreamView (AudioTimeAxisView&);
 	~AudioStreamView ();
 
-	void set_waveform_shape (WaveformShape);
-	WaveformShape get_waveform_shape () const;
-	void set_waveform_scale (WaveformScale);
-	WaveformScale get_waveform_scale () const;
+	void set_waveform_shape (Editing::WaveformShape);
+	Editing::WaveformShape get_waveform_shape () const { return _waveform_shape; }
+	void set_waveform_scale (Editing::WaveformScale);
+	Editing::WaveformScale get_waveform_scale () const { return _waveform_scale; }
 
 	int set_height (gdouble h);
 	int set_samples_per_unit (gdouble spp);
@@ -74,6 +73,9 @@ class AudioStreamView : public StreamView
 
 	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&);
@@ -84,19 +86,20 @@ class AudioStreamView : public StreamView
 	void rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr<ARDOUR::Source> src); 
 	void update_rec_regions ();
 	
-	void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves);
+	void 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 ();
-	void playlist_changed (boost::shared_ptr<ARDOUR::Diskstream>);
+	void playlist_changed (boost::weak_ptr<ARDOUR::Diskstream>);
 
-	void add_crossfade (ARDOUR::Crossfade*);
-	void remove_crossfade (ARDOUR::Crossfade*);
+	void add_crossfade (boost::shared_ptr<ARDOUR::Crossfade>);
+	void add_crossfade_weak (boost::weak_ptr<ARDOUR::Crossfade>);
+	void remove_crossfade (boost::shared_ptr<ARDOUR::Crossfade>);
 
-	void color_handler (ColorID id, uint32_t val);
+	void color_handler ();
 	
 
 	double _amplitude_above_axis;
@@ -108,7 +111,11 @@ class AudioStreamView : public StreamView
 	list<sigc::connection>     peak_ready_connections;
 	nframes_t             last_rec_peak_frame;
 	map<boost::shared_ptr<ARDOUR::Source>, bool> rec_peak_ready_map;
-	
+
+	bool outline_region;
+
+	Editing::WaveformShape     _waveform_shape;
+	Editing::WaveformScale     _waveform_scale;
 };
 
 #endif /* __ardour_audio_streamview_h__ */