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

Purged some warnings.

Browse source
This commit is contained in:
jules 2012-04-10 10:29:14 +01:00
parent 991388d2c3
commit 1f95f54089
79 changed files with 380 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/juce_audio_basics/midi/juce_MidiBuffer.cpp
View file

@ -40,7 +40,7 @@ namespace MidiBufferHelpers
return getEventDataSize (d) + sizeof (int) + sizeof (uint16);
}
int findActualEventLength (const uint8* const data, const int maxBytes) noexcept
static int findActualEventLength (const uint8* const data, const int maxBytes) noexcept
{
unsigned int byte = (unsigned int) *data;
int size = 0;
@ -126,7 +126,7 @@ void MidiBuffer::clear (const int startSample, const int numSamples)
const int bytesToMove = bytesUsed - (int) (end - getData());
if (bytesToMove > 0)
memmove (start, end, bytesToMove);
memmove (start, end, (size_t) bytesToMove);
bytesUsed -= (int) (end - start);
}
@ -143,23 +143,23 @@ void MidiBuffer::addEvent (const void* const newData, const int maxBytes, const
if (numBytes > 0)
{
int spaceNeeded = bytesUsed + numBytes + sizeof (int) + sizeof (uint16);
data.ensureSize ((spaceNeeded + spaceNeeded / 2 + 8) & ~7);
size_t spaceNeeded = (size_t) bytesUsed + (size_t) numBytes + sizeof (int) + sizeof (uint16);
data.ensureSize ((spaceNeeded + spaceNeeded / 2 + 8) & ~(size_t) 7);
uint8* d = findEventAfter (getData(), sampleNumber);
const int bytesToMove = bytesUsed - (int) (d - getData());
if (bytesToMove > 0)
memmove (d + numBytes + sizeof (int) + sizeof (uint16), d, bytesToMove);
memmove (d + numBytes + sizeof (int) + sizeof (uint16), d, (size_t) bytesToMove);
*reinterpret_cast <int*> (d) = sampleNumber;
d += sizeof (int);
*reinterpret_cast <uint16*> (d) = (uint16) numBytes;
d += sizeof (uint16);
memcpy (d, newData, numBytes);
memcpy (d, newData, (size_t) numBytes);
bytesUsed += numBytes + sizeof (int) + sizeof (uint16);
bytesUsed += sizeof (int) + sizeof (uint16) + (size_t) numBytes;
}
}

20
modules/juce_audio_basics/midi/juce_MidiFile.cpp
View file

