enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index e95bfab8fce3563a7c7c20876b44efe959d7d5c3..8490643487ccf6753c35b6909b7baf8f6c26a895 100644 (file)
--- 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"
@@ -47,7 +46,7 @@
 #include "opts.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace PBD;
@@ -122,7 +121,6 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
        mixer->set_session (s);
        meterbridge->set_session (s);
        luawindow->set_session (s);
-       masters->set_session (s);
 
        /* its safe to do this now */
 
@@ -164,8 +162,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;
        }
 
@@ -267,14 +264,8 @@ 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"));
@@ -390,8 +381,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()));
                }