Move UIConfiguration Singleton into UIConfiguration header

This removes the direct dependence on ardour_ui.h from 39 files
This commit is contained in:
Tim Mayberry 2015-01-02 21:44:54 +07:00 committed by Paul Davis
parent 45d487f16e
commit 6b019a4953
84 changed files with 726 additions and 712 deletions

View file

@ -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);