Do not try to restore Route solo state after clearing all solo state

[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 11be83dc44cd58492933eb8db679af5edf47204e..646d044c07be2cbd28ff741f690716cf658d864c 100644 (file)
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -51,13 +51,13 @@ class RouteTimeAxisView;
 class AudioRegionView : public RegionView
 {
   public:
-       AudioRegionView (ArdourCanvas::Layout *,
+       AudioRegionView (ArdourCanvas::Container *,
                         RouteTimeAxisView&,
                         boost::shared_ptr<ARDOUR::AudioRegion>,
                         double initial_samples_per_pixel,
                         uint32_t base_color);
 
-       AudioRegionView (ArdourCanvas::Layout *,
+       AudioRegionView (ArdourCanvas::Container *,
                         RouteTimeAxisView&,
                         boost::shared_ptr<ARDOUR::AudioRegion>,
                         double samples_per_pixel,
@@ -74,6 +74,7 @@ class AudioRegionView : public RegionView
        boost::shared_ptr<ARDOUR::AudioRegion> audio_region() const;
 
        void create_waves ();
+       void delete_waves ();
 
        void set_height (double);
        void set_samples_per_pixel (double);
@@ -109,7 +110,7 @@ class AudioRegionView : public RegionView
 
        void show_region_editor ();
 
-       virtual void entered (bool);
+       virtual void entered ();
        virtual void exited ();
 
        void thaw_after_trim ();
@@ -121,7 +122,7 @@ class AudioRegionView : public RegionView
         void redraw_end_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, framecnt_t, ArdourCanvas::Points&, double, double, double);
        void redraw_start_xfade ();
        void redraw_end_xfade ();
-       
+
        void hide_xfades ();
        void hide_start_xfade ();
        void hide_end_xfade ();
@@ -160,6 +161,9 @@ class AudioRegionView : public RegionView
        ArdourCanvas::Rectangle*        fade_out_handle; ///< fade out handle, or 0
        ArdourCanvas::Rectangle*        fade_in_trim_handle; ///< fade in trim handle, or 0
        ArdourCanvas::Rectangle*        fade_out_trim_handle; ///< fade out trim handle, or 0
+       ArdourCanvas::Rectangle*        pending_peak_data;
+
+       static Cairo::RefPtr<Cairo::Pattern> pending_peak_pattern;
 
        ArdourCanvas::XFadeCurve* start_xfade_curve;
        ArdourCanvas::Rectangle*  start_xfade_rect;