diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-12 11:28:50 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-12 11:28:50 -0400 |
| commit | bb826f4beebfcedc50570b818c305560d2233e47 (patch) | |
| tree | 1484460f914e64fdbdce58230ffe7934bc0761f4 /gtk2_ardour/actions.h | |
| parent | 8c5cff60912c7e0a7256f635641399500d8d00d9 (diff) | |
| parent | f85b362351a5f9167f93b6988f2c8a4c7e03a33c (diff) | |
incomplete merge of master into windows (requires upcoming changes to master to be complete)
Diffstat (limited to 'gtk2_ardour/actions.h')
| -rw-r--r-- | gtk2_ardour/actions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h index 20c0532636..f3fba51de5 100644 --- a/gtk2_ardour/actions.h +++ b/gtk2_ardour/actions.h @@ -46,8 +46,8 @@ namespace ActionManager { extern std::vector<Glib::RefPtr<Gtk::Action> > range_sensitive_actions; extern std::vector<Glib::RefPtr<Gtk::Action> > transport_sensitive_actions; - extern std::vector<Glib::RefPtr<Gtk::Action> > jack_sensitive_actions; - extern std::vector<Glib::RefPtr<Gtk::Action> > jack_opposite_sensitive_actions; + extern std::vector<Glib::RefPtr<Gtk::Action> > engine_sensitive_actions; + extern std::vector<Glib::RefPtr<Gtk::Action> > engine_opposite_sensitive_actions; extern std::vector<Glib::RefPtr<Gtk::Action> > edit_point_in_region_sensitive_actions; extern void map_some_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*get)() const); |