first pass on track mode switch; fixes to dangling region refs after capture; destroy...

[ardour.git] / gtk2_ardour / crossfade_edit.h

diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index cfb9ed35a0b4f001080a75e3d511c518c7b02287..ad0661c0369b27c37a0ced0c386509483c6e5057 100644 (file)
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -43,9 +43,9 @@ class CrossfadeEditor : public ArdourDialog
     };
 
     struct Preset : public list<PresetPoint> {
-       const gchar** xpm;
+       string xpm;
        
-       Preset (const gchar** x)
+       Preset (string x)
                : xpm (x) {}
     };
 
@@ -160,8 +160,10 @@ class CrossfadeEditor : public ArdourDialog
     
     void set (const ARDOUR::Curve& alist, WhichFade);
 
-    void make_waves (ARDOUR::AudioRegion&, WhichFade);
-    void peaks_ready (ARDOUR::AudioRegion* r, WhichFade);
+    sigc::connection peaks_ready_connection;
+
+    void make_waves (boost::shared_ptr<ARDOUR::AudioRegion>, WhichFade);
+    void peaks_ready (boost::shared_ptr<ARDOUR::AudioRegion> r, WhichFade);
     
     void _apply_to (ARDOUR::Crossfade* xf);
     void setup (ARDOUR::Crossfade*);