X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.h;h=1facc652a9212974acd8c64e3ead68366bf073d3;hb=13151b43f058ae97408a39b4c5160974c512c9ae;hp=977c0e3aae61311a097a1b312647706968980f6a;hpb=ef6b25432d9c46d71b08c0f7d5f2686df428c4e8;p=ardour.git

diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 977c0e3aae..1facc652a9 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -55,13 +55,15 @@ class AudioRegionView : public RegionView
 			 double initial_samples_per_unit,
 			 Gdk::Color& basic_color);
 
+        AudioRegionView (const AudioRegionView& other);
+
 	~AudioRegionView ();
 	
 	virtual void init (Gdk::Color& base_color, bool wait_for_data = false);
 	
 	boost::shared_ptr<ARDOUR::AudioRegion> audio_region() const;
 	
-	void set_height (double);
+	void set_y_position_and_height (double, double);
 	void set_samples_per_unit (double);
 	
 	void set_amplitude_above_axis (gdouble spp);
@@ -72,8 +74,10 @@ class AudioRegionView : public RegionView
 	void set_envelope_visible (bool);
 	void set_waveform_visible (bool yn);
 	void set_waveform_shape (WaveformShape);
+	void set_waveform_scale (WaveformScale);
 	
 	bool waveform_rectified() const { return _flags & WaveformRectified; }
+	bool waveform_logscaled() const { return _flags & WaveformLogScaled; }
 	bool waveform_visible()   const { return _flags & WaveformVisible; }
 	bool envelope_visible()   const { return _flags & EnvelopeVisible; }
 	
@@ -91,10 +95,6 @@ class AudioRegionView : public RegionView
 	
 	void reset_fade_in_shape_width (nframes_t);
 	void reset_fade_out_shape_width (nframes_t);
-	void set_fade_in_active (bool);
-	void set_fade_out_active (bool);
-	void set_fade_in_shape (ARDOUR::AudioRegion::FadeShape);
-	void set_fade_out_shape (ARDOUR::AudioRegion::FadeShape);
 
 	virtual void entered ();
 	virtual void exited ();
@@ -116,7 +116,8 @@ class AudioRegionView : public RegionView
     enum Flags {
 	    EnvelopeVisible = 0x1,
 	    WaveformVisible = 0x4,
-	    WaveformRectified = 0x8
+	    WaveformRectified = 0x8,
+	    WaveformLogScaled = 0x10,
     };
 
     vector<ArdourCanvas::WaveView *> waves;
@@ -131,6 +132,8 @@ class AudioRegionView : public RegionView
     AudioRegionGainLine * gain_line;
 
     double _amplitude_above_axis;
+    double _y_position;
+    double _height;
 
     uint32_t _flags;
     uint32_t fade_color;
@@ -144,7 +147,6 @@ class AudioRegionView : public RegionView
     void fade_out_active_changed ();
 
     void region_resized (ARDOUR::Change);
-    void region_moved (void *);
     void region_muted ();
     void region_scale_amplitude_changed ();
 	void region_renamed ();
@@ -160,10 +162,14 @@ class AudioRegionView : public RegionView
     void compute_colors (Gdk::Color&);
     void reset_width_dependent_items (double pixel_width);
     void set_waveview_data_src();
-
-    vector<GnomeCanvasWaveViewCache*> wave_caches;
     
     void color_handler (ColorID, uint32_t);
+
+    vector<GnomeCanvasWaveViewCache*> wave_caches;
+
+  private:
+
+    void setup_fade_handle_positions ();
 };
 
 #endif /* __gtk_ardour_audio_region_view_h__ */