fixup previous commit for OS X

[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 9dc7e507a14aa6526a389c38bcc19efb8fc50696..773e136952ee398629bb8943125d08a959a9d1af 100644 (file)
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -35,7 +35,7 @@
 
 namespace ARDOUR {
        class AudioRegion;
-       class PeakData;
+       struct PeakData;
 };
 
 class AudioTimeAxisView;
@@ -79,7 +79,7 @@ class AudioRegionView : public RegionView
        void temporarily_hide_envelope (); ///< Dangerous!
        void unhide_envelope ();           ///< Dangerous!
 
-       void set_envelope_visible (bool);
+       void update_envelope_visibility ();
        void set_waveform_visible (bool yn);
        void set_waveform_shape (ARDOUR::WaveformShape);
        void set_waveform_scale (ARDOUR::WaveformScale);
@@ -117,6 +117,17 @@ class AudioRegionView : public RegionView
 
        void thaw_after_trim ();
 
+       void drag_start ();
+       void drag_end ();
+
+       void redraw_start_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, framecnt_t);
+       void redraw_end_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, framecnt_t);
+       void redraw_start_xfade ();
+       void redraw_end_xfade ();
+       
+       void hide_xfades ();
+       void show_xfades ();
+
   protected:
 
        /* this constructor allows derived types
@@ -142,6 +153,14 @@ class AudioRegionView : public RegionView
        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;
+
+       ArdourCanvas::Line *end_xfade_in;
+       ArdourCanvas::Line *end_xfade_out;
+       ArdourCanvas::SimpleRect* end_xfade_rect;
+
        boost::shared_ptr<AudioRegionGainLine> gain_line;
 
        double _amplitude_above_axis;
@@ -179,8 +198,9 @@ class AudioRegionView : public RegionView
 
        void transients_changed();
 
-private:
+       AutomationLine::VisibleAspects automation_line_visibility () const;
 
+private:
        void setup_fade_handle_positions ();
 
        /** A ScopedConnection for each PeaksReady callback (one per channel).  Each member