most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet

git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 2 deletions

diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index 9e4db3be88..f7f607393f 100644
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -62,15 +62,20 @@ class CrossfadeEditor : public ArdourDialog
 	};
 	
 	struct Preset : public list<PresetPoint> {
+	    const char* name;
 	    const char* image_name;
-	    
-	    Preset (const char* x) : image_name (x) {}
+
+	    Preset (const char* n, const char* x) : name (n), image_name (x) {}
 	};
 	
 	typedef list<Preset*> Presets;
 	
 	static Presets* fade_in_presets;
 	static Presets* fade_out_presets;
+
+  protected:
+	bool on_key_press_event (GdkEventKey*);
+	bool on_key_release_event (GdkEventKey*);
 	
   private:
 	boost::shared_ptr<ARDOUR::Crossfade> xfade;