mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Global: Fix a few more float equality warnings

Browse source
This commit is contained in:
reuk 2023-04-13 12:19:58 +01:00
parent 68beb74820
commit f6e6557edb
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
4 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/Plugins/ARAPluginDemo.h
View file

@ -616,9 +616,9 @@ public:
const auto previewDimmed = previewedRegion->getAudioModification<ARADemoPluginAudioModification>() const auto previewDimmed = previewedRegion->getAudioModification<ARADemoPluginAudioModification>()
->isDimmed(); ->isDimmed();
if (lastPreviewTime != previewTime if (! exactlyEqual (lastPreviewTime, previewTime)
|| lastPlaybackRegion != previewedRegion || ! exactlyEqual (lastPlaybackRegion, previewedRegion)
|| lastPreviewDimmed != previewDimmed) || ! exactlyEqual (lastPreviewDimmed, previewDimmed))
{ {
Range<double> previewRangeInPlaybackTime { previewTime - 0.25, previewTime + 0.25 }; Range<double> previewRangeInPlaybackTime { previewTime - 0.25, previewTime + 0.25 };
previewBuffer->clear(); previewBuffer->clear();
@ -1102,7 +1102,7 @@ public:
const auto quarterPos = barSignaturesConverter.getQuarterForBeat (beat); const auto quarterPos = barSignaturesConverter.getQuarterForBeat (beat);
const int x = timeToViewScaling.getXForTime (tempoConverter.getTimeForQuarter (quarterPos)); const int x = timeToViewScaling.getXForTime (tempoConverter.getTimeForQuarter (quarterPos));
const auto barSignature = barSignaturesConverter.getBarSignatureForQuarter (quarterPos); const auto barSignature = barSignaturesConverter.getBarSignatureForQuarter (quarterPos);
const int lineWidth = (quarterPos == barSignature.position) ? heavyLineWidth : lightLineWidth; const int lineWidth = (approximatelyEqual (quarterPos, barSignature.position)) ? heavyLineWidth : lightLineWidth;
const int beatsSinceBarStart = roundToInt( barSignaturesConverter.getBeatDistanceFromBarStartForQuarter (quarterPos)); const int beatsSinceBarStart = roundToInt( barSignaturesConverter.getBeatDistanceFromBarStartForQuarter (quarterPos));
const int lineHeight = (beatsSinceBarStart == 0) ? rulerHeight : rulerHeight / 2; const int lineHeight = (beatsSinceBarStart == 0) ? rulerHeight : rulerHeight / 2;
rects.addWithoutMerging (Rectangle<int> (x - lineWidth / 2, 2 * rulerHeight - lineHeight, lineWidth, lineHeight)); rects.addWithoutMerging (Rectangle<int> (x - lineWidth / 2, 2 * rulerHeight - lineHeight, lineWidth, lineHeight));

14
modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h
View file

@ -850,7 +850,7 @@ public:
jassert (destStartSample >= 0 && numSamples >= 0 && destStartSample + numSamples <= size); jassert (destStartSample >= 0 && numSamples >= 0 && destStartSample + numSamples <= size);
jassert (source != nullptr); jassert (source != nullptr);
if (gainToApplyToSource != 0 && numSamples > 0) if (! approximatelyEqual (gainToApplyToSource, Type()) && numSamples > 0)
{ {
auto* d = channels[destChannel] + destStartSample; auto* d = channels[destChannel] + destStartSample;
@ -858,14 +858,14 @@ public:
{ {
isClear = false; isClear = false;
if (gainToApplyToSource != Type (1)) if (! approximatelyEqual (gainToApplyToSource, Type (1)))
FloatVectorOperations::copyWithMultiply (d, source, gainToApplyToSource, numSamples); FloatVectorOperations::copyWithMultiply (d, source, gainToApplyToSource, numSamples);
else else
FloatVectorOperations::copy (d, source, numSamples); FloatVectorOperations::copy (d, source, numSamples);
} }
else else
{ {
if (gainToApplyToSource != Type (1)) if (! approximatelyEqual (gainToApplyToSource, Type (1)))
FloatVectorOperations::addWithMultiply (d, source, gainToApplyToSource, numSamples); FloatVectorOperations::addWithMultiply (d, source, gainToApplyToSource, numSamples);
else else
FloatVectorOperations::add (d, source, numSamples); FloatVectorOperations::add (d, source, numSamples);
@ -899,7 +899,7 @@ public:
Type startGain, Type startGain,
Type endGain) noexcept Type endGain) noexcept
{ {
if (startGain == endGain) if (approximatelyEqual (startGain, endGain))
{ {
addFrom (destChannel, destStartSample, source, numSamples, startGain); addFrom (destChannel, destStartSample, source, numSamples, startGain);
} }
@ -1023,9 +1023,9 @@ public:
{ {
auto* d = channels[destChannel] + destStartSample; auto* d = channels[destChannel] + destStartSample;
if (gain != Type (1)) if (! approximatelyEqual (gain, Type (1)))
{ {
if (gain == Type()) if (approximatelyEqual (gain, Type()))
{ {
if (! isClear) if (! isClear)
FloatVectorOperations::clear (d, numSamples); FloatVectorOperations::clear (d, numSamples);
@ -1071,7 +1071,7 @@ public:
Type startGain, Type startGain,
Type endGain) noexcept Type endGain) noexcept
{ {
if (startGain == endGain) if (approximatelyEqual (startGain, endGain))
{ {
copyFrom (destChannel, destStartSample, source, numSamples, startGain); copyFrom (destChannel, destStartSample, source, numSamples, startGain);
} }

10
modules/juce_audio_formats/format/juce_ARAAudioReaders.cpp
View file

@ -67,7 +67,7 @@ void ARAAudioSourceReader::willUpdateAudioSourceProperties (ARAAudioSource* audi
ARAAudioSource::PropertiesPtr newProperties) ARAAudioSource::PropertiesPtr newProperties)
{ {
if (audioSource->getSampleCount() != newProperties->sampleCount if (audioSource->getSampleCount() != newProperties->sampleCount
|| audioSource->getSampleRate() != newProperties->sampleRate || ! exactlyEqual (audioSource->getSampleRate(), newProperties->sampleRate)
|| audioSource->getChannelCount() != newProperties->channelCount) || audioSource->getChannelCount() != newProperties->channelCount)
{ {
invalidate(); invalidate();
@ -277,10 +277,10 @@ void ARAPlaybackRegionReader::willUpdatePlaybackRegionProperties (ARAPlaybackReg
{ {
jassert (ARA::contains (playbackRenderer->getPlaybackRegions(), playbackRegion)); jassert (ARA::contains (playbackRenderer->getPlaybackRegions(), playbackRegion));
if ((playbackRegion->getStartInAudioModificationTime() != newProperties->startInModificationTime) if ((! exactlyEqual (playbackRegion->getStartInAudioModificationTime(), newProperties->startInModificationTime))
|| (playbackRegion->getDurationInAudioModificationTime() != newProperties->durationInModificationTime) || ! exactlyEqual (playbackRegion->getDurationInAudioModificationTime(), newProperties->durationInModificationTime)
|| (playbackRegion->getStartInPlaybackTime() != newProperties->startInPlaybackTime) || ! exactlyEqual (playbackRegion->getStartInPlaybackTime(), newProperties->startInPlaybackTime)
|| (playbackRegion->getDurationInPlaybackTime() != newProperties->durationInPlaybackTime) || ! exactlyEqual (playbackRegion->getDurationInPlaybackTime(), newProperties->durationInPlaybackTime)
|| (playbackRegion->isTimestretchEnabled() != ((newProperties->transformationFlags & ARA::kARAPlaybackTransformationTimestretch) != 0)) || (playbackRegion->isTimestretchEnabled() != ((newProperties->transformationFlags & ARA::kARAPlaybackTransformationTimestretch) != 0))
|| (playbackRegion->isTimeStretchReflectingTempo() != ((newProperties->transformationFlags & ARA::kARAPlaybackTransformationTimestretchReflectingTempo) != 0)) || (playbackRegion->isTimeStretchReflectingTempo() != ((newProperties->transformationFlags & ARA::kARAPlaybackTransformationTimestretchReflectingTempo) != 0))
|| (playbackRegion->hasContentBasedFadeAtHead() != ((newProperties->transformationFlags & ARA::kARAPlaybackTransformationContentBasedFadeAtHead) != 0)) || (playbackRegion->hasContentBasedFadeAtHead() != ((newProperties->transformationFlags & ARA::kARAPlaybackTransformationContentBasedFadeAtHead) != 0))

3
modules/juce_audio_processors/utilities/ARA/juce_ARA_utils.h
View file

@ -27,7 +27,8 @@
// Include ARA SDK headers // Include ARA SDK headers
JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wgnu-zero-variadic-macro-arguments", JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wgnu-zero-variadic-macro-arguments",
"-Wunused-parameter") "-Wunused-parameter",
"-Wfloat-equal")
JUCE_BEGIN_IGNORE_WARNINGS_MSVC (6387) JUCE_BEGIN_IGNORE_WARNINGS_MSVC (6387)
#include <ARA_Library/PlugIn/ARAPlug.h> #include <ARA_Library/PlugIn/ARAPlug.h>