From 8f86877a137ae3a0dc23c68db9e16d88b9bd7fc2 Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Tue, 26 Sep 2023 09:29:06 +0100 Subject: [PATCH] Resave all projects --- .../main/assets/AudioLiveScrollingDisplay.h | 4 +-- .../app/src/main/assets/DSPDemos_Common.h | 36 +++++++++---------- .../app/src/main/assets/DemoUtilities.h | 11 +++--- .../main/assets/AudioLiveScrollingDisplay.h | 4 +-- .../app/src/main/assets/DSPDemos_Common.h | 36 +++++++++---------- .../app/src/main/assets/DemoUtilities.h | 11 +++--- 6 files changed, 48 insertions(+), 54 deletions(-) diff --git a/examples/DemoRunner/Builds/Android/app/src/main/assets/AudioLiveScrollingDisplay.h b/examples/DemoRunner/Builds/Android/app/src/main/assets/AudioLiveScrollingDisplay.h index d706170dc2..a60d277063 100644 --- a/examples/DemoRunner/Builds/Android/app/src/main/assets/AudioLiveScrollingDisplay.h +++ b/examples/DemoRunner/Builds/Android/app/src/main/assets/AudioLiveScrollingDisplay.h @@ -24,8 +24,8 @@ /* This component scrolls a continuous waveform showing the audio that's coming into whatever audio inputs this object is connected to. */ -class LiveScrollingAudioDisplay : public AudioVisualiserComponent, - public AudioIODeviceCallback +class LiveScrollingAudioDisplay final : public AudioVisualiserComponent, + public AudioIODeviceCallback { public: LiveScrollingAudioDisplay() : AudioVisualiserComponent (1) diff --git a/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h b/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h index 555fba1bc1..6e2bf3e836 100644 --- a/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h +++ b/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h @@ -38,7 +38,7 @@ struct DSPDemoParameterBase : public ChangeBroadcaster }; //============================================================================== -struct SliderParameter : public DSPDemoParameterBase +struct SliderParameter final : public DSPDemoParameterBase { SliderParameter (Range range, double skew, double initialValue, const String& labelName, const String& suffix = {}) @@ -66,7 +66,7 @@ private: }; //============================================================================== -struct ChoiceParameter : public DSPDemoParameterBase +struct ChoiceParameter final : public DSPDemoParameterBase { ChoiceParameter (const StringArray& options, int initialId, const String& labelName) : DSPDemoParameterBase (labelName) @@ -89,11 +89,11 @@ private: }; //============================================================================== -class AudioThumbnailComponent : public Component, - public FileDragAndDropTarget, - public ChangeBroadcaster, - private ChangeListener, - private Timer +class AudioThumbnailComponent final : public Component, + public FileDragAndDropTarget, + public ChangeBroadcaster, + private ChangeListener, + private Timer { public: AudioThumbnailComponent (AudioDeviceManager& adm, AudioFormatManager& afm) @@ -217,7 +217,7 @@ private: }; //============================================================================== -class DemoParametersComponent : public Component +class DemoParametersComponent final : public Component { public: DemoParametersComponent (const std::vector& demoParams) @@ -270,9 +270,9 @@ private: //============================================================================== template -struct DSPDemo : public AudioSource, - public ProcessorWrapper, - private ChangeListener +struct DSPDemo final : public AudioSource, + public ProcessorWrapper, + private ChangeListener { DSPDemo (AudioSource& input) : inputSource (&input) @@ -327,10 +327,10 @@ struct DSPDemo : public AudioSource, //============================================================================== template -class AudioFileReaderComponent : public Component, - private TimeSliceThread, - private Value::Listener, - private ChangeListener +class AudioFileReaderComponent final : public Component, + private TimeSliceThread, + private Value::Listener, + private ChangeListener { public: //============================================================================== @@ -496,9 +496,9 @@ public: private: //============================================================================== - class AudioPlayerHeader : public Component, - private ChangeListener, - private Value::Listener + class AudioPlayerHeader final : public Component, + private ChangeListener, + private Value::Listener { public: AudioPlayerHeader (AudioDeviceManager& adm, diff --git a/examples/DemoRunner/Builds/Android/app/src/main/assets/DemoUtilities.h b/examples/DemoRunner/Builds/Android/app/src/main/assets/DemoUtilities.h index b2d38fffb6..b63db25b3f 100644 --- a/examples/DemoRunner/Builds/Android/app/src/main/assets/DemoUtilities.h +++ b/examples/DemoRunner/Builds/Android/app/src/main/assets/DemoUtilities.h @@ -218,11 +218,7 @@ inline Path getJUCELogoPath() // 0.0 and 1.0 at a random speed struct BouncingNumber { - BouncingNumber() - : speed (0.0004 + 0.0007 * Random::getSystemRandom().nextDouble()), - phase (Random::getSystemRandom().nextDouble()) - { - } + virtual ~BouncingNumber() = default; float getValue() const { @@ -231,10 +227,11 @@ struct BouncingNumber } protected: - double speed, phase; + double speed = 0.0004 + 0.0007 * Random::getSystemRandom().nextDouble(), + phase = Random::getSystemRandom().nextDouble(); }; -struct SlowerBouncingNumber : public BouncingNumber +struct SlowerBouncingNumber final : public BouncingNumber { SlowerBouncingNumber() { diff --git a/extras/AudioPluginHost/Builds/Android/app/src/main/assets/AudioLiveScrollingDisplay.h b/extras/AudioPluginHost/Builds/Android/app/src/main/assets/AudioLiveScrollingDisplay.h index d706170dc2..a60d277063 100644 --- a/extras/AudioPluginHost/Builds/Android/app/src/main/assets/AudioLiveScrollingDisplay.h +++ b/extras/AudioPluginHost/Builds/Android/app/src/main/assets/AudioLiveScrollingDisplay.h @@ -24,8 +24,8 @@ /* This component scrolls a continuous waveform showing the audio that's coming into whatever audio inputs this object is connected to. */ -class LiveScrollingAudioDisplay : public AudioVisualiserComponent, - public AudioIODeviceCallback +class LiveScrollingAudioDisplay final : public AudioVisualiserComponent, + public AudioIODeviceCallback { public: LiveScrollingAudioDisplay() : AudioVisualiserComponent (1) diff --git a/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h b/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h index 555fba1bc1..6e2bf3e836 100644 --- a/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h +++ b/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h @@ -38,7 +38,7 @@ struct DSPDemoParameterBase : public ChangeBroadcaster }; //============================================================================== -struct SliderParameter : public DSPDemoParameterBase +struct SliderParameter final : public DSPDemoParameterBase { SliderParameter (Range range, double skew, double initialValue, const String& labelName, const String& suffix = {}) @@ -66,7 +66,7 @@ private: }; //============================================================================== -struct ChoiceParameter : public DSPDemoParameterBase +struct ChoiceParameter final : public DSPDemoParameterBase { ChoiceParameter (const StringArray& options, int initialId, const String& labelName) : DSPDemoParameterBase (labelName) @@ -89,11 +89,11 @@ private: }; //============================================================================== -class AudioThumbnailComponent : public Component, - public FileDragAndDropTarget, - public ChangeBroadcaster, - private ChangeListener, - private Timer +class AudioThumbnailComponent final : public Component, + public FileDragAndDropTarget, + public ChangeBroadcaster, + private ChangeListener, + private Timer { public: AudioThumbnailComponent (AudioDeviceManager& adm, AudioFormatManager& afm) @@ -217,7 +217,7 @@ private: }; //============================================================================== -class DemoParametersComponent : public Component +class DemoParametersComponent final : public Component { public: DemoParametersComponent (const std::vector& demoParams) @@ -270,9 +270,9 @@ private: //============================================================================== template -struct DSPDemo : public AudioSource, - public ProcessorWrapper, - private ChangeListener +struct DSPDemo final : public AudioSource, + public ProcessorWrapper, + private ChangeListener { DSPDemo (AudioSource& input) : inputSource (&input) @@ -327,10 +327,10 @@ struct DSPDemo : public AudioSource, //============================================================================== template -class AudioFileReaderComponent : public Component, - private TimeSliceThread, - private Value::Listener, - private ChangeListener +class AudioFileReaderComponent final : public Component, + private TimeSliceThread, + private Value::Listener, + private ChangeListener { public: //============================================================================== @@ -496,9 +496,9 @@ public: private: //============================================================================== - class AudioPlayerHeader : public Component, - private ChangeListener, - private Value::Listener + class AudioPlayerHeader final : public Component, + private ChangeListener, + private Value::Listener { public: AudioPlayerHeader (AudioDeviceManager& adm, diff --git a/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DemoUtilities.h b/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DemoUtilities.h index b2d38fffb6..b63db25b3f 100644 --- a/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DemoUtilities.h +++ b/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DemoUtilities.h @@ -218,11 +218,7 @@ inline Path getJUCELogoPath() // 0.0 and 1.0 at a random speed struct BouncingNumber { - BouncingNumber() - : speed (0.0004 + 0.0007 * Random::getSystemRandom().nextDouble()), - phase (Random::getSystemRandom().nextDouble()) - { - } + virtual ~BouncingNumber() = default; float getValue() const { @@ -231,10 +227,11 @@ struct BouncingNumber } protected: - double speed, phase; + double speed = 0.0004 + 0.0007 * Random::getSystemRandom().nextDouble(), + phase = Random::getSystemRandom().nextDouble(); }; -struct SlowerBouncingNumber : public BouncingNumber +struct SlowerBouncingNumber final : public BouncingNumber { SlowerBouncingNumber() {