diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-23 16:26:41 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:38 -0400 |
| commit | 5c658db4bff20aea644751f58c7e8c85385d3b2c (patch) | |
| tree | bd326adae482ff6bcbb27c647a3d3065e2aad232 /gtk2_ardour/ardour_ui_dependents.cc | |
| parent | 87481a2ee17023686991e1a87182c2e8ed335690 (diff) | |
most of the changes required to add a new master faders tabbable
the visibility button isn't actually working correctly
Diffstat (limited to 'gtk2_ardour/ardour_ui_dependents.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_dependents.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index 68e29f57f8..9240ada261 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -36,6 +36,7 @@ #include "actions.h" #include "ardour_ui.h" #include "public_editor.h" +#include "master_faders.h" #include "meterbridge.h" #include "luawindow.h" #include "mixer_ui.h" @@ -162,7 +163,8 @@ ARDOUR_UI::tab_window_root_drop (GtkNotebook* src, tabbable = mixer; } else if (w == GTK_WIDGET(rc_option_editor->contents().gobj())) { tabbable = rc_option_editor; - } else { + } else if (w == GTK_WIDGET(masters->contents().gobj())) { + tabbable = masters; return 0; } @@ -264,8 +266,14 @@ ARDOUR_UI::setup_windows () return -1; } + if (create_masters()) { + error << _("UI: cannot setup meterbridge") << endmsg; + return -1; + } + /* order of addition affects order seen in initial window display */ + masters->add_to_notebook (_tabs, _("Masters")); rc_option_editor->add_to_notebook (_tabs, _("Preferences")); mixer->add_to_notebook (_tabs, _("Mixer")); editor->add_to_notebook (_tabs, _("Editor")); @@ -381,6 +389,8 @@ ARDOUR_UI::setup_windows () _tabs.set_current_page (_tabs.page_num (mixer->contents())); } else if (rc_option_editor && current_tab == "preferences") { _tabs.set_current_page (_tabs.page_num (rc_option_editor->contents())); + } else if (masters && current_tab == "masters") { + _tabs.set_current_page (_tabs.page_num (masters->contents())); } else if (editor) { _tabs.set_current_page (_tabs.page_num (editor->contents())); } |