fix reversion of keyboard focus from gain display editing widget in both mixer and...

[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 5c4769d412fa71c8a9375451919143bb2393406a..85a1b1d8698b42ae2e487c5b37bd22bb7811bedc 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,14 +79,7 @@ class AudioRegionView : public RegionView
        void temporarily_hide_envelope (); ///< Dangerous!
        void unhide_envelope ();           ///< Dangerous!
 
-       void set_envelope_visible (bool);
-       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 update_envelope_visibility ();
 
        void add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event);
        void remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event);
@@ -101,6 +94,9 @@ class AudioRegionView : public RegionView
        void reset_fade_in_shape_width (framecnt_t);
        void reset_fade_out_shape_width (framecnt_t);
 
+       framepos_t get_fade_in_shape_width ();
+       framepos_t get_fade_out_shape_width ();
+
        void show_fade_line(framepos_t pos);
        void hide_fade_line();
 
@@ -124,6 +120,21 @@ class AudioRegionView : public RegionView
        void redraw_end_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, framecnt_t);
        void redraw_start_xfade ();
        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:
 
@@ -153,16 +164,17 @@ class AudioRegionView : public RegionView
        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 ();
@@ -180,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 &);
@@ -195,13 +205,25 @@ class AudioRegionView : public RegionView
 
        void transients_changed();
 
+       AutomationLine::VisibleAspects automation_line_visibility () const;
+
 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;
+        *  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__ */