Use ardour/session_state_utils.h in Editor::redisplay_snapshots

[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 233e1a7c9b050d3c2ca41d6ac1b6d42fe92e8398..c8734da59b7d8fecf9a65461297bfd2721481906 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;
@@ -63,7 +62,7 @@ class AudioRegionView : public RegionView
        
        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);
@@ -132,6 +131,8 @@ class AudioRegionView : public RegionView
     AudioRegionGainLine * gain_line;
 
     double _amplitude_above_axis;
+    double _y_position;
+    double _height;
 
     uint32_t _flags;
     uint32_t fade_color;
@@ -145,7 +146,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 ();
@@ -162,9 +162,13 @@ class AudioRegionView : public RegionView
     void reset_width_dependent_items (double pixel_width);
     void set_waveview_data_src();
     
-    void color_handler (ColorID, uint32_t);
+    void color_handler ();
 
     vector<GnomeCanvasWaveViewCache*> wave_caches;
+
+  private:
+
+    void setup_fade_handle_positions ();
 };
 
 #endif /* __gtk_ardour_audio_region_view_h__ */