Browse Source

Avoided some pedantic compiler warnings in the audio plugin code.

tags/2021-05-28
jules 11 years ago
parent
commit
bb98c00d0d
8 changed files with 23 additions and 16 deletions
  1. +1
    -1
      modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp
  2. +7
    -6
      modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
  3. +5
    -5
      modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm
  4. +5
    -1
      modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm
  5. +1
    -0
      modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  6. +1
    -0
      modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm
  7. +1
    -1
      modules/juce_core/text/juce_String.cpp
  8. +2
    -2
      modules/juce_graphics/geometry/juce_EdgeTable.cpp

+ 1
- 1
modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp View File

@@ -254,7 +254,7 @@ void JUCE_CALLTYPE FloatVectorOperations::multiply (float* dest, float multiplie
void FloatVectorOperations::negate (float* dest, const float* src, int num) noexcept void FloatVectorOperations::negate (float* dest, const float* src, int num) noexcept
{ {
#if JUCE_USE_VDSP_FRAMEWORK #if JUCE_USE_VDSP_FRAMEWORK
vDSP_vneg ((float*) src, 1, dest, 1, num);
vDSP_vneg ((float*) src, 1, dest, 1, (vDSP_Length) num);
#else #else
copyWithMultiply (dest, src, -1.0f, num); copyWithMultiply (dest, src, -1.0f, num);
#endif #endif


+ 7
- 6
modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp View File

@@ -42,6 +42,7 @@
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#pragma clang diagnostic ignored "-Wsign-conversion"
#endif #endif
#include "AAX_Exports.cpp" #include "AAX_Exports.cpp"
@@ -428,7 +429,7 @@ struct AAXClasses
if (tempFilterData.getSize() == 0) if (tempFilterData.getSize() == 0)
pluginInstance->getStateInformation (tempFilterData); pluginInstance->getStateInformation (tempFilterData);
oChunk->fSize = (uint32_t) tempFilterData.getSize();
oChunk->fSize = (int32_t) tempFilterData.getSize();
tempFilterData.copyTo (oChunk->fData, 0, tempFilterData.getSize()); tempFilterData.copyTo (oChunk->fData, 0, tempFilterData.getSize());
tempFilterData.setSize (0); tempFilterData.setSize (0);
@@ -681,7 +682,7 @@ struct AAXClasses
if (numOuts >= numIns) if (numOuts >= numIns)
{ {
for (int i = 0; i < numIns; ++i) for (int i = 0; i < numIns; ++i)
memcpy (outputs[i], inputs[i], bufferSize * sizeof (float));
memcpy (outputs[i], inputs[i], (size_t) bufferSize * sizeof (float));
process (outputs, numOuts, bufferSize, bypass, midiNodeIn, midiNodesOut); process (outputs, numOuts, bufferSize, bypass, midiNodeIn, midiNodesOut);
} }
@@ -694,7 +695,7 @@ struct AAXClasses
for (int i = 0; i < numOuts; ++i) for (int i = 0; i < numOuts; ++i)
{ {
memcpy (outputs[i], inputs[i], bufferSize * sizeof (float));
memcpy (outputs[i], inputs[i], (size_t) bufferSize * sizeof (float));
channels[i] = outputs[i]; channels[i] = outputs[i];
} }
@@ -752,7 +753,7 @@ struct AAXClasses
// (This 8-byte alignment is a workaround to a bug in the AAX SDK. Hopefully can be // (This 8-byte alignment is a workaround to a bug in the AAX SDK. Hopefully can be
// removed in future when the packet structure size is fixed) // removed in future when the packet structure size is fixed)
const AAX_CMidiPacket& m = *addBytesToPointer (midiStream->mBuffer, const AAX_CMidiPacket& m = *addBytesToPointer (midiStream->mBuffer,
i * ((sizeof (AAX_CMidiPacket) + 7) & ~7));
i * ((sizeof (AAX_CMidiPacket) + 7) & ~(size_t) 7));
jassert ((int) m.mTimestamp < bufferSize); jassert ((int) m.mTimestamp < bufferSize);
midiBuffer.addEvent (m.mData, (int) m.mLength, midiBuffer.addEvent (m.mData, (int) m.mLength,
jlimit (0, (int) bufferSize - 1, (int) m.mTimestamp)); jlimit (0, (int) bufferSize - 1, (int) m.mTimestamp));
@@ -792,7 +793,7 @@ struct AAXClasses
{ {
packet.mTimestamp = (uint32_t) midiEventPosition; packet.mTimestamp = (uint32_t) midiEventPosition;
packet.mLength = (uint32_t) midiEventSize; packet.mLength = (uint32_t) midiEventSize;
memcpy (packet.mData, midiEventData, midiEventSize);
memcpy (packet.mData, midiEventData, (size_t) midiEventSize);
check (midiNodesOut->PostMIDIPacket (&packet)); check (midiNodesOut->PostMIDIPacket (&packet));
} }
@@ -833,7 +834,7 @@ struct AAXClasses
audioProcessor.isParameterAutomatable (parameterIndex)); audioProcessor.isParameterAutomatable (parameterIndex));
parameter->AddShortenedName (audioProcessor.getParameterName (parameterIndex, 4).toRawUTF8()); parameter->AddShortenedName (audioProcessor.getParameterName (parameterIndex, 4).toRawUTF8());
parameter->SetNumberOfSteps (audioProcessor.getParameterNumSteps (parameterIndex));
parameter->SetNumberOfSteps ((uint32_t) audioProcessor.getParameterNumSteps (parameterIndex));
parameter->SetType (AAX_eParameterType_Continuous); parameter->SetType (AAX_eParameterType_Continuous);
mParameterManager.AddParameter (parameter); mParameterManager.AddParameter (parameter);
} }


+ 5
- 5
modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm View File

@@ -38,6 +38,10 @@
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wshorten-64-to-32" #pragma clang diagnostic ignored "-Wshorten-64-to-32"
#pragma clang diagnostic ignored "-Wunused-parameter"
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma clang diagnostic ignored "-Wsign-conversion"
#pragma clang diagnostic ignored "-Wconversion"
#endif #endif
#include "../utility/juce_IncludeSystemHeaders.h" #include "../utility/juce_IncludeSystemHeaders.h"
@@ -52,10 +56,6 @@
#define Component CarbonDummyCompName #define Component CarbonDummyCompName
#endif #endif
#ifdef __clang__
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
#include "AUMIDIEffectBase.h" #include "AUMIDIEffectBase.h"
#include "MusicDeviceBase.h" #include "MusicDeviceBase.h"
#undef Point #undef Point
@@ -884,7 +884,7 @@ public:
for (MidiBuffer::Iterator i (midiEvents); i.getNextEvent (midiEventData, midiEventSize, midiEventPosition);) for (MidiBuffer::Iterator i (midiEvents); i.getNextEvent (midiEventData, midiEventSize, midiEventPosition);)
{ {
p->timeStamp = (MIDITimeStamp) midiEventPosition; p->timeStamp = (MIDITimeStamp) midiEventPosition;
p->length = (size_t) midiEventSize;
p->length = (UInt16) midiEventSize;
memcpy (p->data, midiEventData, (size_t) midiEventSize); memcpy (p->data, midiEventData, (size_t) midiEventSize);
p = MIDIPacketNext (p); p = MIDIPacketNext (p);
} }


+ 5
- 1
modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm View File

