Merge with 2.0-ongoing R3071.

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

1 files changed, 10 insertions, 0 deletions

diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h
index 7c163245e7..9042dc4f6b 100644
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -109,6 +109,13 @@ class Keyboard : public sigc::trackable, PBD::Stateful
 	static void magic_widget_grab_focus ();
 	static void magic_widget_drop_focus ();
 
+	static void setup_keybindings ();
+	static void save_keybindings ();
+	static bool load_keybindings (std::string path);
+	static void set_can_save_keybindings (bool yn);
+	static std::string current_binding_name () { return _current_binding_name; }
+	static std::map<std::string,std::string> binding_files;
+
   private:
 	static Keyboard* _the_keyboard;
 
@@ -121,6 +128,9 @@ class Keyboard : public sigc::trackable, PBD::Stateful
 	static guint     delete_mod;
 	static guint     snap_mod;
 	static Gtk::Window* current_window;
+	static std::string user_keybindings_path;
+	static bool can_save_keybindings;
+	static std::string _current_binding_name;
 
 	static gint _snooper (GtkWidget*, GdkEventKey*, gpointer);
 	gint snooper (GtkWidget*, GdkEventKey*);