more show() stuff, and replaced strip->show_all(); untill its actually finished

[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 1d51cb7172b852ab94926574aa387e2ba6aa6cfb..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;
@@ -55,13 +54,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);
@@ -93,10 +94,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 ();
@@ -134,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;
@@ -147,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 ();
@@ -163,10 +161,14 @@ 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 ();
 
     vector<GnomeCanvasWaveViewCache*> wave_caches;
-    
-    void color_handler (ColorID, uint32_t);
+
+  private:
+
+    void setup_fade_handle_positions ();
 };
 
 #endif /* __gtk_ardour_audio_region_view_h__ */