Merged with trunk R1612.

[ardour.git] / gtk2_ardour / crossfade_edit.h

diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index 3c9a6a13c10a9f3248cc22c72dded9fd17222bf9..4f2a617d9205bbabd8308a04dbe5267889733f7c 100644 (file)
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -43,10 +43,9 @@ class CrossfadeEditor : public ArdourDialog
        };
        
        struct Preset : public list<PresetPoint> {
-           string xpm;
+           const char* image_name;
            
-           Preset (string x)
-                   : xpm (x) {}
+           Preset (const char* x) : image_name (x) {}
        };
        
        typedef list<Preset*> Presets;