From 1cca368ef43d49eb0a0918cd9dc6987473e725d1 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 31 Jul 2007 17:28:50 +0000
Subject: fix up user keybindings saving, and bump to 2.0.4

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2201 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 SConstruct                          |  2 +-
 gtk2_ardour/ardour_ui.cc            |  7 ++++++-
 gtk2_ardour/ardour_ui.h             |  1 +
 gtk2_ardour/ardour_ui_dependents.cc |  2 ++
 libs/ardour/ardour/plugin.h         | 10 ++++++++--
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index 036f99c683..5f81a1739c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -16,7 +16,7 @@ import SCons.Node.FS
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
-ardour_version = '2.0.3'
+ardour_version = '2.0.4'
 
 subst_dict = { }
 
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index c8a67ed7ec..ac9df314b1 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -181,7 +181,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	_will_create_new_session_automatically = false;
 	session_loaded = false;
 	last_speed_displayed = -1.0f;
+
 	keybindings_path = ARDOUR::find_config_file ("ardour.bindings");
+	/* all changes go to the user directory */
+	user_keybindings_path = get_user_ardour_path ();
+	user_keybindings_path += '/';
+	user_keybindings_path += "ardour.bindings";
 
 	can_save_keybindings = false;
 
@@ -2659,7 +2664,7 @@ void
 ARDOUR_UI::save_keybindings ()
 {
 	if (can_save_keybindings) {
-		AccelMap::save (keybindings_path);
+		AccelMap::save (user_keybindings_path);
 	} 
 }
 
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 628206f70e..4f2d78c736 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -576,6 +576,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void we_have_dependents ();
 	
 	std::string keybindings_path;
+	std::string user_keybindings_path;
 
 	void setup_keybindings ();
 	void setup_session_options ();
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 5617cdbc4f..d9d8396d2c 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -90,6 +90,8 @@ ARDOUR_UI::setup_keybindings ()
 	GtkAccelMap* accelmap = gtk_accel_map_get();
 	g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, this);
 
+	
+
 }
 
 void
diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index 256549526e..75ede426bc 100644
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -53,8 +53,14 @@ class PluginInfo {
   public:
 	PluginInfo () { }
 	PluginInfo (const PluginInfo &o)
-		: name(o.name), n_inputs(o.n_inputs), n_outputs(o.n_outputs),
-		path (o.path), unique_id(o.unique_id), index(o.index) {}
+		: name(o.name),
+		category (o.category), 
+		creator (o.creator),
+		path (o.path), 
+		n_inputs(o.n_inputs), 
+		n_outputs(o.n_outputs),
+		unique_id(o.unique_id), 
+		index(o.index) {}
 	virtual ~PluginInfo () { }
 
 	string name;
-- 
cgit v1.2.3