X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmonitor_section.cc;h=e52b48c7c75e2bbcf244aa5a56e2bbfc1b15cdce;hb=e5a181c323243a03338f5a9934a5df254986370d;hp=2cd46c051a41a39e549eccb771790be68a7025b5;hpb=dc0139d4af4d246f6dcafb04425e3f1198c347c3;p=ardour.git

diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index 2cd46c051a..e52b48c7c7 100644
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -23,14 +23,15 @@
 #include "pbd/error.h"
 #include "pbd/replace_all.h"
 
-#include "gtkmm2ext/bindable_button.h"
-#include "gtkmm2ext/tearoff.h"
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/utils.h"
 
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
 
+#include "widgets/tearoff.h"
+#include "widgets/tooltips.h"
+
 #include "ardour/amp.h"
 #include "ardour/audioengine.h"
 #include "ardour/monitor_processor.h"
@@ -46,13 +47,13 @@
 #include "monitor_section.h"
 #include "public_editor.h"
 #include "timers.h"
-#include "tooltips.h"
 #include "ui_config.h"
 #include "utils.h"
 
 #include "pbd/i18n.h"
 
 using namespace ARDOUR;
+using namespace ArdourWidgets;
 using namespace ARDOUR_UI_UTILS;
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -440,9 +441,9 @@ MonitorSection::MonitorSection (Session* s)
 	vpacker.pack_start (master_packer,        false, false, PX_SCALE(10));
 	vpacker.pack_end   (*out_packer,          false, false,
 #ifdef MIXBUS
-			scrollbar_height - 2 /* no outer frame */
+			scrollbar_height - 2 /* no outer sample */
 #else
-			scrollbar_height + 2 /* frame borders */
+			scrollbar_height + 2 /* sample borders */
 #endif
 			);