use new action map API instead of ActionManager::get_action
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 7 Dec 2018 21:07:13 +0000 (16:07 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 10 Dec 2018 13:34:01 +0000 (08:34 -0500)
gtk2_ardour/ardour_ui.h

index dd31e2bbd4c81ac924fbd0a8796d0f622a0e244a..535a84ee7613ec9784583b0cbe73de19d4b09ddc 100644 (file)
@@ -167,7 +167,7 @@ namespace ArdourWidgets {
 
 #define MAX_LUA_ACTION_SCRIPTS 12
 
-class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr, public TransportControlProvider
+class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr, public TransportControlProvider, public Gtkmm2ext::ActionMapOwner
 {
 public:
        ARDOUR_UI (int *argcp, char **argvp[], const char* localedir);
@@ -356,8 +356,6 @@ public:
        bool tabbed_window_state_event_handler (GdkEventWindowState*, void* object);
        bool key_event_handler (GdkEventKey*, Gtk::Window* window);
 
-       Gtkmm2ext::ActionMap global_actions;
-
        ARDOUR::PresentationInfo::order_t translate_order (RouteDialogs::InsertAt);
 
        std::map<std::string, std::string> route_setup_info (const std::string& script_path);