diff --git a/examples/Demo/Source/Demos/WidgetsDemo.cpp b/examples/Demo/Source/Demos/WidgetsDemo.cpp index cb31f9f79a..4edb1da085 100644 --- a/examples/Demo/Source/Demos/WidgetsDemo.cpp +++ b/examples/Demo/Source/Demos/WidgetsDemo.cpp @@ -1058,7 +1058,7 @@ private: return columnXml->getStringAttribute ("name"); } - return String(); + return {}; } JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TableDemoComponent) @@ -1317,9 +1317,7 @@ public: //============================================================================== StringArray getMenuBarNames() override { - const char* const names[] = { "Demo", "Look-and-feel", "Tabs", "Misc", nullptr }; - - return StringArray (names); + return { "Demo", "Look-and-feel", "Tabs", "Misc" }; } PopupMenu getMenuForIndex (int menuIndex, const String& /*menuName*/) override diff --git a/extras/Projucer/Source/Application/jucer_Application.cpp b/extras/Projucer/Source/Application/jucer_Application.cpp index f4874dad8b..0a5bb645f8 100644 --- a/extras/Projucer/Source/Application/jucer_Application.cpp +++ b/extras/Projucer/Source/Application/jucer_Application.cpp @@ -340,8 +340,7 @@ MenuBarModel* ProjucerApplication::getMenuModel() StringArray ProjucerApplication::getMenuNames() { - const char* const names[] = { "File", "Edit", "View", "Build", "Window", "GUI Editor", "Tools", nullptr }; - return StringArray (names); + return { "File", "Edit", "View", "Build", "Window", "GUI Editor", "Tools" }; } void ProjucerApplication::createMenu (PopupMenu& menu, const String& menuName) diff --git a/extras/Projucer/Source/Project/jucer_ProjectType.h b/extras/Projucer/Source/Project/jucer_ProjectType.h index 26446890ac..56247ed33f 100644 --- a/extras/Projucer/Source/Project/jucer_ProjectType.h +++ b/extras/Projucer/Source/Project/jucer_ProjectType.h @@ -206,7 +206,5 @@ inline Array ProjectType::getAllTypes() static ProjectType_DLL dll; static ProjectType_AudioPlugin plugin; - static ProjectType* allTypes[] = { &guiApp, &consoleApp, &staticLib, &dll, &plugin, nullptr }; - - return Array (allTypes); + return { &guiApp, &consoleApp, &staticLib, &dll, &plugin }; } diff --git a/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h b/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h index 9674c1ab42..85cbe7cf70 100644 --- a/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h +++ b/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h @@ -72,7 +72,7 @@ struct NewProjectWizard virtual StringArray getDefaultModules() { - static const char* mods[] = + return { "juce_core", "juce_events", @@ -86,11 +86,8 @@ struct NewProjectWizard "juce_audio_basics", "juce_audio_devices", "juce_audio_formats", - "juce_audio_processors", - nullptr + "juce_audio_processors" }; - - return StringArray (mods); } String appTitle; diff --git a/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp b/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp index 10ea41abae..319e57cc50 100644 --- a/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp +++ b/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp @@ -402,7 +402,7 @@ public: return true; } - auto currentPlayTime = Time::getHighResolutionTicks (); + auto currentPlayTime = Time::getHighResolutionTicks(); if (! firstPlayTime) { auto expectedBuffers = (currentPlayTime - lastPlayTime) / ticksPerBuffer; @@ -534,9 +534,8 @@ struct DSoundInternalInChannel public: DSoundInternalInChannel (const String& name_, const GUID& guid_, int rate, int bufferSize, float* left, float* right) - : bitDepth (16), name (name_), guid (guid_), sampleRate (rate), - bufferSizeSamples (bufferSize), leftBuffer (left), rightBuffer (right), - pDirectSound (nullptr), pDirectSoundCapture (nullptr), pInputBuffer (nullptr) + : name (name_), guid (guid_), sampleRate (rate), + bufferSizeSamples (bufferSize), leftBuffer (left), rightBuffer (right) { } @@ -647,6 +646,7 @@ public: return true; int bytesFilled = (int) (readPos - readOffset); + if (bytesFilled < 0) bytesFilled += totalBytesPerBuffer; @@ -715,7 +715,7 @@ public: unsigned int readOffset; int bytesPerBuffer, totalBytesPerBuffer; - int bitDepth; + int bitDepth = 16; bool doneFlag; private: @@ -725,9 +725,9 @@ private: float* leftBuffer; float* rightBuffer; - IDirectSound* pDirectSound; - IDirectSoundCapture* pDirectSoundCapture; - IDirectSoundCaptureBuffer* pInputBuffer; + IDirectSound* pDirectSound = nullptr; + IDirectSoundCapture* pDirectSoundCapture = nullptr; + IDirectSoundCaptureBuffer* pInputBuffer = nullptr; JUCE_DECLARE_NON_COPYABLE (DSoundInternalInChannel) }; @@ -743,12 +743,7 @@ public: : AudioIODevice (deviceName, "DirectSound"), Thread ("Juce DSound"), outputDeviceIndex (outputDeviceIndex_), - inputDeviceIndex (inputDeviceIndex_), - isOpen_ (false), - isStarted (false), - bufferSizeSamples (0), - sampleRate (0.0), - callback (nullptr) + inputDeviceIndex (inputDeviceIndex_) { if (outputDeviceIndex_ >= 0) { @@ -801,8 +796,7 @@ public: Array getAvailableSampleRates() override { - static const double rates[] = { 44100.0, 48000.0, 88200.0, 96000.0 }; - return Array (rates, numElementsInArray (rates)); + return { 44100.0, 48000.0, 88200.0, 96000.0 }; } Array getAvailableBufferSizes() override @@ -862,7 +856,7 @@ public: { if (isStarted) { - AudioIODeviceCallback* const callbackLocal = callback; + auto* callbackLocal = callback; { const ScopedLock sl (startStopLock); @@ -877,9 +871,9 @@ public: bool isPlaying() override { return isStarted && isOpen_ && isThreadRunning(); } String getLastError() override { return lastError; } - int getXRunCount () const noexcept override + int getXRunCount() const noexcept override { - return (outChans[0] != nullptr ? outChans[0]->xruns : -1); + return outChans[0] != nullptr ? outChans[0]->xruns : -1; } //============================================================================== @@ -887,20 +881,20 @@ public: int outputDeviceIndex, inputDeviceIndex; private: - bool isOpen_; - bool isStarted; + bool isOpen_ = false; + bool isStarted = false; String lastError; OwnedArray inChans; OwnedArray outChans; WaitableEvent startEvent; - int bufferSizeSamples; - double sampleRate; + int bufferSizeSamples = 0; + double sampleRate = 0; BigInteger enabledInputs, enabledOutputs; AudioSampleBuffer inputBuffers, outputBuffers; - AudioIODeviceCallback* callback; + AudioIODeviceCallback* callback = nullptr; CriticalSection startStopLock; String openDevice (const BigInteger& inputChannels, @@ -1218,8 +1212,7 @@ class DSoundAudioIODeviceType : public AudioIODeviceType, public: DSoundAudioIODeviceType() : AudioIODeviceType ("DirectSound"), - DeviceChangeDetector (L"DirectSound"), - hasScanned (false) + DeviceChangeDetector (L"DirectSound") { initialiseDSoundFunctions(); } @@ -1275,7 +1268,7 @@ public: private: DSoundDeviceList deviceList; - bool hasScanned; + bool hasScanned = false; void systemDeviceChanged() override { diff --git a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp index f8d4cc0885..253abccf1c 100644 --- a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp @@ -933,14 +933,12 @@ AiffAudioFormat::~AiffAudioFormat() {} Array AiffAudioFormat::getPossibleSampleRates() { - const int rates[] = { 22050, 32000, 44100, 48000, 88200, 96000, 176400, 192000, 0 }; - return Array (rates); + return { 22050, 32000, 44100, 48000, 88200, 96000, 176400, 192000 }; } Array AiffAudioFormat::getPossibleBitDepths() { - const int depths[] = { 8, 16, 24, 0 }; - return Array (depths); + return { 8, 16, 24 }; } bool AiffAudioFormat::canDoStereo() { return true; } diff --git a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp index 99f8609dbd..8cc6e65064 100644 --- a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp @@ -545,17 +545,13 @@ FlacAudioFormat::~FlacAudioFormat() {} Array FlacAudioFormat::getPossibleSampleRates() { - const int rates[] = { 8000, 11025, 12000, 16000, 22050, 32000, 44100, 48000, - 88200, 96000, 176400, 192000, 352800, 384000 }; - - return Array (rates, numElementsInArray (rates)); + return { 8000, 11025, 12000, 16000, 22050, 32000, 44100, 48000, + 88200, 96000, 176400, 192000, 352800, 384000 }; } Array FlacAudioFormat::getPossibleBitDepths() { - const int depths[] = { 16, 24 }; - - return Array (depths, numElementsInArray (depths)); + return { 16, 24 }; } bool FlacAudioFormat::canDoStereo() { return true; } @@ -595,8 +591,7 @@ AudioFormatWriter* FlacAudioFormat::createWriterFor (OutputStream* out, StringArray FlacAudioFormat::getQualityOptions() { - static const char* options[] = { "0 (Fastest)", "1", "2", "3", "4", "5 (Default)","6", "7", "8 (Highest quality)", 0 }; - return StringArray (options); + return { "0 (Fastest)", "1", "2", "3", "4", "5 (Default)","6", "7", "8 (Highest quality)" }; } #endif diff --git a/modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp index 171fbbed2d..6c9a2b8805 100644 --- a/modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp @@ -168,14 +168,12 @@ bool LAMEEncoderAudioFormat::canHandleFile (const File&) Array LAMEEncoderAudioFormat::getPossibleSampleRates() { - const int rates[] = { 32000, 44100, 48000, 0 }; - return Array (rates); + return { 32000, 44100, 48000 }; } Array LAMEEncoderAudioFormat::getPossibleBitDepths() { - const int depths[] = { 16, 0 }; - return Array (depths); + return Array (16); } bool LAMEEncoderAudioFormat::canDoStereo() { return true; } diff --git a/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp index 5d7c1a5f8b..be0209a222 100644 --- a/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp @@ -433,17 +433,13 @@ OggVorbisAudioFormat::~OggVorbisAudioFormat() Array OggVorbisAudioFormat::getPossibleSampleRates() { - const int rates[] = { 8000, 11025, 12000, 16000, 22050, 32000, - 44100, 48000, 88200, 96000, 176400, 192000 }; - - return Array (rates, numElementsInArray (rates)); + return { 8000, 11025, 12000, 16000, 22050, 32000, + 44100, 48000, 88200, 96000, 176400, 192000 }; } Array OggVorbisAudioFormat::getPossibleBitDepths() { - const int depths[] = { 32 }; - - return Array (depths, numElementsInArray (depths)); + return Array (32); } bool OggVorbisAudioFormat::canDoStereo() { return true; } @@ -482,9 +478,8 @@ AudioFormatWriter* OggVorbisAudioFormat::createWriterFor (OutputStream* out, StringArray OggVorbisAudioFormat::getQualityOptions() { - static const char* options[] = { "64 kbps", "80 kbps", "96 kbps", "112 kbps", "128 kbps", "160 kbps", - "192 kbps", "224 kbps", "256 kbps", "320 kbps", "500 kbps", 0 }; - return StringArray (options); + return { "64 kbps", "80 kbps", "96 kbps", "112 kbps", "128 kbps", "160 kbps", + "192 kbps", "224 kbps", "256 kbps", "320 kbps", "500 kbps" }; } int OggVorbisAudioFormat::estimateOggFileQuality (const File& source) diff --git a/modules/juce_audio_utils/native/juce_linux_AudioCDReader.cpp b/modules/juce_audio_utils/native/juce_linux_AudioCDReader.cpp index 3af5291666..e9fe77dce8 100644 --- a/modules/juce_audio_utils/native/juce_linux_AudioCDReader.cpp +++ b/modules/juce_audio_utils/native/juce_linux_AudioCDReader.cpp @@ -78,7 +78,7 @@ int AudioCDReader::getLastIndex() const Array AudioCDReader::findIndexesInTrack (const int) { - return Array(); + return {}; } } // namespace juce diff --git a/modules/juce_gui_basics/commands/juce_KeyPressMappingSet.cpp b/modules/juce_gui_basics/commands/juce_KeyPressMappingSet.cpp index 0a0232843b..792aac40be 100644 --- a/modules/juce_gui_basics/commands/juce_KeyPressMappingSet.cpp +++ b/modules/juce_gui_basics/commands/juce_KeyPressMappingSet.cpp @@ -51,7 +51,7 @@ Array KeyPressMappingSet::getKeyPressesAssignedToCommand (const Comman if (mappings.getUnchecked(i)->commandID == commandID) return mappings.getUnchecked (i)->keypresses; - return Array(); + return {}; } void KeyPressMappingSet::addKeyPress (const CommandID commandID, const KeyPress& newKeyPress, int insertIndex)