Another similar fix for use of an uninitialized variable.

[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 01ec7c95ce7ef30ef6757928df2b03b4e632cca1..826f58decec037be87a843f34b4faa68afb20af1 100644 (file)
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -24,10 +24,9 @@
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 #include <sigc++/signal.h>
-#include <ardour/audioregion.h>
+#include "ardour/audioregion.h"
 
 #include "region_view.h"
-#include "route_time_axis.h"
 #include "time_axis_view_item.h"
 #include "automation_line.h"
 #include "enums.h"
@@ -44,6 +43,7 @@ class AudioRegionGainLine;
 class AudioRegionEditor;
 class GhostRegion;
 class AutomationTimeAxisView;
+class RouteTimeAxisView;
 
 class AudioRegionView : public RegionView
 {
@@ -52,17 +52,28 @@ class AudioRegionView : public RegionView
                         RouteTimeAxisView&,
                         boost::shared_ptr<ARDOUR::AudioRegion>,
                         double initial_samples_per_unit,
-                        Gdk::Color& basic_color);
+                        Gdk::Color const & basic_color);
 
-        AudioRegionView (const AudioRegionView& other);
+       AudioRegionView (ArdourCanvas::Group *, 
+                        RouteTimeAxisView&,
+                        boost::shared_ptr<ARDOUR::AudioRegion>,
+                        double samples_per_unit,
+                        Gdk::Color const & basic_color,
+                        bool recording,
+                        TimeAxisViewItem::Visibility);
+
+       AudioRegionView (const AudioRegionView& other);
+       AudioRegionView (const AudioRegionView& other, boost::shared_ptr<ARDOUR::AudioRegion>);
 
        ~AudioRegionView ();
        
-       virtual void init (Gdk::Color& base_color, bool wait_for_data);
+       virtual void init (Gdk::Color const & base_color, bool wait_for_data);
        
        boost::shared_ptr<ARDOUR::AudioRegion> audio_region() const;
        
-       void set_y_position_and_height (double, double);
+       void create_waves ();
+
+       void set_height (double);
        void set_samples_per_unit (double);
        
        void set_amplitude_above_axis (gdouble spp);
@@ -72,8 +83,8 @@ 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);
+       void set_waveform_shape (ARDOUR::WaveformShape);
+       void set_waveform_scale (ARDOUR::WaveformScale);
        
        bool waveform_rectified() const { return _flags & WaveformRectified; }
        bool waveform_logscaled() const { return _flags & WaveformLogScaled; }
@@ -95,6 +106,8 @@ class AudioRegionView : public RegionView
        void reset_fade_in_shape_width (nframes_t);
        void reset_fade_out_shape_width (nframes_t);
 
+       void set_fade_visibility (bool);
+
        virtual void entered ();
        virtual void exited ();
        
@@ -105,13 +118,6 @@ class AudioRegionView : public RegionView
        to the TimeAxisViewItem parent class
     */
     
-    AudioRegionView (ArdourCanvas::Group *, 
-                    RouteTimeAxisView&,
-                    boost::shared_ptr<ARDOUR::AudioRegion>,
-                    double      samples_per_unit,
-                    Gdk::Color& basic_color,
-                    TimeAxisViewItem::Visibility);
-    
     enum Flags {
            EnvelopeVisible = 0x1,
            WaveformVisible = 0x4,
@@ -119,8 +125,8 @@ class AudioRegionView : public RegionView
            WaveformLogScaled = 0x10,
     };
 
-    vector<ArdourCanvas::WaveView *> waves;
-    vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves()
+    std::vector<ArdourCanvas::WaveView *> waves;
+    std::vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves()
     ArdourCanvas::Polygon*           sync_mark; ///< polgyon for sync position 
     ArdourCanvas::SimpleLine*        zero_line;
     ArdourCanvas::Polygon*           fade_in_shape;
@@ -131,8 +137,6 @@ class AudioRegionView : public RegionView
     AudioRegionGainLine * gain_line;
 
     double _amplitude_above_axis;
-    double _y_position;
-    double _height;
 
     uint32_t _flags;
     uint32_t fade_color;
@@ -150,7 +154,6 @@ class AudioRegionView : public RegionView
     void region_scale_amplitude_changed ();
        void region_renamed ();
 
-    void create_waves ();
     void create_one_wave (uint32_t, bool);
     void manage_zero_line ();
     void peaks_ready_handler (uint32_t);
@@ -158,14 +161,14 @@ class AudioRegionView : public RegionView
     void store_flags ();
 
     void set_colors ();
-    void compute_colors (Gdk::Color&);
+    void compute_colors (Gdk::Color const &);
     void reset_width_dependent_items (double pixel_width);
     void set_waveview_data_src();
     void set_frame_color ();
 
     void color_handler ();
 
-    vector<GnomeCanvasWaveViewCache*> wave_caches;
+    std::vector<GnomeCanvasWaveViewCache*> wave_caches;
 
   private: