Merge branch 'master' into windows

[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 ad5107c95303417eeca173086c9e8a2601ba96e4..7c6d6b88f24311bbfe53a08b68ac691a7a939dc2 100644 (file)
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -19,6 +19,10 @@
 #ifndef __gtk_ardour_audio_region_view_h__
 #define __gtk_ardour_audio_region_view_h__
 
+#ifdef interface
+#undef interface
+#endif
+
 #include <vector>
 
 #include <libgnomecanvasmm.h>
@@ -80,13 +84,6 @@ class AudioRegionView : public RegionView
        void unhide_envelope ();           ///< Dangerous!
 
        void update_envelope_visibility ();
-       void set_waveform_visible (bool yn);
-       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; }
-       bool waveform_visible()   const { return _flags & WaveformVisible; }
 
        void add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event);
        void remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event);
@@ -98,11 +95,11 @@ class AudioRegionView : public RegionView
 
        GhostRegion* add_ghost (TimeAxisView&);
 
-       void reset_fade_in_shape_width (framecnt_t);
-       void reset_fade_out_shape_width (framecnt_t);
+       void reset_fade_in_shape_width (boost::shared_ptr<ARDOUR::AudioRegion> ar, framecnt_t);
+       void reset_fade_out_shape_width (boost::shared_ptr<ARDOUR::AudioRegion> ar, framecnt_t);
 
-       void show_fade_line(framepos_t pos);
-       void hide_fade_line();
+       framepos_t get_fade_in_shape_width ();
+       framepos_t get_fade_out_shape_width ();
 
        void set_fade_visibility (bool);
        void update_coverage_frames (LayerDisplay);
@@ -126,7 +123,19 @@ class AudioRegionView : public RegionView
        void redraw_end_xfade ();
        
        void hide_xfades ();
+       void hide_start_xfade ();
+       void hide_end_xfade ();
        void show_xfades ();
+       void show_start_xfade ();
+       void show_end_xfade ();
+
+       bool start_xfade_visible () const {
+               return _start_xfade_visible;
+       }
+
+       bool end_xfade_visible () const {
+               return _end_xfade_visible;
+       }
 
   protected:
 
@@ -151,21 +160,21 @@ class AudioRegionView : public RegionView
        ArdourCanvas::Polygon*           fade_out_shape;
        ArdourCanvas::SimpleRect*        fade_in_handle; ///< fade in handle, or 0
        ArdourCanvas::SimpleRect*        fade_out_handle; ///< fade out handle, or 0
-       ArdourCanvas::SimpleLine*        fade_position_line;
 
        ArdourCanvas::Line *start_xfade_in;
        ArdourCanvas::Line *start_xfade_out;
        ArdourCanvas::SimpleRect* start_xfade_rect;
+       bool _start_xfade_visible;
 
        ArdourCanvas::Line *end_xfade_in;
        ArdourCanvas::Line *end_xfade_out;
        ArdourCanvas::SimpleRect* end_xfade_rect;
+       bool _end_xfade_visible;
 
        boost::shared_ptr<AudioRegionGainLine> gain_line;
 
        double _amplitude_above_axis;
 
-       uint32_t _flags;
        uint32_t fade_color;
 
        void reset_fade_shapes ();
@@ -183,8 +192,6 @@ class AudioRegionView : public RegionView
 
        void create_one_wave (uint32_t, bool);
        void peaks_ready_handler (uint32_t);
-       void set_flags (XMLNode *);
-       void store_flags ();
 
        void set_colors ();
        void compute_colors (Gdk::Color const &);
@@ -203,13 +210,20 @@ class AudioRegionView : public RegionView
 private:
        void setup_fade_handle_positions ();
 
+       void parameter_changed (std::string const &);
+       void setup_waveform_visibility ();
+       void setup_waveform_shape ();
+       void setup_waveform_scale ();
+
        /** A ScopedConnection for each PeaksReady callback (one per channel).  Each member
         *  may be 0 if no connection exists.
         */
        std::vector<PBD::ScopedConnection*> _data_ready_connections;
 
-       /** RegionViews that we hid the xfades for at the start of the current drag */
-       std::list<AudioRegionView*> _hidden_xfades;
+       /** RegionViews that we hid the xfades for at the start of the current drag;
+        *  first list is for start xfades, second list is for end xfades.
+        */
+       std::pair<std::list<AudioRegionView*>, std::list<AudioRegionView*> > _hidden_xfades;
 };
 
 #endif /* __gtk_ardour_audio_region_view_h__ */