add API to create [tar.xz] archives

[ardour.git] / libs / surfaces / faderport / gui.cc

diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc
index acd4d3ee5d608e516b40fdd18a8fdfceea37446b..160ba0ec87fb199a8096a812671bdb4959a3eca1 100644 (file)
--- a/libs/surfaces/faderport/gui.cc
+++ b/libs/surfaces/faderport/gui.cc
@@ -25,7 +25,7 @@
 #include "pbd/strsplit.h"
 #include "pbd/file_utils.h"
 
-#include "gtkmm2ext/actions.h"
+#include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"
 #include "gtkmm2ext/utils.h"
@@ -36,7 +36,7 @@
 #include "faderport.h"
 #include "gui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;
@@ -357,12 +357,14 @@ FPGUI::build_available_action_menu ()
        vector<string> labels;
        vector<string> tooltips;
        vector<string> keys;
-       vector<AccelKey> bindings;
+       vector<Glib::RefPtr<Gtk::Action> > actions;
+
+       Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+
        typedef std::map<string,TreeIter> NodeMap;
        NodeMap nodes;
        NodeMap::iterator r;
 
-       ActionManager::get_all_actions (labels, paths, tooltips, keys, bindings);
 
        vector<string>::iterator k;
        vector<string>::iterator p;
@@ -517,7 +519,7 @@ FPGUI::build_mix_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs)
 {
        vector<pair<string,string> > actions;
 
-       actions.push_back (make_pair (string (_("Toggle Editor & Mixer Windows")), string (X_("Common/toggle-editor-mixer"))));
+       actions.push_back (make_pair (string (_("Toggle Editor & Mixer Windows")), string (X_("Common/toggle-editor-and-mixer"))));
        actions.push_back (make_pair (string (_("Show/Hide Mixer list")), string (X_("Common/ToggleMixerList"))));
        actions.push_back (make_pair (string("Toggle Meterbridge"), string(X_("Common/toggle-meterbridge"))));
        actions.push_back (make_pair (string (_("Show/Hide Editor mixer strip")), string (X_("Editor/show-editor-mixer"))));
@@ -565,11 +567,11 @@ FPGUI::build_foot_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs)
 
        actions.push_back (make_pair (string("Toggle Roll"), string(X_("Transport/ToggleRoll"))));
        actions.push_back (make_pair (string("Toggle Rec-Enable"), string(X_("Transport/Record"))));
+       actions.push_back (make_pair (string("Toggle Roll+Rec"), string(X_("Transport/record-roll"))));
+       actions.push_back (make_pair (string("Toggle Loop"), string(X_("Transport/Loop"))));
+       actions.push_back (make_pair (string("Toggle Click"), string(X_("Transport/ToggleClick"))));
 
-//     actions.push_back (make_pair (string (_("Zoom In")), string (X_("Editor/temporal-zoom-in"))));
-//     actions.push_back (make_pair (string (_("Zoom Out")), string (X_("Editor/temporal-zoom-out"))));
-
-       build_action_combo (cb, actions, FaderPort::Proj, bs);
+       build_action_combo (cb, actions, FaderPort::Footswitch, bs);
 }
 
 bool