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

Tidied-up a few stray sign-conversion warnings.

Browse source
This commit is contained in:
jules 2015-03-15 18:22:19 +00:00
parent 995839429e
commit 43252dc605
8 changed files with 76 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/Demo/Source/Demos/OpenGLDemo.cpp
View file

@ -174,12 +174,12 @@ struct OpenGLDemoClasses
Array<Vertex> vertices;
createVertexListFromMesh (shape.mesh, vertices, Colours::green);
openGLContext.extensions.glBufferData (GL_ARRAY_BUFFER, vertices.size() * sizeof (Vertex),
openGLContext.extensions.glBufferData (GL_ARRAY_BUFFER, vertices.size() * (int) sizeof (Vertex),
vertices.getRawDataPointer(), GL_STATIC_DRAW);
openGLContext.extensions.glGenBuffers (1, &indexBuffer);
openGLContext.extensions.glBindBuffer (GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
openGLContext.extensions.glBufferData (GL_ELEMENT_ARRAY_BUFFER, numIndices * sizeof (juce::uint32),
openGLContext.extensions.glBufferData (GL_ELEMENT_ARRAY_BUFFER, numIndices * (int) sizeof (juce::uint32),
shape.mesh.indices.getRawDataPointer(), GL_STATIC_DRAW);
}
@ -280,7 +280,7 @@ struct OpenGLDemoClasses
struct BuiltInTexture : public DemoTexture
{
BuiltInTexture (const char* nm, const void* imageData, int imageSize)
BuiltInTexture (const char* nm, const void* imageData, size_t imageSize)
: image (resizeImageToPowerOfTwo (ImageFileFormat::loadFrom (imageData, imageSize)))
{
name = nm;

4
modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp
View file

@ -30,9 +30,9 @@ public:
Writer (OutputStream* destStream, const String& formatName,
const File& appFile, int vbr, int cbr,
double sampleRate, unsigned int numberOfChannels,
unsigned int bitsPerSample, const StringPairArray& metadata)
int bitsPerSample, const StringPairArray& metadata)
: AudioFormatWriter (destStream, formatName, sampleRate,
numberOfChannels, bitsPerSample),
numberOfChannels, (unsigned int) bitsPerSample),
vbrLevel (vbr), cbrBitrate (cbr),
tempWav (".wav")
{

10
modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp
View file

@ -194,7 +194,7 @@ public:
bufferList->mNumberBuffers = 1;
bufferList->mBuffers[0].mNumberChannels = inputStreamDesc.mChannelsPerFrame;
bufferList->mBuffers[0].mDataByteSize = jmax ((UInt32) 4096, (UInt32) (samplesPerFrame * inputStreamDesc.mBytesPerFrame) + 16);
bufferList->mBuffers[0].mDataByteSize = jmax ((UInt32) 4096, (UInt32) (samplesPerFrame * (int) inputStreamDesc.mBytesPerFrame) + 16);
dataBuffer.malloc (bufferList->mBuffers[0].mDataByteSize);
bufferList->mBuffers[0].mData = dataBuffer;
@ -262,10 +262,10 @@ public:
}
int framesToDo = jmin (numSamples, (int) (bufferList->mBuffers[0].mDataByteSize / inputStreamDesc.mBytesPerFrame));
bufferList->mBuffers[0].mDataByteSize = inputStreamDesc.mBytesPerFrame * framesToDo;
bufferList->mBuffers[0].mDataByteSize = inputStreamDesc.mBytesPerFrame * (UInt32) framesToDo;
UInt32 outFlags = 0;
UInt32 actualNumFrames = framesToDo;
UInt32 actualNumFrames = (UInt32) framesToDo;
OSStatus err = MovieAudioExtractionFillBuffer (extractor, &actualNumFrames, bufferList, &outFlags);
if (err != noErr)
{
@ -274,7 +274,7 @@ public:
}
lastSampleRead = startSampleInFile + actualNumFrames;
const int samplesReceived = actualNumFrames;
const int samplesReceived = (int) actualNumFrames;
for (int j = numDestChannels; --j >= 0;)
{
@ -298,7 +298,7 @@ public:
{
for (int j = numDestChannels; --j >= 0;)
if (destSamples[j] != nullptr)
zeromem (destSamples[j] + startOffsetInDestBuffer, sizeof (int) * numSamples);
zeromem (destSamples[j] + startOffsetInDestBuffer, sizeof (int) * (size_t) numSamples);
break;
}

80
modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
View file

@ -184,7 +184,7 @@ namespace AudioUnitFormatHelpers
const char* const utf8 = fileOrIdentifier.toUTF8();
if (CFURLRef url = CFURLCreateFromFileSystemRepresentation (0, (const UInt8*) utf8,
strlen (utf8), file.isDirectory()))
(CFIndex) strlen (utf8), file.isDirectory()))
{
CFBundleRef bundleRef = CFBundleCreate (kCFAllocatorDefault, url);
CFRelease (url);
@ -345,8 +345,8 @@ public:
refreshParameterList();
updateNumChannels();
producesMidiMessages = canProduceMidiOutput();
setPlayConfigDetails (numInputBusChannels * numInputBusses,
numOutputBusChannels * numOutputBusses,
setPlayConfigDetails ((int) (numInputBusChannels * numInputBusses),
(int) (numOutputBusChannels * numOutputBusses),
rate, blockSize);
setLatencySamples (0);
@ -420,7 +420,7 @@ public:
UInt32 sampleRateSize = sizeof (sampleRateIn);
const Float64 sr = newSampleRate;
for (int i = 0; i < numInputBusses; ++i)
for (AudioUnitElement i = 0; i < numInputBusses; ++i)
{
AudioUnitGetProperty (audioUnit, kAudioUnitProperty_SampleRate, kAudioUnitScope_Input, i, &sampleRateIn, &sampleRateSize);
@ -428,7 +428,7 @@ public:
AudioUnitSetProperty (audioUnit, kAudioUnitProperty_SampleRate, kAudioUnitScope_Input, i, &sr, sizeof (sr));
}
for (int i = 0; i < numOutputBusses; ++i)
for (AudioUnitElement i = 0; i < numOutputBusses; ++i)
{
AudioUnitGetProperty (audioUnit, kAudioUnitProperty_SampleRate, kAudioUnitScope_Output, i, &sampleRateOut, &sampleRateSize);
@ -440,9 +440,9 @@ public:
AudioUnitSetProperty (audioUnit, kAudioUnitProperty_MaximumFramesPerSlice, kAudioUnitScope_Global, 0,
&frameSize, sizeof (frameSize));
setPlayConfigDetails (numInputBusChannels * numInputBusses,
numOutputBusChannels * numOutputBusses,
newSampleRate, estimatedSamplesPerBlock);
setPlayConfigDetails ((int) (numInputBusChannels * numInputBusses),
(int) (numOutputBusChannels * numOutputBusses),
(double) newSampleRate, estimatedSamplesPerBlock);
Float64 latencySecs = 0.0;
UInt32 latencySize = sizeof (latencySecs);
@ -463,13 +463,13 @@ public:
stream.mBitsPerChannel = 32;
stream.mChannelsPerFrame = numInputBusChannels;
for (int i = 0; i < numInputBusses; ++i)
for (AudioUnitElement i = 0; i < numInputBusses; ++i)
AudioUnitSetProperty (audioUnit, kAudioUnitProperty_StreamFormat,
kAudioUnitScope_Input, i, &stream, sizeof (stream));
stream.mChannelsPerFrame = numOutputBusChannels;
for (int i = 0; i < numOutputBusses; ++i)
for (AudioUnitElement i = 0; i < numOutputBusses; ++i)
AudioUnitSetProperty (audioUnit, kAudioUnitProperty_StreamFormat,
kAudioUnitScope_Output, i, &stream, sizeof (stream));
}
@ -518,8 +518,8 @@ public:
void resetBusses()
{
for (int i = 0; i < numInputBusses; ++i) AudioUnitReset (audioUnit, kAudioUnitScope_Input, i);
for (int i = 0; i < numOutputBusses; ++i) AudioUnitReset (audioUnit, kAudioUnitScope_Output, i);
for (AudioUnitElement i = 0; i < numInputBusses; ++i) AudioUnitReset (audioUnit, kAudioUnitScope_Input, i);
for (AudioUnitElement i = 0; i < numOutputBusses; ++i) AudioUnitReset (audioUnit, kAudioUnitScope_Output, i);
}
void processBlock (AudioSampleBuffer& buffer, MidiBuffer& midiMessages) override
@ -530,17 +530,17 @@ public:
{
timeStamp.mHostTime = AudioGetCurrentHostTime();
for (int i = 0; i < numOutputBusses; ++i)
for (AudioUnitElement i = 0; i < numOutputBusses; ++i)
{
if (AudioBufferList* const abl = getAudioBufferListForBus(i))
{
abl->mNumberBuffers = numOutputBusChannels;
for (int j = 0; j < numOutputBusChannels; ++j)
for (AudioUnitElement j = 0; j < numOutputBusChannels; ++j)
{
abl->mBuffers[j].mNumberChannels = 1;
abl->mBuffers[j].mDataByteSize = sizeof (float) * numSamples;
abl->mBuffers[j].mData = buffer.getWritePointer (i * numOutputBusChannels + j);
abl->mBuffers[j].mDataByteSize = sizeof (float) * (size_t) numSamples;
abl->mBuffers[j].mData = buffer.getWritePointer ((int) (i * numOutputBusChannels + j));
}
}
}
@ -557,19 +557,19 @@ public:
if (midiEventSize <= 3)
MusicDeviceMIDIEvent (audioUnit,
midiEventData[0], midiEventData[1], midiEventData[2],
midiEventPosition);
(UInt32) midiEventPosition);
else
MusicDeviceSysEx (audioUnit, midiEventData, midiEventSize);
MusicDeviceSysEx (audioUnit, midiEventData, (UInt32) midiEventSize);
}
midiMessages.clear();
}
for (int i = 0; i < numOutputBusses; ++i)
for (AudioUnitElement i = 0; i < numOutputBusses; ++i)
{
AudioUnitRenderActionFlags flags = 0;
AudioUnitRender (audioUnit, &flags, &timeStamp, i, numSamples, getAudioBufferListForBus (i));
AudioUnitRender (audioUnit, &flags, &timeStamp, i, (UInt32) numSamples, getAudioBufferListForBus (i));
}
timeStamp.mSampleTime += numSamples;
@ -796,7 +796,7 @@ public:
CFDataRef data = (CFDataRef) CFWriteStreamCopyProperty (stream, kCFStreamPropertyDataWritten);
destData.setSize (bytesWritten);
destData.setSize ((size_t) bytesWritten);
destData.copyFrom (CFDataGetBytePtr (data), 0, destData.getSize());
CFRelease (data);
@ -911,7 +911,7 @@ private:
HeapBlock <AudioBufferList> outputBufferList;
AudioTimeStamp timeStamp;
AudioSampleBuffer* currentBuffer;
int numInputBusChannels, numOutputBusChannels, numInputBusses, numOutputBusses;
AudioUnitElement numInputBusChannels, numOutputBusChannels, numInputBusses, numOutputBusses;
AudioUnit audioUnit;
AUEventListenerRef eventListenerRef;
@ -941,7 +941,7 @@ private:
info.inputProcRefCon = this;
info.inputProc = renderGetInputCallback;
for (int i = 0; i < numInputBusses; ++i)
for (AudioUnitElement i = 0; i < numInputBusses; ++i)
AudioUnitSetProperty (audioUnit, kAudioUnitProperty_SetRenderCallback,
kAudioUnitScope_Input, i, &info, sizeof (info));
}
@ -1028,11 +1028,11 @@ private:
break;
case kAudioUnitEvent_BeginParameterChangeGesture:
beginParameterChangeGesture (event.mArgument.mParameter.mParameterID);
beginParameterChangeGesture ((int) event.mArgument.mParameter.mParameterID);
break;
case kAudioUnitEvent_EndParameterChangeGesture:
endParameterChangeGesture (event.mArgument.mParameter.mParameterID);
endParameterChangeGesture ((int) event.mArgument.mParameter.mParameterID);
break;
default:
@ -1062,7 +1062,7 @@ private:
for (UInt32 i = 0; i < ioData->mNumberBuffers; ++i)
{
const int bufferChannel = inBusNumber * numInputBusChannels + i;
const int bufferChannel = (int) (inBusNumber * numInputBusChannels + i);
if (bufferChannel < currentBuffer->getNumChannels())
{
@ -1131,16 +1131,16 @@ private:
if (ph != nullptr && ph->getCurrentPosition (result))
{
setIfNotNull (outTimeSig_Numerator, result.timeSigNumerator);
setIfNotNull (outTimeSig_Denominator, result.timeSigDenominator);
setIfNotNull (outDeltaSampleOffsetToNextBeat, 0); //xxx
setIfNotNull (outTimeSig_Numerator, (UInt32) result.timeSigNumerator);
setIfNotNull (outTimeSig_Denominator, (UInt32) result.timeSigDenominator);
setIfNotNull (outDeltaSampleOffsetToNextBeat, (UInt32) 0); //xxx
setIfNotNull (outCurrentMeasureDownBeat, result.ppqPositionOfLastBarStart); //xxx wrong
}
else
{
setIfNotNull (outDeltaSampleOffsetToNextBeat, 0);
setIfNotNull (outTimeSig_Numerator, 4);
setIfNotNull (outTimeSig_Denominator, 4);
setIfNotNull (outDeltaSampleOffsetToNextBeat, (UInt32) 0);
setIfNotNull (outTimeSig_Numerator, (UInt32) 4);
setIfNotNull (outTimeSig_Denominator, (UInt32) 4);
setIfNotNull (outCurrentMeasureDownBeat, 0);
}
@ -1226,12 +1226,12 @@ private:
return offsetof (AudioBufferList, mBuffers) + (sizeof (AudioBuffer) * numOutputBusChannels);
}
AudioBufferList* getAudioBufferListForBus (int busIndex) const noexcept
AudioBufferList* getAudioBufferListForBus (AudioUnitElement busIndex) const noexcept
{
return addBytesToPointer (outputBufferList.getData(), getAudioBufferSizeInBytes() * busIndex);
}
int getElementCount (AudioUnitScope scope) const noexcept
AudioUnitElement getElementCount (AudioUnitScope scope) const noexcept
{
UInt32 count;
UInt32 countSize = sizeof (count);
@ -1240,7 +1240,7 @@ private:
|| countSize == 0)
count = 1;
return (int) count;
return count;
}
void updateNumChannels()
@ -1266,17 +1266,17 @@ private:
const int outChannels = (int) supportedChannels[i].outChannels;
if (inChannels < 0)
maximumNumIns = jmin (maximumNumIns, inChannels);
maximumNumIns = jmin (maximumNumIns, inChannels);
else
explicitNumIns = jmax (explicitNumIns, inChannels);
if (outChannels < 0)
maximumNumOuts = jmin (maximumNumOuts, outChannels);
maximumNumOuts = jmin (maximumNumOuts, outChannels);
else
explicitNumOuts = jmax (explicitNumOuts, outChannels);
}
if ((maximumNumIns == -1 && maximumNumOuts == -1) // (special meaning: any number of ins/outs, as long as they match)
if ((maximumNumIns == -1 && maximumNumOuts == -1) // (special meaning: any number of ins/outs, as long as they match)
|| (maximumNumIns == -2 && maximumNumOuts == -1) // (special meaning: any number of ins/outs, even if they don't match)
|| (maximumNumIns == -1 && maximumNumOuts == -2))
{
@ -1284,8 +1284,8 @@ private:
}
else
{
numInputBusChannels = explicitNumIns;
numOutputBusChannels = explicitNumOuts;
numInputBusChannels = (AudioUnitElement) explicitNumIns;
numOutputBusChannels = (AudioUnitElement) explicitNumOuts;
if (maximumNumIns == -1 || (maximumNumIns < 0 && explicitNumIns <= -maximumNumIns))
numInputBusChannels = 2;

4
modules/juce_audio_processors/format_types/juce_VST3Common.h
View file

@ -250,7 +250,7 @@ public:
break;
case Steinberg::Vst::Event::kDataEvent:
result.addEvent (MidiMessage::createSysExMessage (e.data.bytes, e.data.size),
result.addEvent (MidiMessage::createSysExMessage (e.data.bytes, (int) e.data.size),
e.sampleOffset);
break;
@ -300,7 +300,7 @@ public:
{
e.type = Steinberg::Vst::Event::kDataEvent;
e.data.bytes = msg.getSysExData();
e.data.size = msg.getSysExDataSize();
e.data.size = (uint32) msg.getSysExDataSize();
e.data.type = Steinberg::Vst::DataEvent::kMidiSysEx;
}
else if (msg.isAftertouch())

42
modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
View file

@ -488,7 +488,7 @@ public:
const char* const utf8 = file.getFullPathName().toRawUTF8();
if (CFURLRef url = CFURLCreateFromFileSystemRepresentation (0, (const UInt8*) utf8,
strlen (utf8), file.isDirectory()))
(CFIndex) strlen (utf8), file.isDirectory()))
{
bundleRef = CFBundleCreate (kCFAllocatorDefault, url);
CFRelease (url);
@ -864,7 +864,7 @@ public:
wantsMidiMessages = dispatch (effCanDo, 0, 0, (void*) "receiveVstMidiEvent", 0) > 0;
#if JUCE_MAC && JUCE_SUPPORT_CARBON
usesCocoaNSView = (dispatch (effCanDo, 0, 0, (void*) "hasCockosViewAsConfig", 0) & 0xffff0000) == 0xbeef0000;
usesCocoaNSView = (dispatch (effCanDo, 0, 0, (void*) "hasCockosViewAsConfig", 0) & (int) 0xffff0000) == 0xbeef0000;
#endif
setLatencySamples (effect->initialDelay);
@ -1228,8 +1228,8 @@ public:
void getStateInformation (MemoryBlock& mb) override { saveToFXBFile (mb, true); }
void getCurrentProgramStateInformation (MemoryBlock& mb) override { saveToFXBFile (mb, false); }
void setStateInformation (const void* data, int size) override { loadFromFXBFile (data, size); }
void setCurrentProgramStateInformation (const void* data, int size) override { loadFromFXBFile (data, size); }
void setStateInformation (const void* data, int size) override { loadFromFXBFile (data, (size_t) size); }
void setCurrentProgramStateInformation (const void* data, int size) override { loadFromFXBFile (data, (size_t) size); }
//==============================================================================
void timerCallback() override
@ -1449,7 +1449,7 @@ public:
{
const int oldProg = getCurrentProgram();
const int numParams = fxbSwap (((const fxProgram*) (set->programs))->numParams);
const int progLen = sizeof (fxProgram) + (numParams - 1) * sizeof (float);
const int progLen = (int) sizeof (fxProgram) + (numParams - 1) * (int) sizeof (float);
for (int i = 0; i < fxbSwap (set->numPrograms); ++i)
{
@ -1496,7 +1496,7 @@ public:
// non-preset chunk
const fxChunkSet* const cset = (const fxChunkSet*) data;
if (fxbSwap (cset->chunkSize) + sizeof (fxChunkSet) - 8 > (unsigned int) dataSize)
if ((size_t) fxbSwap (cset->chunkSize) + sizeof (fxChunkSet) - 8 > (size_t) dataSize)
return false;
setChunkData (cset->chunk, fxbSwap (cset->chunkSize), false);
@ -1506,7 +1506,7 @@ public:
// preset chunk
const fxProgramSet* const cset = (const fxProgramSet*) data;
if (fxbSwap (cset->chunkSize) + sizeof (fxProgramSet) - 8 > (unsigned int) dataSize)
if ((size_t) fxbSwap (cset->chunkSize) + sizeof (fxProgramSet) - 8 > (size_t) dataSize)
return false;
setChunkData (cset->chunk, fxbSwap (cset->chunkSize), true);
@ -1571,8 +1571,8 @@ public:
{
if (isFXB)
{
const int progLen = sizeof (fxProgram) + (numParams - 1) * sizeof (float);
const int len = (sizeof (fxSet) - sizeof (fxProgram)) + progLen * jmax (1, numPrograms);
const int progLen = (int) sizeof (fxProgram) + (numParams - 1) * (int) sizeof (float);
const size_t len = (sizeof (fxSet) - sizeof (fxProgram)) + (size_t) (progLen * jmax (1, numPrograms));
dest.setSize (len, true);
fxSet* const set = (fxSet*) dest.getData();
@ -1584,11 +1584,13 @@ public:
set->fxVersion = fxbSwap (getVersionNumber());
set->numPrograms = fxbSwap (numPrograms);
const int oldProgram = getCurrentProgram();
MemoryBlock oldSettings;
createTempParameterStore (oldSettings);
setParamsInProgramBlock ((fxProgram*) (((char*) (set->programs)) + oldProgram * progLen));
const int oldProgram = getCurrentProgram();
if (oldProgram >= 0)
setParamsInProgramBlock ((fxProgram*) (((char*) (set->programs)) + oldProgram * progLen));
for (int i = 0; i < numPrograms; ++i)
{
@ -1599,14 +1601,14 @@ public:
}
}
setCurrentProgram (oldProgram);
if (oldProgram >= 0)
setCurrentProgram (oldProgram);
restoreFromTempParameterStore (oldSettings);
}
else
{
const int totalLen = sizeof (fxProgram) + (numParams - 1) * sizeof (float);
dest.setSize (totalLen, true);
dest.setSize (sizeof (fxProgram) + (size_t) ((numParams - 1) * (int) sizeof (float)), true);
setParamsInProgramBlock ((fxProgram*) dest.getData());
}
}
@ -1621,7 +1623,7 @@ public:
if (usesChunks())
{
void* data = nullptr;
const VstIntPtr bytes = dispatch (effGetChunk, isPreset ? 1 : 0, 0, &data, 0.0f);
const size_t bytes = (size_t) dispatch (effGetChunk, isPreset ? 1 : 0, 0, &data, 0.0f);
if (data != nullptr && bytes <= maxSizeMB * 1024 * 1024)
{
@ -1783,7 +1785,7 @@ private:
//==============================================================================
void createTempParameterStore (MemoryBlock& dest)
{
dest.setSize (64 + 4 * getNumParameters());
dest.setSize (64 + 4 * (size_t) getNumParameters());
dest.fillWith (0);
getCurrentProgramName().copyToUTF8 ((char*) dest.getData(), 63);
@ -1821,21 +1823,21 @@ private:
String s;
if (v == 0 || (int) v == -1)
v = getVersionNumber();
v = (unsigned int) getVersionNumber();
if (v != 0)
{
int versionBits[32];
int n = 0;
for (int vv = v; vv != 0; vv /= 10)
for (unsigned int vv = v; vv != 0; vv /= 10)
versionBits [n++] = vv % 10;
if (n > 4) // if the number ends up silly, it's probably encoded as hex instead of decimal..
{
n = 0;
for (int vv = v; vv != 0; vv >>= 8)
for (unsigned int vv = v; vv != 0; vv >>= 8)
versionBits [n++] = vv & 255;
}

2
modules/juce_opengl/opengl/juce_OpenGLShaderProgram.h
View file

@ -150,7 +150,7 @@ public:
/** The attribute's ID number.
If the uniform couldn't be found, this value will be < 0.
*/
GLint attributeID;
GLuint attributeID;
};
/** The ID number of the compiled program. */

2
modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm
View file

@ -221,7 +221,7 @@ void QuickTimeMovieComponent::setPosition (const double seconds)
if (movie != 0)
{
QTTime t;
t.timeValue = (uint64) (100000.0 * seconds);
t.timeValue = (long long) (100000.0 * seconds);
t.timeScale = 100000;
t.flags = 0;