X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.h;h=598142099ed13e5efc2b317d93b6a719b9caf966;hb=8505c16057a074531a99728e730408151d7aafa4;hp=550632dc6770a37244611306c76e42825b4e8dca;hpb=4843c5d5cf52580a275dd6de0d47b927eb59bdc5;p=ardour.git

diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 550632dc67..598142099e 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -51,17 +51,17 @@ class RouteTimeAxisView;
 class AudioRegionView : public RegionView
 {
   public:
-	AudioRegionView (ArdourCanvas::Group *,
+	AudioRegionView (ArdourCanvas::Container *,
 			 RouteTimeAxisView&,
 			 boost::shared_ptr<ARDOUR::AudioRegion>,
 			 double initial_samples_per_pixel,
-			 Gdk::Color const & basic_color);
+			 uint32_t base_color);
 
-	AudioRegionView (ArdourCanvas::Group *,
+	AudioRegionView (ArdourCanvas::Container *,
 			 RouteTimeAxisView&,
 			 boost::shared_ptr<ARDOUR::AudioRegion>,
 			 double samples_per_pixel,
-			 Gdk::Color const & basic_color,
+			 uint32_t base_color,
 			 bool recording,
 			 TimeAxisViewItem::Visibility);
 
@@ -69,7 +69,7 @@ class AudioRegionView : public RegionView
 
 	~AudioRegionView ();
 
-	virtual void init (Gdk::Color const & base_color, bool wait_for_data);
+	void init (bool wait_for_data);
 
 	boost::shared_ptr<ARDOUR::AudioRegion> audio_region() const;
 
@@ -109,7 +109,7 @@ class AudioRegionView : public RegionView
 
 	void show_region_editor ();
 
-	virtual void entered (bool);
+	virtual void entered ();
 	virtual void exited ();
 
 	void thaw_after_trim ();
@@ -173,8 +173,6 @@ class AudioRegionView : public RegionView
 
 	double _amplitude_above_axis;
 
-	uint32_t fade_color;
-
 	void reset_fade_shapes ();
 	void reset_fade_in_shape ();
 	void reset_fade_out_shape ();
@@ -193,8 +191,6 @@ class AudioRegionView : public RegionView
 
 	void set_colors ();
         void set_waveform_colors ();
-        void set_one_waveform_color (ArdourCanvas::WaveView*);
-	void compute_colors (Gdk::Color const &);
 	void reset_width_dependent_items (double pixel_width);
 	void set_frame_color ();
 
@@ -209,6 +205,7 @@ private:
 
 	void parameter_changed (std::string const &);
 	void setup_waveform_visibility ();
+	void set_some_waveform_colors (std::vector<ArdourCanvas::WaveView*>& waves_to_color);
 
 	/** A ScopedConnection for each PeaksReady callback (one per channel).  Each member
 	 *  may be 0 if no connection exists.