@@ -40,6 +40,7 @@
#include "../utility/juce_CarbonVisibility.h" #include "../utility/juce_CarbonVisibility.h"
//============================================================================== //==============================================================================
void initialiseMacRTAS();
void initialiseMacRTAS() void initialiseMacRTAS()
{ {
#if ! JUCE_64BIT #if ! JUCE_64BIT
@@ -47,6 +48,7 @@ void initialiseMacRTAS()
#endif #endif
} }
void* attachSubWindow (void*, Component*);
void* attachSubWindow (void* hostWindowRef, Component* comp) void* attachSubWindow (void* hostWindowRef, Component* comp)
{ {
JUCE_AUTORELEASEPOOL JUCE_AUTORELEASEPOOL
@@ -69,7 +71,7 @@ void* attachSubWindow (void* hostWindowRef, Component* comp)
f.size.height = comp->getHeight(); f.size.height = comp->getHeight();
[content setFrame: f]; [content setFrame: f];
const int mainScreenHeight = [[[NSScreen screens] objectAtIndex: 0] frame].size.height;
const CGFloat mainScreenHeight = [[[NSScreen screens] objectAtIndex: 0] frame].size.height;
#if WINDOWPOSITION_BODGE #if WINDOWPOSITION_BODGE
{ {
@@ -110,6 +112,7 @@ void* attachSubWindow (void* hostWindowRef, Component* comp)
} }
} }
void removeSubWindow (void*, Component*);
void removeSubWindow (void* nsWindow, Component* comp) void removeSubWindow (void* nsWindow, Component* comp)
{ {
JUCE_AUTORELEASEPOOL JUCE_AUTORELEASEPOOL
@@ -142,6 +145,7 @@ namespace
} }
} }
void forwardCurrentKeyEventToHostWindow();
void forwardCurrentKeyEventToHostWindow() void forwardCurrentKeyEventToHostWindow()
{ {
WindowRef w = FrontNonFloatingWindow(); WindowRef w = FrontNonFloatingWindow();


+ 1
- 0
modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp View File

@@ -76,6 +76,7 @@
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wconversion" #pragma clang diagnostic ignored "-Wconversion"
#pragma clang diagnostic ignored "-Wshadow" #pragma clang diagnostic ignored "-Wshadow"
#pragma clang diagnostic ignored "-Wunused-parameter"
#endif #endif
// VSTSDK V2.4 includes.. // VSTSDK V2.4 includes..


+ 1
- 0
modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm View File

@@ -222,6 +222,7 @@ void setNativeHostWindowSize (void* nsWindow, Component* component, int newWidth
[hostView frame].size.height + (newHeight - component->getHeight()))]; [hostView frame].size.height + (newHeight - component->getHeight()))];
} }
#else #else
(void) nsWindow;
if (HIViewRef dummyView = (HIViewRef) (void*) (pointer_sized_int) if (HIViewRef dummyView = (HIViewRef) (void*) (pointer_sized_int)
component->getProperties() ["dummyViewRef"].toString().getHexValue64()) component->getProperties() ["dummyViewRef"].toString().getHexValue64())


+ 1
- 1
modules/juce_core/text/juce_String.cpp View File

@@ -73,7 +73,7 @@ public:
//============================================================================== //==============================================================================
static CharPointerType createUninitialisedBytes (size_t numBytes) static CharPointerType createUninitialisedBytes (size_t numBytes)
{ {
numBytes = (numBytes + 3) & ~3;
numBytes = (numBytes + 3) & ~(size_t) 3;
StringHolder* const s = reinterpret_cast<StringHolder*> (new char [sizeof (StringHolder) - sizeof (CharType) + numBytes]); StringHolder* const s = reinterpret_cast<StringHolder*> (new char [sizeof (StringHolder) - sizeof (CharType) + numBytes]);
s->refCount.value = 0; s->refCount.value = 0;
s->allocatedNumBytes = numBytes; s->allocatedNumBytes = numBytes;


+ 2
- 2
modules/juce_graphics/geometry/juce_EdgeTable.cpp View File

@@ -564,7 +564,7 @@ void EdgeTable::intersectWithEdgeTableLine (const int y, const int* const otherL
if (isUsingTempSpace) if (isUsingTempSpace)
{ {
const size_t tempSize = (size_t) (srcNum1 * 2 * sizeof (int));
const size_t tempSize = (size_t) srcNum1 * 2 * sizeof (int);
int* const oldTemp = static_cast<int*> (alloca (tempSize)); int* const oldTemp = static_cast<int*> (alloca (tempSize));
memcpy (oldTemp, src1, tempSize); memcpy (oldTemp, src1, tempSize);
@@ -589,7 +589,7 @@ void EdgeTable::intersectWithEdgeTableLine (const int y, const int* const otherL
{ {
isUsingTempSpace = true; isUsingTempSpace = true;
int* const temp = table + lineStrideElements * bounds.getHeight(); int* const temp = table + lineStrideElements * bounds.getHeight();
memcpy (temp, src1, (size_t) (srcNum1 * 2 * sizeof (int)));
memcpy (temp, src1, (size_t) srcNum1 * 2 * sizeof (int));
src1 = temp; src1 = temp;
} }


Loading…
Cancel
Save