@ -25,7 +25,7 @@
namespace MidiFileHelpers
{
void writeVariableLengthInt (OutputStream& out, unsigned int v)
static void writeVariableLengthInt (OutputStream& out, unsigned int v)
{
unsigned int buffer = v & 0x7f;
@ -46,9 +46,9 @@ namespace MidiFileHelpers
}
}
bool parseMidiHeader (const uint8* &data, short& timeFormat, short& fileType, short& numberOfTracks) noexcept
static bool parseMidiHeader (const uint8* &data, short& timeFormat, short& fileType, short& numberOfTracks) noexcept
{
unsigned int ch = (int) ByteOrder::bigEndianInt (data);
unsigned int ch = ByteOrder::bigEndianInt (data);
data += 4;
if (ch != ByteOrder::bigEndianInt ("MThd"))
@ -88,9 +88,9 @@ namespace MidiFileHelpers
return true;
}
double convertTicksToSeconds (const double time,
const MidiMessageSequence& tempoEvents,
const int timeFormat)
static double convertTicksToSeconds (const double time,
const MidiMessageSequence& tempoEvents,
const int timeFormat)
{
if (timeFormat > 0)
{
@ -261,7 +261,7 @@ bool MidiFile::readFrom (InputStream& sourceStream)
if (size > 16 && MidiFileHelpers::parseMidiHeader (d, timeFormat, fileType, expectedTracks))
{
size -= (int) (d - static_cast <const uint8*> (data.getData()));
size -= (size_t) (d - static_cast <const uint8*> (data.getData()));
int track = 0;
@ -278,7 +278,7 @@ bool MidiFile::readFrom (InputStream& sourceStream)
if (chunkType == (int) ByteOrder::bigEndianInt ("MTrk"))
readNextTrack (d, chunkSize);
size -= chunkSize + 8;
size -= (size_t) chunkSize + 8;
d += chunkSize;
++track;
}
@ -384,7 +384,7 @@ void MidiFile::writeTrack (OutputStream& mainOut, const int trackNum)
{
const int tick = roundToInt (mm.getTimeStamp());
const int delta = jmax (0, tick - lastTick);
MidiFileHelpers::writeVariableLengthInt (out, delta);
MidiFileHelpers::writeVariableLengthInt (out, (uint32) delta);
lastTick = tick;
const uint8* data = mm.getRawData();
@ -407,7 +407,7 @@ void MidiFile::writeTrack (OutputStream& mainOut, const int trackNum)
++data;
--dataSize;
MidiFileHelpers::writeVariableLengthInt (out, dataSize);
MidiFileHelpers::writeVariableLengthInt (out, (uint32) dataSize);
}
out.write (data, dataSize);

20
modules/juce_audio_basics/midi/juce_MidiMessage.cpp
View file

@ -115,7 +115,7 @@ MidiMessage::MidiMessage (const void* const d, const int dataSize, const double
else
data = new uint8 [dataSize];
memcpy (data, d, dataSize);
memcpy (data, d, (size_t) dataSize);
// check that the length matches the data..
jassert (size > 3 || data[0] >= 0xf0 || getMessageLengthFromFirstByte (data[0]) == size);
@ -164,7 +164,7 @@ MidiMessage::MidiMessage (const MidiMessage& other)
if (other.usesAllocatedData())
{
data = new uint8 [size];
memcpy (data, other.data, size);
memcpy (data, other.data, (size_t) size);
}
else
{
@ -180,7 +180,7 @@ MidiMessage::MidiMessage (const MidiMessage& other, const double newTimeStamp)
if (other.usesAllocatedData())
{
data = new uint8 [size];
memcpy (data, other.data, size);
memcpy (data, other.data, (size_t) size);
}
else
{
@ -247,7 +247,7 @@ MidiMessage::MidiMessage (const void* src_, int sz, int& numBytesUsed, const uin
data = new uint8 [size - numVariableLengthSysexBytes];
*data = (uint8) byte;
memcpy (data + 1, src + numVariableLengthSysexBytes, size - numVariableLengthSysexBytes - 1);
memcpy (data + 1, src + numVariableLengthSysexBytes, (size_t) (size - numVariableLengthSysexBytes - 1));
}
else if (byte == 0xff)
{
@ -257,7 +257,7 @@ MidiMessage::MidiMessage (const void* src_, int sz, int& numBytesUsed, const uin
data = new uint8 [size];
*data = (uint8) byte;
memcpy (data + 1, src, size - 1);
memcpy (data + 1, src, (size_t) size - 1);
}
else
{
@ -295,7 +295,7 @@ MidiMessage& MidiMessage::operator= (const MidiMessage& other)
if (other.usesAllocatedData())
{
data = new uint8 [size];
memcpy (data, other.data, size);
memcpy (data, other.data, (size_t) size);
}
else
{
@ -404,7 +404,7 @@ int MidiMessage::getNoteNumber() const noexcept
void MidiMessage::setNoteNumber (const int newNoteNumber) noexcept
{
if (isNoteOnOrOff())
data[1] = (char) (newNoteNumber & 127);
data[1] = (uint8) (newNoteNumber & 127);
}
uint8 MidiMessage::getVelocity() const noexcept
@ -622,10 +622,10 @@ bool MidiMessage::isSysEx() const noexcept
MidiMessage MidiMessage::createSysExMessage (const uint8* sysexData, const int dataSize)
{
HeapBlock<uint8> m (dataSize + 2);
HeapBlock<uint8> m ((size_t) dataSize + 2);
m[0] = 0xf0;
memcpy (m + 1, sysexData, dataSize);
memcpy (m + 1, sysexData, (size_t) dataSize);
m[dataSize + 1] = 0xf7;
return MidiMessage (m, dataSize + 2);
@ -682,7 +682,7 @@ bool MidiMessage::isTextMetaEvent() const noexcept
String MidiMessage::getTextFromTextMetaEvent() const
{
return String (reinterpret_cast <const char*> (getMetaEventData()), getMetaEventLength());
return String (reinterpret_cast <const char*> (getMetaEventData()), (size_t) getMetaEventLength());
}
bool MidiMessage::isTrackNameEvent() const noexcept { return (data[1] == 3) && (*data == 0xff); }