add VU and IEC meter DSP (from jmeters)

[ardour.git] / gtk2_ardour / audio_region_view.h

diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 827de1a3dcc8b42a4b3a796aa76746efe00ad40c..353d0dc93777aeccf0b58d2c123df5b81dfc622b 100644 (file)
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -49,13 +49,13 @@ class AudioRegionView : public RegionView
        AudioRegionView (ArdourCanvas::Group *,
                         RouteTimeAxisView&,
                         boost::shared_ptr<ARDOUR::AudioRegion>,
-                        double initial_frames_per_pixel,
+                        double initial_samples_per_pixel,
                         Gdk::Color const & basic_color);
 
        AudioRegionView (ArdourCanvas::Group *,
                         RouteTimeAxisView&,
                         boost::shared_ptr<ARDOUR::AudioRegion>,
-                        double frames_per_pixel,
+                        double samples_per_pixel,
                         Gdk::Color const & basic_color,
                         bool recording,
                         TimeAxisViewItem::Visibility);
@@ -71,7 +71,7 @@ class AudioRegionView : public RegionView
        void create_waves ();
 
        void set_height (double);
-       void set_frames_per_pixel (double);
+       void set_samples_per_pixel (double);
 
        void set_amplitude_above_axis (gdouble spp);
 
@@ -112,8 +112,8 @@ class AudioRegionView : public RegionView
        void drag_start ();
        void drag_end ();
 
-       void redraw_start_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, framecnt_t);
-       void redraw_end_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, framecnt_t);
+        void redraw_start_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, framecnt_t, ArdourCanvas::Points&, double);
+        void redraw_end_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, framecnt_t, ArdourCanvas::Points&, double);
        void redraw_start_xfade ();
        void redraw_end_xfade ();
        
@@ -189,6 +189,8 @@ class AudioRegionView : public RegionView
        void peaks_ready_handler (uint32_t);
 
        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 ();
@@ -206,6 +208,7 @@ private:
        void setup_waveform_visibility ();
        void setup_waveform_shape ();
        void setup_waveform_scale ();
+       void setup_waveform_clipping ();
 
        /** A ScopedConnection for each PeaksReady callback (one per channel).  Each member
         *  may be 0 if no connection exists.