diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-25 15:56:59 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:38 -0400 |
| commit | 99b0712be451bf16ce9266ebe622c3ed38bf412f (patch) | |
| tree | 3795ef944bfda95aa879da71dda17476ffc53af7 /gtk2_ardour/ardour_ui_dependents.cc | |
| parent | f4032599f207ecb1e0994088bbffe687c4a90693 (diff) | |
remove the entire idea of a tabbable for VCA master faders
Conflicts:
gtk2_ardour/master_faders.cc
Diffstat (limited to 'gtk2_ardour/ardour_ui_dependents.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_dependents.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index e95bfab8fc..98a8929b80 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -36,7 +36,6 @@ #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" @@ -164,8 +163,7 @@ 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 if (w == GTK_WIDGET(masters->contents().gobj())) { - tabbable = masters; + } else { return 0; } @@ -274,7 +272,6 @@ ARDOUR_UI::setup_windows () /* 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")); @@ -390,8 +387,6 @@ 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())); } |