diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-07-07 00:37:13 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-07-07 00:37:13 +0000 |
| commit | 10cb0a7646ae7da18e5e6f49b940a5e921a73b57 (patch) | |
| tree | 9d23f3e2e5d961aa2520f51ebcf5ed9b64cf7c5c /gtk2_ardour/ardour_ui.cc | |
| parent | d5bb72975523a35e65d94605de2abff01c3e6ce7 (diff) | |
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor
git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 14c81c30b2..01321c21f2 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -91,6 +91,7 @@ typedef uint64_t microseconds_t; #include "engine_dialog.h" #include "gain_meter.h" #include "global_port_matrix.h" +#include "gui_object.h" #include "gui_thread.h" #include "keyboard.h" #include "location_ui.h" @@ -133,6 +134,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp) + , gui_object_state (new GUIObjectState) , primary_clock (new AudioClock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true)) , secondary_clock (new AudioClock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true)) , preroll_clock (new AudioClock (X_("preroll"), false, X_("PreRollClock"), true, false, true)) @@ -293,7 +295,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) keyboard = new ArdourKeyboard(*this); - XMLNode* node = ARDOUR_UI::instance()->keyboard_settings(); if (node) { keyboard->set_state (*node, Stateful::loading_state_version); @@ -2195,6 +2196,8 @@ ARDOUR_UI::save_state (const string & name, bool switch_to_it) } } + node->add_child_nocopy (gui_object_state->get_state()); + _session->add_extra_xml (*node); save_state_canfail (name, switch_to_it); |