Tidy.

[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 761c0eafd82c68f08ec03302f9baf04c98e25e8a..d93534cff79dfd1b3ea69244583bac6e5e4e8400 100644 (file)
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -33,7 +33,6 @@
 #include "enums.h"
 #include "waveview.h"
 #include "canvas.h"
-#include "color.h"
 
 namespace ARDOUR {
        class AudioRegion;
@@ -55,15 +54,26 @@ class AudioRegionView : public RegionView
                         double initial_samples_per_unit,
                         Gdk::Color& basic_color);
 
+       AudioRegionView (ArdourCanvas::Group *, 
+                    RouteTimeAxisView&,
+                    boost::shared_ptr<ARDOUR::AudioRegion>,
+                    double      samples_per_unit,
+                    Gdk::Color& 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 = false);
+       virtual void init (Gdk::Color& base_color, bool wait_for_data);
        
        boost::shared_ptr<ARDOUR::AudioRegion> audio_region() const;
        
-       void set_height (double);
+       void set_y_position_and_height (double, double);
+       void create_waves ();
+
        void set_samples_per_unit (double);
        
        void set_amplitude_above_axis (gdouble spp);
@@ -73,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 (Editing::WaveformShape);
+       void set_waveform_scale (Editing::WaveformScale);
        
        bool waveform_rectified() const { return _flags & WaveformRectified; }
        bool waveform_logscaled() const { return _flags & WaveformLogScaled; }
@@ -91,7 +101,7 @@ class AudioRegionView : public RegionView
        void region_changed (ARDOUR::Change);
        void envelope_active_changed ();
        
-       GhostRegion* add_ghost (AutomationTimeAxisView&);
+       GhostRegion* add_ghost (TimeAxisView&);
        
        void reset_fade_in_shape_width (nframes_t);
        void reset_fade_out_shape_width (nframes_t);
@@ -106,19 +116,29 @@ 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,
            WaveformRectified = 0x8,
            WaveformLogScaled = 0x10,
     };
+
+    vector<ArdourCanvas::WaveView *> waves;
+    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;
+    ArdourCanvas::Polygon*           fade_out_shape;
+    ArdourCanvas::SimpleRect*        fade_in_handle;
+    ArdourCanvas::SimpleRect*        fade_out_handle;
+    
+    AudioRegionGainLine * gain_line;
+
+    double _amplitude_above_axis;
+    double _y_position;
+
+    uint32_t _flags;
+    uint32_t fade_color;
     
     void reset_fade_shapes ();
     void reset_fade_in_shape ();
@@ -129,11 +149,10 @@ 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 ();
 
-    void create_waves ();
     void create_one_wave (uint32_t, bool);
     void manage_zero_line ();
     void peaks_ready_handler (uint32_t);
@@ -144,24 +163,15 @@ class AudioRegionView : public RegionView
     void compute_colors (Gdk::Color&);
     void reset_width_dependent_items (double pixel_width);
     void set_waveview_data_src();
-    
-    void color_handler (ColorID, uint32_t);
+    void set_frame_color ();
+
+    void color_handler ();
 
     vector<GnomeCanvasWaveViewCache*> wave_caches;
-    vector<ArdourCanvas::WaveView *>  waves;
-    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;
-    ArdourCanvas::Polygon*            fade_out_shape;
-    ArdourCanvas::SimpleRect*         fade_in_handle;
-    ArdourCanvas::SimpleRect*         fade_out_handle;
-    AudioRegionGainLine*              gain_line;
 
-    double _amplitude_above_axis;
+  private:
 
-    uint32_t _flags;
-    uint32_t fade_color;
+    void setup_fade_handle_positions ();
 };
 
 #endif /* __gtk_ardour_audio_region_view_h__ */