Remove ardour_ui.h header inclusion

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 27df4b1b32a4e2e0ce64fcceb91db6b8412704ea..a1485e5c945be9967877c6de99134a38f690232f 100644 (file)
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -24,6 +24,7 @@
 #include <ctime>
 #include <cstdlib>
 
+#include "pbd/error.h"
 #include "pbd/file_utils.h"
 
 #include "ardour/revision.h"
@@ -32,7 +33,6 @@
 #include "about.h"
 #include "configinfo.h"
 #include "rgb_macros.h"
-#include "ardour_ui.h"
 
 #include "i18n.h"
 

diff --git a/gtk2_ardour/ardour_display.cc b/gtk2_ardour/ardour_display.cc
index 8a0c2fed743459ed30c72aeea361399a0746fcba..4cfffbcbd420e9c52af4abdc0dba28c16d2b1729 100644 (file)
--- a/gtk2_ardour/ardour_display.cc
+++ b/gtk2_ardour/ardour_display.cc
@@ -24,6 +24,7 @@
 #include <pangomm/layout.h>
 
 #include "pbd/compose.h"
+#include "pbd/controllable.h"
 #include "pbd/error.h"
 #include "pbd/stacktrace.h"
 
@@ -35,7 +36,6 @@
 #include "ardour/rc_configuration.h" // for widget prelight preference
 
 #include "ardour_display.h"
-#include "ardour_ui.h"
 
 #include "i18n.h"
 

diff --git a/gtk2_ardour/ardour_dropdown.cc b/gtk2_ardour/ardour_dropdown.cc
index 25338cc62021abcaf8b2e5ab32e2ea2f62c01c59..221fe672d965cc3a3181f93a80d511ce1974979a 100644 (file)
--- a/gtk2_ardour/ardour_dropdown.cc
+++ b/gtk2_ardour/ardour_dropdown.cc
@@ -34,7 +34,6 @@
 #include "ardour/rc_configuration.h" // for widget prelight preference
 
 #include "ardour_dropdown.h"
-#include "ardour_ui.h"
 
 #include "i18n.h"
 

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index 2041d20335feb17e289c4d488db29f4817214416..4aa807594281f9d0ec99e9cd4dd0ac946b11a8aa 100644 (file)
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -31,7 +31,6 @@
 
 #include "audio_region_editor.h"
 #include "audio_region_view.h"
-#include "ardour_ui.h"
 #include "gui_thread.h"
 
 #include "i18n.h"

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 40c35d7cba0cfef3d83432024da73eb18d4890ba..6110673985fd60c642d9ceb849ac593e8cac5bd6 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -42,7 +42,6 @@
 #include "ardour/panner_shell.h"
 
 #include "ardour_button.h"
-#include "ardour_ui.h"
 #include "audio_time_axis.h"
 #include "automation_line.h"
 #include "enums.h"

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 44c03159a4f2a84f0d4bb0bc5c02a55f4172b2bd..a20ae54211146714fd10baa7cac74b99bb21ba5d 100644 (file)
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -30,7 +30,6 @@
 #include "ardour/tempo.h"
 
 #include "ardour_button.h"
-#include "ardour_ui.h"
 #include "automation_controller.h"
 #include "gui_thread.h"
 #include "note_select_dialog.h"

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 2acc8a0a86768571eeaf316608e5fbd2bf5f0f43..2548a68ab41c6309ce47ec259d484160b49a8544 100644 (file)
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -27,7 +27,6 @@
 
 #include "ardour/session.h"
 
-#include "ardour_ui.h"
 #include "editor.h"
 #include "region_view.h"
 #include "selection.h"

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index d4f570b36c81d0001f6e3537178f0e111c0ebd57..2f15378cf39757796c0cadc9a24e7f6bc4270054 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -47,7 +47,6 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "ardour_ui.h"
 #include "actions.h"
 #include "editor.h"
 #include "time_axis_view.h"

diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc
index 43f12aa9f35aa0754bd698554560181e5e24d12b..71bc74d2f087293a5d9cdeb11bea03c7cfe71b7e 100644 (file)
--- a/gtk2_ardour/video_image_frame.cc
+++ b/gtk2_ardour/video_image_frame.cc
@@ -20,7 +20,6 @@
 #include <sigc++/bind.h>
 #include "ardour/tempo.h"
 
-#include "ardour_ui.h"
 #include "video_image_frame.h"
 #include "public_editor.h"
 #include "canvas/container.h"