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 6f6d76d06b4e0ea55c471170317a5adc31468223..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>
@@ -91,8 +95,8 @@ 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);
 
        framepos_t get_fade_in_shape_width ();
        framepos_t get_fade_out_shape_width ();