From 96137739a751953b5f5ad1b1a23b5c18771027c4 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 11 Jan 2022 04:06:52 +0100 Subject: [PATCH] Reduce includes required for Selection Previously a triggerbox_ui.h change triggered a complete UI rebuild. This follows the concept of other editor_selection lists which use forward declarations. --- gtk2_ardour/audio_trigger_properties_box.h | 1 + gtk2_ardour/editor_audio_import.cc | 1 + gtk2_ardour/editor_ops.cc | 1 + gtk2_ardour/editor_rulers.cc | 1 + gtk2_ardour/midi_trigger_properties_box.h | 1 + gtk2_ardour/selection.cc | 1 + gtk2_ardour/selection_properties_box.cc | 1 + gtk2_ardour/trigger_page.cc | 1 + gtk2_ardour/trigger_selection.h | 2 +- 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/audio_trigger_properties_box.h b/gtk2_ardour/audio_trigger_properties_box.h index 9f965cb394..d41aeb68a4 100644 --- a/gtk2_ardour/audio_trigger_properties_box.h +++ b/gtk2_ardour/audio_trigger_properties_box.h @@ -26,6 +26,7 @@ #include "ardour/ardour.h" #include "ardour/session_handle.h" +#include "ardour/triggerbox.h" #include "widgets/ardour_button.h" diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 231306527f..be72d553db 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -50,6 +50,7 @@ #include "ardour/region_factory.h" #include "ardour/smf_source.h" #include "ardour/source_factory.h" +#include "ardour/triggerbox.h" #include "ardour/utils.h" #include "pbd/memento_command.h" diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index ac0dffc77d..e959b9625f 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -127,6 +127,7 @@ #include "timers.h" #include "transpose_dialog.h" #include "transform_dialog.h" +#include "triggerbox_ui.h" #include "ui_config.h" #include "utils.h" #include "vca_time_axis.h" diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index e9c861a5e5..7ef47d7ac6 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -44,6 +44,7 @@ #include "ardour/session.h" #include "ardour/tempo.h" #include "ardour/profile.h" +#include "ardour/triggerbox.h" #include "temporal/tempo.h" diff --git a/gtk2_ardour/midi_trigger_properties_box.h b/gtk2_ardour/midi_trigger_properties_box.h index cce5d8d1f6..caaa35bce3 100644 --- a/gtk2_ardour/midi_trigger_properties_box.h +++ b/gtk2_ardour/midi_trigger_properties_box.h @@ -23,6 +23,7 @@ #include #include "ardour/ardour.h" +#include "ardour/triggerbox.h" #include "audio_trigger_properties_box.h" diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 48d00b7d54..6832cb6da3 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -48,6 +48,7 @@ #include "automation_time_axis.h" #include "public_editor.h" #include "control_point.h" +#include "triggerbox_ui.h" #include "vca_time_axis.h" #include "pbd/i18n.h" diff --git a/gtk2_ardour/selection_properties_box.cc b/gtk2_ardour/selection_properties_box.cc index f5032e97df..eab1c97f5b 100644 --- a/gtk2_ardour/selection_properties_box.cc +++ b/gtk2_ardour/selection_properties_box.cc @@ -34,6 +34,7 @@ #include "editor.h" #include "region_view.h" #include "time_info_box.h" +#include "triggerbox_ui.h" #include "multi_region_properties_box.h" diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc index 3899593d8e..1e53b000da 100644 --- a/gtk2_ardour/trigger_page.cc +++ b/gtk2_ardour/trigger_page.cc @@ -49,6 +49,7 @@ #include "trigger_page.h" #include "trigger_strip.h" +#include "triggerbox_ui.h" #include "ui_config.h" #include "utils.h" diff --git a/gtk2_ardour/trigger_selection.h b/gtk2_ardour/trigger_selection.h index c7a568a85e..76db837aee 100644 --- a/gtk2_ardour/trigger_selection.h +++ b/gtk2_ardour/trigger_selection.h @@ -22,7 +22,7 @@ #include -#include "triggerbox_ui.h" +class TriggerEntry; class TriggerSelection : public std::list {