From b4ff4f356c6bca12ccc2468d4a0a7b1f4e57ae16 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sat, 19 Oct 2024 15:54:24 +0200 Subject: [PATCH] Make header files more self-contained - add missing Ardour and lib includes --- gtk2_ardour/audio_trigger_properties_box.h | 1 + gtk2_ardour/axis_view.h | 1 + gtk2_ardour/bundle_manager.h | 1 + gtk2_ardour/crossfade_edit.h | 5 +++++ gtk2_ardour/cuebox_ui.h | 1 + gtk2_ardour/editor_route_groups.h | 5 +++++ gtk2_ardour/editor_summary.h | 6 ++++++ gtk2_ardour/grid_lines.h | 1 + gtk2_ardour/io_button.h | 1 + gtk2_ardour/keyeditor.h | 1 + gtk2_ardour/luawindow.h | 2 ++ gtk2_ardour/mouse_cursors.h | 2 ++ gtk2_ardour/normalize_dialog.h | 1 + gtk2_ardour/panner_ui.h | 1 + gtk2_ardour/patch_change.h | 5 +++++ gtk2_ardour/playlist_selector.h | 2 ++ gtk2_ardour/plugin_scan_dialog.h | 1 + gtk2_ardour/port_matrix_labels.h | 6 ++---- gtk2_ardour/prh.h | 2 ++ gtk2_ardour/region_layering_order_editor.h | 2 ++ gtk2_ardour/region_peak_cursor.h | 2 +- gtk2_ardour/route_group_menu.h | 3 +++ gtk2_ardour/route_processor_selection.h | 2 ++ gtk2_ardour/session_dialog.h | 1 + gtk2_ardour/simple_progress_dialog.h | 2 +- gtk2_ardour/soundcloud_export_selector.h | 2 ++ gtk2_ardour/startup_fsm.h | 5 +++++ gtk2_ardour/step_editor.h | 2 ++ gtk2_ardour/strip_selection.h | 2 ++ gtk2_ardour/strip_silence_dialog.h | 3 +++ gtk2_ardour/sys_ex.h | 2 ++ gtk2_ardour/tempo_curve.h | 1 + gtk2_ardour/time_axis_view_item.h | 1 + gtk2_ardour/track_record_axis.h | 1 + gtk2_ardour/trigger_page.h | 1 + gtk2_ardour/visibility_group.h | 2 ++ gtk2_ardour/window_manager.h | 2 ++ libs/ardour/ardour/comparable_shared_ptr.h | 2 ++ libs/ardour/ardour/control_group_member.h | 2 ++ libs/ardour/ardour/convolver.h | 1 + libs/ardour/ardour/logcurve.h | 2 ++ libs/ardour/ardour/midi_scene_changer.h | 1 + libs/ardour/ardour/midi_ui.h | 2 ++ libs/ardour/ardour/mixer_scene.h | 5 +---- libs/ardour/ardour/monitor_port.h | 1 + libs/ardour/ardour/movable.h | 2 ++ libs/ardour/ardour/panner_shell.h | 2 ++ libs/ardour/ardour/peak.h | 2 +- libs/ardour/ardour/proxy_controllable.h | 2 ++ libs/ardour/ardour/session_playlists.h | 4 ++++ libs/ardour/ardour/spline.h | 2 ++ libs/ardour/ardour/step_sequencer.h | 7 +++++-- libs/ardour/ardour/transport_fsm.h | 1 + libs/ardour/ardour/trimmable.h | 2 ++ libs/audiographer/audiographer/general/threader.h | 1 + libs/backends/alsa/alsa_slave.h | 1 + libs/canvas/canvas/stateful_image.h | 2 ++ libs/evoral/libsmf/smf_private.h | 2 ++ libs/gtkmm2ext/gtkmm2ext/dndvbox.h | 2 ++ libs/gtkmm2ext/gtkmm2ext/gtkutils.h | 2 ++ libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h | 3 +++ libs/gtkmm2ext/gtkmm2ext/window_proxy.h | 2 ++ libs/pbd/pbd/atomic_counter.h | 2 ++ libs/pbd/pbd/property_basics_impl.h | 2 ++ libs/pbd/pbd/scoped_file_descriptor.h | 2 ++ libs/surfaces/maschine2/ui_menu.h | 1 + libs/surfaces/osc/osc_cue_observer.h | 2 ++ libs/surfaces/osc/osc_global_observer.h | 5 +++++ libs/surfaces/osc/osc_gui.h | 4 ++++ libs/surfaces/osc/osc_select_observer.h | 4 +++- libs/surfaces/push2/follow_action.h | 4 ++++ libs/surfaces/push2/level_meter.h | 3 +++ libs/surfaces/push2/scale.h | 2 ++ libs/surfaces/push2/track_mix.h | 3 +++ libs/surfaces/us2400/gui.h | 2 ++ libs/surfaces/us2400/surface_port.h | 1 + libs/surfaces/us2400/timer.h | 2 ++ libs/widgets/widgets/binding_proxy.h | 2 ++ libs/zita-convolver/zita-convolver/zita-convolver.h | 6 ++++-- 79 files changed, 167 insertions(+), 16 deletions(-) diff --git a/gtk2_ardour/audio_trigger_properties_box.h b/gtk2_ardour/audio_trigger_properties_box.h index 94e061f231..8b03b17836 100644 --- a/gtk2_ardour/audio_trigger_properties_box.h +++ b/gtk2_ardour/audio_trigger_properties_box.h @@ -22,6 +22,7 @@ #include #include +#include #include #include "ardour/ardour.h" diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h index 3caa3ced87..5a59959355 100644 --- a/gtk2_ardour/axis_view.h +++ b/gtk2_ardour/axis_view.h @@ -33,6 +33,7 @@ #include "pbd/xml++.h" #include "pbd/signals.h" +#include "ardour/automation_control.h" #include "ardour/session_handle.h" #include "gui_object.h" diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h index 33b9dfdccd..6470dcfa49 100644 --- a/gtk2_ardour/bundle_manager.h +++ b/gtk2_ardour/bundle_manager.h @@ -20,6 +20,7 @@ #pragma once +#include #include #include #include diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h index dea7c37642..8daa8d5f36 100644 --- a/gtk2_ardour/crossfade_edit.h +++ b/gtk2_ardour/crossfade_edit.h @@ -28,12 +28,17 @@ #include #include #include +#include #include "canvas/canvas.h" +#include "canvas/poly_line.h" #include "evoral/Curve.h" +#include "ardour/automation_list.h" #include "ardour/session_handle.h" +#include "waveview/wave_view.h" + #include "ardour_dialog.h" namespace ARDOUR diff --git a/gtk2_ardour/cuebox_ui.h b/gtk2_ardour/cuebox_ui.h index 2cb17babd5..be384c244a 100644 --- a/gtk2_ardour/cuebox_ui.h +++ b/gtk2_ardour/cuebox_ui.h @@ -22,6 +22,7 @@ #include #include +#include #include "pbd/properties.h" diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h index b99f7ce178..28c97ea92e 100644 --- a/gtk2_ardour/editor_route_groups.h +++ b/gtk2_ardour/editor_route_groups.h @@ -20,6 +20,8 @@ #pragma once +#include +#include #include #include #include @@ -27,6 +29,9 @@ #include "editor_component.h" +#include "ardour/route_group.h" +#include "ardour/session_handle.h" + class EditorRouteGroups : public EditorComponent, public ARDOUR::SessionHandlePtr { public: diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h index 5de5189b3b..8d259e4e20 100644 --- a/gtk2_ardour/editor_summary.h +++ b/gtk2_ardour/editor_summary.h @@ -21,7 +21,11 @@ #pragma once +#include "ardour/session_handle.h" +#include "ardour/types.h" #include "gtkmm2ext/cairo_widget.h" +#include "pbd/property_basics.h" + #include "editor_component.h" namespace ARDOUR { @@ -29,6 +33,8 @@ namespace ARDOUR { } class Editor; +class RegionView; +class RouteTimeAxisView; /** Class to provide a visual summary of the contents of an editor window; represents * the whole session as a set of lines, one per region view. diff --git a/gtk2_ardour/grid_lines.h b/gtk2_ardour/grid_lines.h index 62de80a9ad..179e2298d4 100644 --- a/gtk2_ardour/grid_lines.h +++ b/gtk2_ardour/grid_lines.h @@ -18,6 +18,7 @@ #pragma once +#include "canvas/container.h" #include "canvas/line_set.h" #include "canvas/ruler.h" #include "ardour/tempo.h" diff --git a/gtk2_ardour/io_button.h b/gtk2_ardour/io_button.h index 4cc87abfb7..d246d98cd0 100644 --- a/gtk2_ardour/io_button.h +++ b/gtk2_ardour/io_button.h @@ -26,6 +26,7 @@ #include #include "ardour/data_type.h" +#include "ardour/types.h" #include "widgets/ardour_button.h" diff --git a/gtk2_ardour/keyeditor.h b/gtk2_ardour/keyeditor.h index cc4c32a9b3..da6b815e1d 100644 --- a/gtk2_ardour/keyeditor.h +++ b/gtk2_ardour/keyeditor.h @@ -22,6 +22,7 @@ #include +#include #include #include #include diff --git a/gtk2_ardour/luawindow.h b/gtk2_ardour/luawindow.h index 2f9be48f7c..eb42842da7 100644 --- a/gtk2_ardour/luawindow.h +++ b/gtk2_ardour/luawindow.h @@ -40,6 +40,8 @@ #include "widgets/ardour_button.h" #include "widgets/ardour_dropdown.h" +#include "ardour_window.h" + class LuaWindow : public ArdourWindow, public PBD::ScopedConnectionList diff --git a/gtk2_ardour/mouse_cursors.h b/gtk2_ardour/mouse_cursors.h index 07304a9795..d9bb3fa47b 100644 --- a/gtk2_ardour/mouse_cursors.h +++ b/gtk2_ardour/mouse_cursors.h @@ -26,6 +26,8 @@ * Held centrally by the Editor because some cursors are used in several places. */ +#include + #include class MouseCursors diff --git a/gtk2_ardour/normalize_dialog.h b/gtk2_ardour/normalize_dialog.h index ce2c9aa56a..b5c9bd913b 100644 --- a/gtk2_ardour/normalize_dialog.h +++ b/gtk2_ardour/normalize_dialog.h @@ -21,6 +21,7 @@ #include "progress_reporter.h" namespace Gtk { + class CheckButton; class RadioButton; class SpinButton; class ProgressBar; diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h index 58bf916dc2..6d7971f824 100644 --- a/gtk2_ardour/panner_ui.h +++ b/gtk2_ardour/panner_ui.h @@ -49,6 +49,7 @@ namespace ARDOUR { } namespace Gtk { + class CheckMenuItem; class Menu; class Menuitem; } diff --git a/gtk2_ardour/patch_change.h b/gtk2_ardour/patch_change.h index c436a92cbe..4196a9a565 100644 --- a/gtk2_ardour/patch_change.h +++ b/gtk2_ardour/patch_change.h @@ -23,6 +23,11 @@ #include "canvas/flag.h" +#include + +#include "midi_view.h" +#include "patch_change_dialog.h" + class MidiRegionView; namespace MIDI { diff --git a/gtk2_ardour/playlist_selector.h b/gtk2_ardour/playlist_selector.h index 43b861cfc1..7d2f48dbbc 100644 --- a/gtk2_ardour/playlist_selector.h +++ b/gtk2_ardour/playlist_selector.h @@ -28,6 +28,8 @@ #include #include +#include "widgets/ardour_button.h" + #include "ardour/playlist.h" #include "ardour/session_handle.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/plugin_scan_dialog.h b/gtk2_ardour/plugin_scan_dialog.h index e9c2db16b2..b6688212c9 100644 --- a/gtk2_ardour/plugin_scan_dialog.h +++ b/gtk2_ardour/plugin_scan_dialog.h @@ -21,6 +21,7 @@ #include #include +#include #include #include #include diff --git a/gtk2_ardour/port_matrix_labels.h b/gtk2_ardour/port_matrix_labels.h index be64e6b306..c3e7161793 100644 --- a/gtk2_ardour/port_matrix_labels.h +++ b/gtk2_ardour/port_matrix_labels.h @@ -18,11 +18,9 @@ #pragma once -#include "port_matrix_component.h" +#include "ardour/bundle.h" -namespace ARDOUR { - class BundleChannel; -} +#include "port_matrix_component.h" class PortMatrixLabels : public PortMatrixComponent { diff --git a/gtk2_ardour/prh.h b/gtk2_ardour/prh.h index fc9a7f6215..f80c6f4477 100644 --- a/gtk2_ardour/prh.h +++ b/gtk2_ardour/prh.h @@ -26,6 +26,8 @@ #include "canvas/rectangle.h" +#include + namespace ARDOUR { class MidiTrack; } diff --git a/gtk2_ardour/region_layering_order_editor.h b/gtk2_ardour/region_layering_order_editor.h index 687f0ccace..eb988a944f 100644 --- a/gtk2_ardour/region_layering_order_editor.h +++ b/gtk2_ardour/region_layering_order_editor.h @@ -31,6 +31,8 @@ #include "ardour_window.h" #include "audio_clock.h" +#include "region_view.h" +#include "time_axis_view.h" class PublicEditor; diff --git a/gtk2_ardour/region_peak_cursor.h b/gtk2_ardour/region_peak_cursor.h index a7d9497479..555ddbbf4e 100644 --- a/gtk2_ardour/region_peak_cursor.h +++ b/gtk2_ardour/region_peak_cursor.h @@ -36,7 +36,7 @@ public: RegionPeakCursor (ArdourCanvas::Item*); ~RegionPeakCursor (); - void set (AudioRegionView*, samplepos_t, samplecnt_t); + void set (AudioRegionView*, samplepos_t, ARDOUR::samplecnt_t); void hide (); bool visible () const; diff --git a/gtk2_ardour/route_group_menu.h b/gtk2_ardour/route_group_menu.h index 1f9b201abe..58abbec078 100644 --- a/gtk2_ardour/route_group_menu.h +++ b/gtk2_ardour/route_group_menu.h @@ -22,6 +22,9 @@ #include "ardour/route_group.h" #include "ardour/session_handle.h" +#include +#include + class RouteGroupDialog; class RouteGroupMenu : public ARDOUR::SessionHandlePtr diff --git a/gtk2_ardour/route_processor_selection.h b/gtk2_ardour/route_processor_selection.h index 8c2699d3d2..da0af00b49 100644 --- a/gtk2_ardour/route_processor_selection.h +++ b/gtk2_ardour/route_processor_selection.h @@ -21,6 +21,8 @@ #pragma once #include + +#include "pbd/property_basics.h" #include "pbd/signals.h" #include "processor_selection.h" diff --git a/gtk2_ardour/session_dialog.h b/gtk2_ardour/session_dialog.h index 6f9c66e469..dfcde754d4 100644 --- a/gtk2_ardour/session_dialog.h +++ b/gtk2_ardour/session_dialog.h @@ -40,6 +40,7 @@ #include #include #include +#include #include "temporal/domain_provider.h" diff --git a/gtk2_ardour/simple_progress_dialog.h b/gtk2_ardour/simple_progress_dialog.h index f9d50a9f6c..2adeb55e22 100644 --- a/gtk2_ardour/simple_progress_dialog.h +++ b/gtk2_ardour/simple_progress_dialog.h @@ -44,7 +44,7 @@ public: get_vbox()->pack_start (*cancel_button, Gtk::PACK_SHRINK); } - void update_progress (samplecnt_t c, samplecnt_t t) { + void update_progress (ARDOUR::samplecnt_t c, ARDOUR::samplecnt_t t) { pbar->set_fraction ((float) c / (float) t); // see also ARDOUR_UI::gui_idle_handler(); int timeout = 30; diff --git a/gtk2_ardour/soundcloud_export_selector.h b/gtk2_ardour/soundcloud_export_selector.h index 78688d17dd..3d22b22424 100644 --- a/gtk2_ardour/soundcloud_export_selector.h +++ b/gtk2_ardour/soundcloud_export_selector.h @@ -19,6 +19,8 @@ #include #include +#include "ardour/session_handle.h" + class SoundcloudExportSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr { public: diff --git a/gtk2_ardour/startup_fsm.h b/gtk2_ardour/startup_fsm.h index 48f7e832a0..74a2a9267f 100644 --- a/gtk2_ardour/startup_fsm.h +++ b/gtk2_ardour/startup_fsm.h @@ -25,6 +25,11 @@ #include "ardour/types.h" +namespace Gtk +{ +class Window; +} // namespace Gtk + class ArdourDialog; class NewUserWizard; class EngineControl; diff --git a/gtk2_ardour/step_editor.h b/gtk2_ardour/step_editor.h index 4c7f966cfa..7376a9709a 100644 --- a/gtk2_ardour/step_editor.h +++ b/gtk2_ardour/step_editor.h @@ -28,10 +28,12 @@ #include "pbd/signals.h" #include "temporal/beats.h" +#include "temporal/timeline.h" namespace ARDOUR { class MidiTrack; class MidiRegion; +class Region; } class MidiRegionView; diff --git a/gtk2_ardour/strip_selection.h b/gtk2_ardour/strip_selection.h index 51f62b4c63..6ccfa809c4 100644 --- a/gtk2_ardour/strip_selection.h +++ b/gtk2_ardour/strip_selection.h @@ -20,6 +20,8 @@ #pragma once +#include "mixer_strip.h" + #include class MixerStrip; diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h index 7d3409bf66..c0abb40109 100644 --- a/gtk2_ardour/strip_silence_dialog.h +++ b/gtk2_ardour/strip_silence_dialog.h @@ -19,11 +19,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include +#include #include #include #include +#include "ardour/interthread_info.h" #include "ardour/types.h" #include "ardour_dialog.h" #include "progress_reporter.h" diff --git a/gtk2_ardour/sys_ex.h b/gtk2_ardour/sys_ex.h index dd150767f7..888e7f875e 100644 --- a/gtk2_ardour/sys_ex.h +++ b/gtk2_ardour/sys_ex.h @@ -22,6 +22,8 @@ #include "canvas/flag.h" +#include "ardour/midi_model.h" + class MidiView; class SysEx diff --git a/gtk2_ardour/tempo_curve.h b/gtk2_ardour/tempo_curve.h index f9c4785f91..0b274d71ca 100644 --- a/gtk2_ardour/tempo_curve.h +++ b/gtk2_ardour/tempo_curve.h @@ -27,6 +27,7 @@ #include "ardour/ardour.h" #include "pbd/signals.h" +#include "canvas/container.h" #include "canvas/types.h" #include "canvas/framed_curve.h" #include "canvas/text.h" diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h index 192ed49cda..1d403c3b91 100644 --- a/gtk2_ardour/time_axis_view_item.h +++ b/gtk2_ardour/time_axis_view_item.h @@ -28,6 +28,7 @@ #include #include #include +#include "ardour/types.h" #include "pbd/signals.h" #include "selectable.h" diff --git a/gtk2_ardour/track_record_axis.h b/gtk2_ardour/track_record_axis.h index 920bf5c96b..31cda5ae25 100644 --- a/gtk2_ardour/track_record_axis.h +++ b/gtk2_ardour/track_record_axis.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include diff --git a/gtk2_ardour/trigger_page.h b/gtk2_ardour/trigger_page.h index 36e9632c76..cdf94ad44c 100644 --- a/gtk2_ardour/trigger_page.h +++ b/gtk2_ardour/trigger_page.h @@ -31,6 +31,7 @@ #include "audio_region_operations_box.h" #include "audio_region_properties_box.h" #include "audio_trigger_properties_box.h" +#include "axis_provider.h" #include "cuebox_ui.h" #include "fitted_canvas_widget.h" #include "midi_region_operations_box.h" diff --git a/gtk2_ardour/visibility_group.h b/gtk2_ardour/visibility_group.h index 0dbb75e85e..7dc2005ba7 100644 --- a/gtk2_ardour/visibility_group.h +++ b/gtk2_ardour/visibility_group.h @@ -21,6 +21,8 @@ #define __ardour_visibility_group__ #include +#include + #include "pbd/signals.h" class XMLNode; diff --git a/gtk2_ardour/window_manager.h b/gtk2_ardour/window_manager.h index 0670b39dfa..f3775320e9 100644 --- a/gtk2_ardour/window_manager.h +++ b/gtk2_ardour/window_manager.h @@ -30,6 +30,8 @@ #include "gtkmm2ext/bindings.h" #include "gtkmm2ext/window_proxy.h" +#include "ardour/session_handle.h" + class XMLNode; namespace Gtk { diff --git a/libs/ardour/ardour/comparable_shared_ptr.h b/libs/ardour/ardour/comparable_shared_ptr.h index dd68c816f3..3194c3c891 100644 --- a/libs/ardour/ardour/comparable_shared_ptr.h +++ b/libs/ardour/ardour/comparable_shared_ptr.h @@ -22,6 +22,8 @@ #include "ardour/libardour_visibility.h" +#include + #include namespace ARDOUR { diff --git a/libs/ardour/ardour/control_group_member.h b/libs/ardour/ardour/control_group_member.h index 0504b95b36..3bf4e61849 100644 --- a/libs/ardour/ardour/control_group_member.h +++ b/libs/ardour/ardour/control_group_member.h @@ -18,6 +18,8 @@ #pragma once +#include "ardour/libardour_visibility.h" + #include namespace ARDOUR { diff --git a/libs/ardour/ardour/convolver.h b/libs/ardour/ardour/convolver.h index e4934034f0..0f779bbf53 100644 --- a/libs/ardour/ardour/convolver.h +++ b/libs/ardour/ardour/convolver.h @@ -27,6 +27,7 @@ #include "ardour/buffer_set.h" #include "ardour/chan_mapping.h" #include "ardour/readable.h" +#include "ardour/session_handle.h" namespace ARDOUR { namespace DSP { diff --git a/libs/ardour/ardour/logcurve.h b/libs/ardour/ardour/logcurve.h index f78a68159f..d64ee0d78e 100644 --- a/libs/ardour/ardour/logcurve.h +++ b/libs/ardour/ardour/logcurve.h @@ -23,6 +23,8 @@ #include "pbd/fastlog.h" #include +#include "ardour/libardour_visibility.h" + #include namespace ARDOUR { diff --git a/libs/ardour/ardour/midi_scene_changer.h b/libs/ardour/ardour/midi_scene_changer.h index f7ff8f424c..27eb489254 100644 --- a/libs/ardour/ardour/midi_scene_changer.h +++ b/libs/ardour/ardour/midi_scene_changer.h @@ -21,6 +21,7 @@ #include +#include "ardour/midi_port.h" #include "ardour/scene_changer.h" namespace ARDOUR diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h index 2d0885aa8e..dcc55e02be 100644 --- a/libs/ardour/ardour/midi_ui.h +++ b/libs/ardour/ardour/midi_ui.h @@ -25,6 +25,8 @@ #include "pbd/abstract_ui.h" #include "pbd/signals.h" +#include "ardour/libardour_visibility.h" + namespace ARDOUR { class Session; diff --git a/libs/ardour/ardour/mixer_scene.h b/libs/ardour/ardour/mixer_scene.h index 8341f6cb83..eb5038c6f5 100644 --- a/libs/ardour/ardour/mixer_scene.h +++ b/libs/ardour/ardour/mixer_scene.h @@ -19,16 +19,13 @@ #ifndef _libardour_mixer_scene_h_ #define _libardour_mixer_scene_h_ +#include "pbd/controllable.h" #include "pbd/stateful.h" #include "ardour/libardour_visibility.h" #include "ardour/session_handle.h" #include "ardour/types.h" -namespace PBD { - class Controllable; -} - namespace ARDOUR { class LIBARDOUR_API MixerScene : public SessionHandleRef, public PBD::Stateful diff --git a/libs/ardour/ardour/monitor_port.h b/libs/ardour/ardour/monitor_port.h index 2d8c6c42f7..9cc3176941 100644 --- a/libs/ardour/ardour/monitor_port.h +++ b/libs/ardour/ardour/monitor_port.h @@ -25,6 +25,7 @@ #include "zita-resampler/vmresampler.h" #include "pbd/rcu.h" +#include #include "ardour/audio_buffer.h" #include "ardour/port_engine.h" diff --git a/libs/ardour/ardour/movable.h b/libs/ardour/ardour/movable.h index 64ad637f2d..d4fe89a7e6 100644 --- a/libs/ardour/ardour/movable.h +++ b/libs/ardour/ardour/movable.h @@ -18,6 +18,8 @@ #pragma once +#include "ardour/libardour_visibility.h" + namespace ARDOUR { class LIBARDOUR_API Movable { diff --git a/libs/ardour/ardour/panner_shell.h b/libs/ardour/ardour/panner_shell.h index 250656679e..74df576544 100644 --- a/libs/ardour/ardour/panner_shell.h +++ b/libs/ardour/ardour/panner_shell.h @@ -26,7 +26,9 @@ #include #include +#include "evoral/Parameter.h" #include "pbd/cartesian.h" +#include "temporal/domain_provider.h" #include "ardour/libardour_visibility.h" #include "ardour/types.h" diff --git a/libs/ardour/ardour/peak.h b/libs/ardour/ardour/peak.h index 47668177e2..26b86b7cd0 100644 --- a/libs/ardour/ardour/peak.h +++ b/libs/ardour/ardour/peak.h @@ -28,7 +28,7 @@ static inline float default_compute_peak (const ARDOUR::Sample * const buf, ARDOUR::pframes_t nsamples, float current) { for (ARDOUR::pframes_t i = 0; i < nsamples; ++i) { - current = f_max (current, fabsf (buf[i])); + current = ARDOUR::f_max (current, fabsf (buf[i])); } return current; } diff --git a/libs/ardour/ardour/proxy_controllable.h b/libs/ardour/ardour/proxy_controllable.h index 61137ae0ab..c6e61dd1e9 100644 --- a/libs/ardour/ardour/proxy_controllable.h +++ b/libs/ardour/ardour/proxy_controllable.h @@ -23,6 +23,8 @@ #include #include "pbd/controllable.h" + +#include "ardour/dB.h" #include "ardour/libardour_visibility.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/session_playlists.h b/libs/ardour/ardour/session_playlists.h index 1ee1faddd3..8045e4fe0e 100644 --- a/libs/ardour/ardour/session_playlists.h +++ b/libs/ardour/ardour/session_playlists.h @@ -27,6 +27,10 @@ #include +#include "ardour/libardour_visibility.h" +#include "ardour/types.h" + +#include "temporal/domain_swap.h" #include "pbd/signals.h" diff --git a/libs/ardour/ardour/spline.h b/libs/ardour/ardour/spline.h index 7af17ff986..47a80ad036 100644 --- a/libs/ardour/ardour/spline.h +++ b/libs/ardour/ardour/spline.h @@ -19,6 +19,8 @@ #pragma once +#include "ardour/libardour_visibility.h" + #include #ifdef __cplusplus diff --git a/libs/ardour/ardour/step_sequencer.h b/libs/ardour/ardour/step_sequencer.h index 9063a45e27..533f71021c 100644 --- a/libs/ardour/ardour/step_sequencer.h +++ b/libs/ardour/ardour/step_sequencer.h @@ -22,6 +22,7 @@ #include #include +#include #include @@ -38,6 +39,8 @@ #include "ardour/midi_state_tracker.h" #include "ardour/types.h" +#include "midi++/types.h" + namespace ARDOUR { class MidiBuffer; @@ -299,7 +302,7 @@ class StepSequencer : public PBD::Stateful size_t start_step; size_t end_step; - static MultiAllocSingleReleasePool pool; + static PBD::MultiAllocSingleReleasePool pool; void *operator new (size_t) { return pool.alloc (); @@ -322,7 +325,7 @@ class StepSequencer : public PBD::Stateful Temporal::Beats when; uint8_t buf[3]; - static Pool pool; + static PBD::Pool pool; void *operator new (size_t) { return pool.alloc (); diff --git a/libs/ardour/ardour/transport_fsm.h b/libs/ardour/ardour/transport_fsm.h index 94b660f59f..9dc2c2cac9 100644 --- a/libs/ardour/ardour/transport_fsm.h +++ b/libs/ardour/ardour/transport_fsm.h @@ -12,6 +12,7 @@ #include #include "pbd/demangle.h" +#include "pbd/pool.h" #include "ardour/debug.h" #include "ardour/types.h" diff --git a/libs/ardour/ardour/trimmable.h b/libs/ardour/ardour/trimmable.h index 357f812277..f2c7601a2b 100644 --- a/libs/ardour/ardour/trimmable.h +++ b/libs/ardour/ardour/trimmable.h @@ -18,6 +18,8 @@ #pragma once +#include "ardour/libardour_visibility.h" + namespace ARDOUR { class LIBARDOUR_API Trimmable { diff --git a/libs/audiographer/audiographer/general/threader.h b/libs/audiographer/audiographer/general/threader.h index 828643def0..df21125905 100644 --- a/libs/audiographer/audiographer/general/threader.h +++ b/libs/audiographer/audiographer/general/threader.h @@ -5,6 +5,7 @@ #include #include +#include "glibmm/threads.h" #include #include #include diff --git a/libs/backends/alsa/alsa_slave.h b/libs/backends/alsa/alsa_slave.h index e2c0a0b2b5..159b501936 100644 --- a/libs/backends/alsa/alsa_slave.h +++ b/libs/backends/alsa/alsa_slave.h @@ -24,6 +24,7 @@ #include #include "pbd/ringbuffer.h" +#include "pbd/signals.h" #include "zita-resampler/vresampler.h" #include "zita-alsa-pcmi.h" diff --git a/libs/canvas/canvas/stateful_image.h b/libs/canvas/canvas/stateful_image.h index 8b1bec5f58..a2a0570c23 100644 --- a/libs/canvas/canvas/stateful_image.h +++ b/libs/canvas/canvas/stateful_image.h @@ -25,6 +25,8 @@ #include +#include "pbd/search_path.h" + #include "canvas/item.h" class XMLNode; diff --git a/libs/evoral/libsmf/smf_private.h b/libs/evoral/libsmf/smf_private.h index 41ac7238fc..71958e4982 100644 --- a/libs/evoral/libsmf/smf_private.h +++ b/libs/evoral/libsmf/smf_private.h @@ -31,6 +31,8 @@ #include #include +#include "smf.h" + //#include "config.h" //#define SMF_VERSION PACKAGE_VERSION diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h index a081d42077..27c10b79b6 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h @@ -23,6 +23,8 @@ #include #include +#include +#include #include "gtkmm2ext/visibility.h" #include "gtkmm2ext/widget_state.h" diff --git a/libs/gtkmm2ext/gtkmm2ext/gtkutils.h b/libs/gtkmm2ext/gtkmm2ext/gtkutils.h index e9734e520f..346bfe7422 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtkutils.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtkutils.h @@ -22,6 +22,8 @@ #include "gtkmm2ext/visibility.h" +#include + namespace Gtk { class Widget; } diff --git a/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h index 1e0aea7a4b..9bcb7deaac 100644 --- a/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h +++ b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h @@ -22,6 +22,9 @@ #include #include "gtkmm2ext/visibility.h" +#include "gtkmm2ext/visibility_tracker.h" + +#include namespace Gtk { class Window; diff --git a/libs/gtkmm2ext/gtkmm2ext/window_proxy.h b/libs/gtkmm2ext/gtkmm2ext/window_proxy.h index aa4cad5a5e..f613ad4b6f 100644 --- a/libs/gtkmm2ext/gtkmm2ext/window_proxy.h +++ b/libs/gtkmm2ext/gtkmm2ext/window_proxy.h @@ -26,6 +26,8 @@ #include "pbd/statefuldestructible.h" +#include + #include "gtkmm2ext/visibility.h" namespace Gtk { diff --git a/libs/pbd/pbd/atomic_counter.h b/libs/pbd/pbd/atomic_counter.h index 21023f1c56..1d5c517215 100644 --- a/libs/pbd/pbd/atomic_counter.h +++ b/libs/pbd/pbd/atomic_counter.h @@ -20,6 +20,8 @@ #ifndef PBD_ATOMIC_COUNTER_H #define PBD_ATOMIC_COUNTER_H +#include "pbd/atomic.h" + #include #include diff --git a/libs/pbd/pbd/property_basics_impl.h b/libs/pbd/pbd/property_basics_impl.h index 5881b13d61..d557dbaafd 100644 --- a/libs/pbd/pbd/property_basics_impl.h +++ b/libs/pbd/pbd/property_basics_impl.h @@ -18,6 +18,8 @@ #pragma once +#include "pbd/property_basics.h" + namespace PBD { template diff --git a/libs/pbd/pbd/scoped_file_descriptor.h b/libs/pbd/pbd/scoped_file_descriptor.h index 06c53d15fe..0d525275aa 100644 --- a/libs/pbd/pbd/scoped_file_descriptor.h +++ b/libs/pbd/pbd/scoped_file_descriptor.h @@ -18,6 +18,8 @@ #pragma once +#include + namespace PBD { struct ScopedFileDescriptor { diff --git a/libs/surfaces/maschine2/ui_menu.h b/libs/surfaces/maschine2/ui_menu.h index e71a38c5d6..57ac3d9f1e 100644 --- a/libs/surfaces/maschine2/ui_menu.h +++ b/libs/surfaces/maschine2/ui_menu.h @@ -24,6 +24,7 @@ #include "pbd/signals.h" #include "canvas/container.h" +#include "canvas/rectangle.h" namespace ArdourCanvas { class Text; diff --git a/libs/surfaces/osc/osc_cue_observer.h b/libs/surfaces/osc/osc_cue_observer.h index dfe13651da..ecde92f30d 100644 --- a/libs/surfaces/osc/osc_cue_observer.h +++ b/libs/surfaces/osc/osc_cue_observer.h @@ -19,6 +19,8 @@ #ifndef __osc_osccueobserver_h__ #define __osc_osccueobserver_h__ +#include "osc.h" + #include #include diff --git a/libs/surfaces/osc/osc_global_observer.h b/libs/surfaces/osc/osc_global_observer.h index a9fa201a3c..4c08ae6e0c 100644 --- a/libs/surfaces/osc/osc_global_observer.h +++ b/libs/surfaces/osc/osc_global_observer.h @@ -19,6 +19,8 @@ #ifndef __osc_oscglobalobserver_h__ #define __osc_oscglobalobserver_h__ +#include "osc.h" + #include #include @@ -27,6 +29,9 @@ #include "pbd/controllable.h" #include "pbd/stateful.h" + +#include "ardour/route_group.h" +#include "ardour/session.h" #include "ardour/types.h" class OSCGlobalObserver diff --git a/libs/surfaces/osc/osc_gui.h b/libs/surfaces/osc/osc_gui.h index a78935953b..ed5d2bfab1 100644 --- a/libs/surfaces/osc/osc_gui.h +++ b/libs/surfaces/osc/osc_gui.h @@ -18,6 +18,10 @@ #ifndef osc_gui_h #define osc_gui_h +#include +#include +#include +#include #include "osc.h" diff --git a/libs/surfaces/osc/osc_select_observer.h b/libs/surfaces/osc/osc_select_observer.h index 0206bec2c6..9691d3fe53 100644 --- a/libs/surfaces/osc/osc_select_observer.h +++ b/libs/surfaces/osc/osc_select_observer.h @@ -28,8 +28,10 @@ #include "pbd/controllable.h" #include "pbd/stateful.h" -#include "ardour/types.h" + #include "ardour/processor.h" +#include "ardour/route_group.h" +#include "ardour/types.h" #include "osc.h" diff --git a/libs/surfaces/push2/follow_action.h b/libs/surfaces/push2/follow_action.h index 3c4e6d18d4..03ddcef793 100644 --- a/libs/surfaces/push2/follow_action.h +++ b/libs/surfaces/push2/follow_action.h @@ -25,8 +25,12 @@ * correctly. */ +#include "ardour/triggerbox.h" + #include "canvas/rectangle.h" +#include + namespace ArdourCanvas { class FollowActionIcon : public ArdourCanvas::Rectangle diff --git a/libs/surfaces/push2/level_meter.h b/libs/surfaces/push2/level_meter.h index 227d63bccc..a420c2c6c0 100644 --- a/libs/surfaces/push2/level_meter.h +++ b/libs/surfaces/push2/level_meter.h @@ -23,6 +23,9 @@ #include "canvas/container.h" #include "canvas/meter.h" +#include "ardour/chan_count.h" +#include "ardour/types.h" + namespace ARDOUR { class PeakMeter; } diff --git a/libs/surfaces/push2/scale.h b/libs/surfaces/push2/scale.h index 67e0a2b7cf..8a6cb193ff 100644 --- a/libs/surfaces/push2/scale.h +++ b/libs/surfaces/push2/scale.h @@ -22,9 +22,11 @@ #include #include "layout.h" +#include "push2.h" namespace ArdourCanvas { class Rectangle; + class Text; } namespace ArdourSurface { diff --git a/libs/surfaces/push2/track_mix.h b/libs/surfaces/push2/track_mix.h index 69f4f7f356..f6b564ec44 100644 --- a/libs/surfaces/push2/track_mix.h +++ b/libs/surfaces/push2/track_mix.h @@ -21,7 +21,10 @@ #include +#include "pbd/property_basics.h" + #include "layout.h" +#include "push2.h" namespace ARDOUR { class Stripable; diff --git a/libs/surfaces/us2400/gui.h b/libs/surfaces/us2400/gui.h index ff6ca5088e..22eb347ef2 100644 --- a/libs/surfaces/us2400/gui.h +++ b/libs/surfaces/us2400/gui.h @@ -20,9 +20,11 @@ #include #include +#include #include #include #include +#include #include #include #include diff --git a/libs/surfaces/us2400/surface_port.h b/libs/surfaces/us2400/surface_port.h index 8dc517825e..082a2828ef 100644 --- a/libs/surfaces/us2400/surface_port.h +++ b/libs/surfaces/us2400/surface_port.h @@ -21,6 +21,7 @@ #include #include "pbd/signals.h" +#include "pbd/xml++.h" #include "midi_byte_array.h" diff --git a/libs/surfaces/us2400/timer.h b/libs/surfaces/us2400/timer.h index 01b5878899..9c0cfa1a76 100644 --- a/libs/surfaces/us2400/timer.h +++ b/libs/surfaces/us2400/timer.h @@ -19,6 +19,8 @@ #ifndef timer_h #define timer_h +#include + #include #ifdef _WIN32 diff --git a/libs/widgets/widgets/binding_proxy.h b/libs/widgets/widgets/binding_proxy.h index 438b893447..8f15abe324 100644 --- a/libs/widgets/widgets/binding_proxy.h +++ b/libs/widgets/widgets/binding_proxy.h @@ -25,6 +25,8 @@ #include "pbd/signals.h" +#include "gdk/gdkevents.h" + #include "widgets/visibility.h" namespace PBD { diff --git a/libs/zita-convolver/zita-convolver/zita-convolver.h b/libs/zita-convolver/zita-convolver/zita-convolver.h index 74f8e41c5b..1b0e6ca3f9 100644 --- a/libs/zita-convolver/zita-convolver/zita-convolver.h +++ b/libs/zita-convolver/zita-convolver/zita-convolver.h @@ -27,6 +27,10 @@ #include "zita-convolver/zconvolver_visibility.h" +#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(PTW32_VERSION) || defined(__WINPTHREADS_VERSION) +#include +#endif + namespace ArdourZita { #ifdef ZCSEMA_IS_IMPLEMENTED @@ -36,8 +40,6 @@ namespace ArdourZita { /* note: mingw and msvc actually use PTW32's implementation of semaphores */ #if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(PTW32_VERSION) || defined (__WINPTHREADS_VERSION) -#include - class LIBZCONVOLVER_API ZCsema { public: