diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-01-02 21:44:54 +0700 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-16 16:55:17 -0400 |
| commit | 6b019a495359909a3d1a778ca10cd7df7cc302cc (patch) | |
| tree | 75746a1e4a3daecd8c9cd0996b3c63d7d1657be4 /gtk2_ardour/ardour_ui.h | |
| parent | 45d487f16e8be102bfcdefcd950a69c886495b94 (diff) | |
Move UIConfiguration Singleton into UIConfiguration header
This removes the direct dependence on ardour_ui.h from 39 files
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index f2ad1bb0d6..c174723ef4 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -133,14 +133,8 @@ namespace Gtk { class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr { - private: - /* This must be the first data element because constructor ordering - relies on it. - */ - UIConfiguration* ui_config; - public: - ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfiguration*); + ARDOUR_UI (int *argcp, char **argvp[], const char* localedir); ~ARDOUR_UI(); bool run_startup (bool should_be_new, std::string load_template); @@ -185,7 +179,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void save_state (const std::string & state_name = "", bool switch_to_it = false); static ARDOUR_UI *instance () { return theArdourUI; } - static UIConfiguration *config () { return theArdourUI->ui_config; } PublicEditor& the_editor() { return *editor;} Mixer_UI* the_mixer() { return mixer; } |