diff options
author | Carl Hetherington <carl@carlh.net> | 2009-05-14 00:13:27 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-05-14 00:13:27 +0000 |
commit | 015fc7b39fab97cee1875231694adce43155ceb5 (patch) | |
tree | 76dded18cc9441e7325af999358ab3a3235cdb1e /gtk2_ardour/actions.h | |
parent | 0569107ddc0d2a8df6ca0a2c8cc16ebe8f3dee99 (diff) |
First stage of options rework.
- Split Configuration into RCConfiguration and SessionConfiguration;
the first for options which are saved to .rc files and the second
for options which are saved in a session file.
- Move some options from the old `master' Configuration object into
SessionConfiguration; this needs more refinement.
- Reflect many RCConfiguration options in an expanded Edit->Preferences
dialog; my intention is to remove the corresponding menu items
eventually.
git-svn-id: svn://localhost/ardour2/branches/3.0@5075 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/actions.h')
-rw-r--r-- | gtk2_ardour/actions.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h index c7175d1891..3a20f4d542 100644 --- a/gtk2_ardour/actions.h +++ b/gtk2_ardour/actions.h @@ -27,7 +27,7 @@ #include <gtkmm/actiongroup.h> #include <gtkmm/accelkey.h> -#include "ardour/configuration.h" +#include "ardour/rc_configuration.h" namespace Gtk { class UIManager; @@ -59,9 +59,10 @@ class ActionManager static std::vector<Glib::RefPtr<Gtk::Action> > jack_opposite_sensitive_actions; static std::vector<Glib::RefPtr<Gtk::Action> > edit_point_in_region_sensitive_actions; - static void map_some_state (const char* group, const char* action, bool (ARDOUR::Configuration::*get)() const); - static void toggle_config_state (const char* group, const char* action, bool (ARDOUR::Configuration::*set)(bool), bool (ARDOUR::Configuration::*get)(void) const); - static void toggle_config_state (const char* group, const char* action, sigc::slot<void> theSlot); + static void map_some_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*get)() const); + static void map_some_state (const char* group, const char* action, sigc::slot<bool>); + static void toggle_config_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*set)(bool), bool (ARDOUR::RCConfiguration::*get)(void) const); + static void toggle_config_state_foo (const char* group, const char* action, sigc::slot<bool, bool>, sigc::slot<bool>); static void set_sensitive (std::vector<Glib::RefPtr<Gtk::Action> >& actions, bool); |