summaryrefslogtreecommitdiff
path: root/gtk2_ardour/actions.cc
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2015-01-02 21:44:54 +0700
committerPaul Davis <paul@linuxaudiosystems.com>2015-09-16 16:55:17 -0400
commit6b019a495359909a3d1a778ca10cd7df7cc302cc (patch)
tree75746a1e4a3daecd8c9cd0996b3c63d7d1657be4 /gtk2_ardour/actions.cc
parent45d487f16e8be102bfcdefcd950a69c886495b94 (diff)
Move UIConfiguration Singleton into UIConfiguration header
This removes the direct dependence on ardour_ui.h from 39 files
Diffstat (limited to 'gtk2_ardour/actions.cc')
-rw-r--r--gtk2_ardour/actions.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 7f11d053e8..ea6cc4b8aa 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -36,7 +36,6 @@
#include "gtkmm2ext/actions.h"
-#include "ardour_ui.h"
#include "actions.h"
#include "i18n.h"
@@ -138,10 +137,10 @@ ActionManager::toggle_config_state (const char* group, const char* action, bool
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
if (tact) {
- bool x = (ARDOUR_UI::config()->*get)();
+ bool x = (UIConfiguration::instance().*get)();
if (x != tact->get_active()) {
- (ARDOUR_UI::config()->*set) (!x);
+ (UIConfiguration::instance().*set) (!x);
}
}
}
@@ -203,7 +202,7 @@ ActionManager::map_some_state (const char* group, const char* action, bool (UICo
if (tact) {
- bool x = (ARDOUR_UI::config()->*get)();
+ bool x = (UIConfiguration::instance().*get)();
if (tact->get_active() != x) {
tact->set_active (x);