From e174bb26bdcb0a09f9b897a4cf0f7b94f28e4e5e Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Tue, 19 Dec 2017 15:51:45 +0000 Subject: [PATCH] A minor code tidyup --- modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp | 6 ++---- modules/juce_audio_basics/midi/juce_MidiMessageSequence.h | 6 ++---- modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp | 3 ++- modules/juce_audio_formats/format/juce_AudioFormatManager.h | 6 ++---- .../juce_audio_processors/scanning/juce_KnownPluginList.h | 6 ++---- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp index a0effbef68..5113c16f24 100644 --- a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp @@ -80,10 +80,8 @@ MidiMessageSequence::MidiEventHolder* MidiMessageSequence::getEventPointer (int return list[index]; } -MidiMessageSequence::MidiEventHolder** MidiMessageSequence::begin() noexcept { return list.begin(); } -MidiMessageSequence::MidiEventHolder*const* MidiMessageSequence::begin() const noexcept { return list.begin(); } -MidiMessageSequence::MidiEventHolder** MidiMessageSequence::end() noexcept { return list.end(); } -MidiMessageSequence::MidiEventHolder*const* MidiMessageSequence::end() const noexcept { return list.end(); } +MidiMessageSequence::MidiEventHolder** MidiMessageSequence::begin() const noexcept { return list.begin(); } +MidiMessageSequence::MidiEventHolder** MidiMessageSequence::end() const noexcept { return list.end(); } double MidiMessageSequence::getTimeOfMatchingKeyUp (int index) const noexcept { diff --git a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h index 05025a89e8..8f5e3f6994 100644 --- a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h +++ b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h @@ -101,12 +101,10 @@ public: MidiEventHolder* getEventPointer (int index) const noexcept; /** Iterator for the list of MidiEventHolders */ - MidiEventHolder** begin() noexcept; - MidiEventHolder*const* begin() const noexcept; + MidiEventHolder** begin() const noexcept; /** Iterator for the list of MidiEventHolders */ - MidiEventHolder** end() noexcept; - MidiEventHolder*const* end() const noexcept; + MidiEventHolder** end() const noexcept; /** Returns the time of the note-up that matches the note-on at this index. If the event at this index isn't a note-on, it'll just return 0. diff --git a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp index 753a6164fb..f3f89c78ea 100644 --- a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp +++ b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp @@ -35,7 +35,8 @@ namespace juce // The AudioHardwareService stuff was deprecated in 10.11 but there's no replacement yet, // so we'll have to silence the warnings here and revisit it in a future OS version.. - #if ((defined (MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_12) \ + #if ((defined (MAC_OS_X_VERSION_10_13) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_13) \ + || (defined (MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_12) \ || (defined (MAC_OS_X_VERSION_10_11) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_11)) #pragma clang diagnostic ignored "-Wdeprecated-declarations" #endif diff --git a/modules/juce_audio_formats/format/juce_AudioFormatManager.h b/modules/juce_audio_formats/format/juce_AudioFormatManager.h index 9abed6bd59..70d30afc6f 100644 --- a/modules/juce_audio_formats/format/juce_AudioFormatManager.h +++ b/modules/juce_audio_formats/format/juce_AudioFormatManager.h @@ -78,12 +78,10 @@ public: AudioFormat* getKnownFormat (int index) const; /** Iterator access to the list of known formats. */ - AudioFormat** begin() noexcept { return knownFormats.begin(); } - AudioFormat*const* begin() const noexcept { return knownFormats.begin(); } + AudioFormat** begin() const noexcept { return knownFormats.begin(); } /** Iterator access to the list of known formats. */ - AudioFormat** end() noexcept { return knownFormats.end(); } - AudioFormat*const* end() const noexcept { return knownFormats.end(); } + AudioFormat** end() const noexcept { return knownFormats.end(); } /** Looks for which of the known formats is listed as being for a given file extension. diff --git a/modules/juce_audio_processors/scanning/juce_KnownPluginList.h b/modules/juce_audio_processors/scanning/juce_KnownPluginList.h index 0b938ad507..2d34a0e3d4 100644 --- a/modules/juce_audio_processors/scanning/juce_KnownPluginList.h +++ b/modules/juce_audio_processors/scanning/juce_KnownPluginList.h @@ -61,12 +61,10 @@ public: PluginDescription* getType (int index) const noexcept { return types [index]; } /** Type iteration. */ - PluginDescription** begin() noexcept { return types.begin(); } - PluginDescription*const* begin() const noexcept { return types.begin(); } + PluginDescription** begin() const noexcept { return types.begin(); } /** Type iteration. */ - PluginDescription** end() noexcept { return types.end(); } - PluginDescription*const* end() const noexcept { return types.end(); } + PluginDescription** end() const noexcept { return types.end(); } /** Looks for a type in the list which comes from this file. */ PluginDescription* getTypeForFile (const String& fileOrIdentifier) const;