From 955e63437189aecf395baff600c21ccbfe0a923a Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sun, 20 Oct 2024 00:46:31 +0200 Subject: [PATCH] Make header files more self-contained - add missing std includes --- gtk2_ardour/ghost_event.h | 1 + gtk2_ardour/loudness_settings.h | 5 +++++ gtk2_ardour/luasignal.h | 3 +++ gtk2_ardour/midi_util.h | 2 ++ gtk2_ardour/mouse_cursors.h | 2 ++ gtk2_ardour/patch_change_dialog.h | 3 +++ gtk2_ardour/pingback.h | 2 ++ gtk2_ardour/strip_selection.h | 2 +- libs/ardour/ardour/comparable_shared_ptr.h | 2 ++ libs/ardour/ardour/control_group_member.h | 2 ++ libs/ardour/ardour/event_ring_buffer.h | 1 + libs/ardour/ardour/export_smf_writer.h | 2 ++ libs/ardour/ardour/library.h | 1 + libs/ardour/ardour/logcurve.h | 2 ++ libs/ardour/ardour/spline.h | 2 ++ libs/ardour/ardour/vst3_scan.h | 1 + libs/backends/alsa/select_sleep.h | 2 ++ libs/backends/portaudio/midi_device_info.h | 3 +++ libs/backends/portaudio/midi_util.h | 1 + .../ctrl-interface/control_protocol/control_protocol/types.h | 1 + libs/evoral/evoral/SMF.h | 2 ++ libs/surfaces/mackie/timer.h | 2 ++ libs/surfaces/maschine2/images.h | 2 ++ libs/surfaces/maschine2/m2_pad.h | 4 +++- libs/surfaces/maschine2/m2device.h | 4 +++- libs/surfaces/us2400/timer.h | 2 ++ libs/surfaces/websockets/json.h | 2 ++ libs/temporal/temporal/types.h | 2 ++ 28 files changed, 57 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/ghost_event.h b/gtk2_ardour/ghost_event.h index ed702973b5..76db97abff 100644 --- a/gtk2_ardour/ghost_event.h +++ b/gtk2_ardour/ghost_event.h @@ -1,6 +1,7 @@ #ifndef __gtk2_ardour_ghost_event_h__ #define __gtk2_ardour_ghost_event_h__ +#include #include #include diff --git a/gtk2_ardour/loudness_settings.h b/gtk2_ardour/loudness_settings.h index 83a9d21a24..e270dc4f9f 100644 --- a/gtk2_ardour/loudness_settings.h +++ b/gtk2_ardour/loudness_settings.h @@ -19,6 +19,11 @@ #ifndef _gtkardour_loudness_settings_h_ #define _gtkardour_loudness_settings_h_ +#include +#include +#include +#include + class XMLNode; struct CLoudnessPreset diff --git a/gtk2_ardour/luasignal.h b/gtk2_ardour/luasignal.h index 2293a7aeb0..0196625b1f 100644 --- a/gtk2_ardour/luasignal.h +++ b/gtk2_ardour/luasignal.h @@ -17,6 +17,9 @@ */ #ifndef _luasignal_h_ #define _luasignal_h_ + +#include + namespace LuaSignal { #define ENGINE(name,c) name, diff --git a/gtk2_ardour/midi_util.h b/gtk2_ardour/midi_util.h index aac285fb25..14619a76ff 100644 --- a/gtk2_ardour/midi_util.h +++ b/gtk2_ardour/midi_util.h @@ -19,6 +19,8 @@ #pragma once +#include + inline static void clamp_to_0_127(uint8_t &val) { if ((127 < val) && (val < 192)) { diff --git a/gtk2_ardour/mouse_cursors.h b/gtk2_ardour/mouse_cursors.h index 6d3101a237..07304a9795 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 + class MouseCursors { public: diff --git a/gtk2_ardour/patch_change_dialog.h b/gtk2_ardour/patch_change_dialog.h index d3b1478e75..b841ec4159 100644 --- a/gtk2_ardour/patch_change_dialog.h +++ b/gtk2_ardour/patch_change_dialog.h @@ -19,6 +19,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#pragma once + +#include #include #include diff --git a/gtk2_ardour/pingback.h b/gtk2_ardour/pingback.h index d83bafce55..e55057d9fd 100644 --- a/gtk2_ardour/pingback.h +++ b/gtk2_ardour/pingback.h @@ -18,6 +18,8 @@ #pragma once +#include + namespace ARDOUR { void pingback (const std::string& this_version, const std::string& announce_path); diff --git a/gtk2_ardour/strip_selection.h b/gtk2_ardour/strip_selection.h index 05602fddb7..51f62b4c63 100644 --- a/gtk2_ardour/strip_selection.h +++ b/gtk2_ardour/strip_selection.h @@ -24,5 +24,5 @@ class MixerStrip; -struct MixerStripSelection : list {}; +struct MixerStripSelection : std::list {}; diff --git a/libs/ardour/ardour/comparable_shared_ptr.h b/libs/ardour/ardour/comparable_shared_ptr.h index e670225575..dd68c816f3 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 + namespace ARDOUR { template diff --git a/libs/ardour/ardour/control_group_member.h b/libs/ardour/ardour/control_group_member.h index ca7e013efb..0504b95b36 100644 --- a/libs/ardour/ardour/control_group_member.h +++ b/libs/ardour/ardour/control_group_member.h @@ -18,6 +18,8 @@ #pragma once +#include + namespace ARDOUR { class ControlGroup; diff --git a/libs/ardour/ardour/event_ring_buffer.h b/libs/ardour/ardour/event_ring_buffer.h index 555a2b293d..c3fecd9540 100644 --- a/libs/ardour/ardour/event_ring_buffer.h +++ b/libs/ardour/ardour/event_ring_buffer.h @@ -19,6 +19,7 @@ #pragma once #include +#include #include #include "pbd/ringbufferNPT.h" diff --git a/libs/ardour/ardour/export_smf_writer.h b/libs/ardour/ardour/export_smf_writer.h index 9d86d1b832..ea58b4b099 100644 --- a/libs/ardour/ardour/export_smf_writer.h +++ b/libs/ardour/ardour/export_smf_writer.h @@ -25,6 +25,8 @@ #include "ardour/midi_state_tracker.h" #include "ardour/types.h" +#include + namespace ARDOUR { class MidiBuffer; diff --git a/libs/ardour/ardour/library.h b/libs/ardour/ardour/library.h index e24aafd7d2..23f79fa461 100644 --- a/libs/ardour/ardour/library.h +++ b/libs/ardour/ardour/library.h @@ -20,6 +20,7 @@ #include #include +#include #include #include diff --git a/libs/ardour/ardour/logcurve.h b/libs/ardour/ardour/logcurve.h index bfab98533f..f78a68159f 100644 --- a/libs/ardour/ardour/logcurve.h +++ b/libs/ardour/ardour/logcurve.h @@ -23,6 +23,8 @@ #include "pbd/fastlog.h" #include +#include + namespace ARDOUR { class LIBARDOUR_API LogCurve { diff --git a/libs/ardour/ardour/spline.h b/libs/ardour/ardour/spline.h index c0f02180b7..7af17ff986 100644 --- a/libs/ardour/ardour/spline.h +++ b/libs/ardour/ardour/spline.h @@ -19,6 +19,8 @@ #pragma once +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/libs/ardour/ardour/vst3_scan.h b/libs/ardour/ardour/vst3_scan.h index 0bd842cc2e..d3dc68964e 100644 --- a/libs/ardour/ardour/vst3_scan.h +++ b/libs/ardour/ardour/vst3_scan.h @@ -19,6 +19,7 @@ #ifndef _ardour_vst3_scan_h_ #define _ardour_vst3_scan_h_ +#include #include #include #include diff --git a/libs/backends/alsa/select_sleep.h b/libs/backends/alsa/select_sleep.h index adcdac2ccd..d370284c94 100644 --- a/libs/backends/alsa/select_sleep.h +++ b/libs/backends/alsa/select_sleep.h @@ -19,6 +19,8 @@ #include #include +#include + /* select() sleeps _at most_ a given time. * (compared to usleep() or nanosleep() which sleep at least a given time) */ diff --git a/libs/backends/portaudio/midi_device_info.h b/libs/backends/portaudio/midi_device_info.h index 7b470df891..763a6abbf8 100644 --- a/libs/backends/portaudio/midi_device_info.h +++ b/libs/backends/portaudio/midi_device_info.h @@ -1,6 +1,9 @@ #ifndef MIDI_DEVICE_INFO_H #define MIDI_DEVICE_INFO_H +#include +#include + /* midi settings */ struct MidiDeviceInfo { MidiDeviceInfo(const std::string& dev_name) diff --git a/libs/backends/portaudio/midi_util.h b/libs/backends/portaudio/midi_util.h index 0bb10839e2..65b13c69b4 100644 --- a/libs/backends/portaudio/midi_util.h +++ b/libs/backends/portaudio/midi_util.h @@ -19,6 +19,7 @@ #ifndef MIDI_UTIL_H #define MIDI_UTIL_H +#include #include struct MidiEventHeader { diff --git a/libs/ctrl-interface/control_protocol/control_protocol/types.h b/libs/ctrl-interface/control_protocol/control_protocol/types.h index 7285fc1bde..a654be2ad1 100644 --- a/libs/ctrl-interface/control_protocol/control_protocol/types.h +++ b/libs/ctrl-interface/control_protocol/control_protocol/types.h @@ -19,6 +19,7 @@ #ifndef __ardour_control_protocol_types_h__ #define __ardour_control_protocol_types_h__ +#include #include namespace ARDOUR { diff --git a/libs/evoral/evoral/SMF.h b/libs/evoral/evoral/SMF.h index 42ff9c6f0c..0c9908cf63 100644 --- a/libs/evoral/evoral/SMF.h +++ b/libs/evoral/evoral/SMF.h @@ -23,6 +23,8 @@ #define EVORAL_SMF_HPP #include + +#include #include #include "evoral/visibility.h" diff --git a/libs/surfaces/mackie/timer.h b/libs/surfaces/mackie/timer.h index 4d25ec6ce7..6afda5ed33 100644 --- a/libs/surfaces/mackie/timer.h +++ b/libs/surfaces/mackie/timer.h @@ -25,6 +25,8 @@ #include "types.h" +#include + namespace ArdourSurface { namespace MACKIE_NAMESPACE { /** diff --git a/libs/surfaces/maschine2/images.h b/libs/surfaces/maschine2/images.h index 99ff7486d0..28736b5cde 100644 --- a/libs/surfaces/maschine2/images.h +++ b/libs/surfaces/maschine2/images.h @@ -16,6 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include + static const uint8_t maschine_png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x40, diff --git a/libs/surfaces/maschine2/m2_pad.h b/libs/surfaces/maschine2/m2_pad.h index e93084ad34..55722cc40b 100644 --- a/libs/surfaces/maschine2/m2_pad.h +++ b/libs/surfaces/maschine2/m2_pad.h @@ -22,6 +22,8 @@ #include #include "pbd/signals.h" +#include + namespace ArdourSurface { class M2PadInterface @@ -106,7 +108,7 @@ class M2Pad : public M2PadInterface released (); /* EMIT SIGNAL */ event (_pressure, true); /* EMIT SIGNAL */ } else { - if (fabsf (_last - _pressure) > mindelta) { + if (std::fabsf (_last - _pressure) > mindelta) { _last = _pressure; aftertouch (_pressure); /* EMIT SIGNAL */ event (_pressure, false); /* EMIT SIGNAL */ diff --git a/libs/surfaces/maschine2/m2device.h b/libs/surfaces/maschine2/m2device.h index 0690325049..ef8756c99e 100644 --- a/libs/surfaces/maschine2/m2device.h +++ b/libs/surfaces/maschine2/m2device.h @@ -24,6 +24,8 @@ #include #include "pbd/signals.h" +#include + namespace ArdourSurface { class M2Contols; @@ -63,7 +65,7 @@ class M2Device protected: void bump_blink () { _blink_counter = (_blink_counter + 1) % 12; - _blink_shade = fabsf (1.f - _blink_counter / 6.f); + _blink_shade = std::fabsf (1.f - _blink_counter / 6.f); } uint32_t _splashcnt; diff --git a/libs/surfaces/us2400/timer.h b/libs/surfaces/us2400/timer.h index c2e5f04285..01b5878899 100644 --- a/libs/surfaces/us2400/timer.h +++ b/libs/surfaces/us2400/timer.h @@ -19,6 +19,8 @@ #ifndef timer_h #define timer_h +#include + #ifdef _WIN32 #include "windows.h" #else diff --git a/libs/surfaces/websockets/json.h b/libs/surfaces/websockets/json.h index 65cdfabd1b..9f11fca9f9 100644 --- a/libs/surfaces/websockets/json.h +++ b/libs/surfaces/websockets/json.h @@ -19,6 +19,8 @@ #ifndef _ardour_surface_websockets_json_h_ #define _ardour_surface_websockets_json_h_ +#include + namespace ArdourSurface { namespace WebSocketsJSON diff --git a/libs/temporal/temporal/types.h b/libs/temporal/temporal/types.h index 0079f67bfb..ba81e361af 100644 --- a/libs/temporal/temporal/types.h +++ b/libs/temporal/temporal/types.h @@ -18,7 +18,9 @@ #pragma once +#include #include +#include #include #include "pbd/integer_division.h"