summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui_dependents.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2005-11-29 22:48:54 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2005-11-29 22:48:54 +0000
commitad8028554827f9e72dd978e218a3d9538e30d8de (patch)
tree800b8e3066f01328a7ebc72a892abccb727b9861 /gtk2_ardour/ardour_ui_dependents.cc
parent0f5dc815418c20de2658c27e59a7ef9bc451907d (diff)
more fixes to get things moving along
git-svn-id: svn://localhost/trunk/ardour2@151 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui_dependents.cc')
-rw-r--r--gtk2_ardour/ardour_ui_dependents.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 45a047f1d1..8240073da9 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -23,6 +23,9 @@
*/
#include <cstdio>
+
+#include <gtkmm/accelmap.h>
+
#include <pbd/error.h>
#include "ardour_ui.h"
#include "public_editor.h"
@@ -32,7 +35,7 @@
#include "i18n.h"
using namespace sigc;
-
+using namespace Gtk;
namespace ARDOUR {
class Session;
@@ -52,7 +55,6 @@ ARDOUR_UI::shutdown ()
void
ARDOUR_UI::we_have_dependents ()
{
- cerr << "have dependents\n";
setup_keybindings ();
}
@@ -62,6 +64,12 @@ ARDOUR_UI::setup_keybindings ()
install_actions ();
editor->register_actions ();
RedirectBox::register_actions ();
+
+ try {
+ AccelMap::load (ARDOUR::find_config_file ("ardour.bindings"));
+ } catch (...) {
+ error << "ardour key bindings file not found" << endmsg;
+ }
}
void