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

Tidied up some methods in String, StringArray, and input streams. Reduced CoreAudio buffer size limit.

Browse source
This commit is contained in:
Julian Storer 2010-03-13 16:39:55 +00:00
parent 24a73b96ef
commit 3b77f1233f
16 changed files with 443 additions and 419 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/io/streams/juce_MemoryInputStream.cpp
View file

@ -27,7 +27,6 @@
BEGIN_JUCE_NAMESPACE
#include "juce_MemoryInputStream.h"
@ -35,14 +34,27 @@ BEGIN_JUCE_NAMESPACE
MemoryInputStream::MemoryInputStream (const void* const sourceData,
const size_t sourceDataSize,
const bool keepInternalCopy)
: data ((const char*) sourceData),
: data (static_cast <const char*> (sourceData)),
dataSize (sourceDataSize),
position (0)
{
if (keepInternalCopy)
{
internalCopy.append (data, sourceDataSize);
data = (const char*) internalCopy.getData();
data = static_cast <const char*> (internalCopy.getData());
}
}
MemoryInputStream::MemoryInputStream (const MemoryBlock& sourceData,
const bool keepInternalCopy)
: data (static_cast <const char*> (sourceData.getData())),
dataSize (sourceData.getSize()),
position (0)
{
if (keepInternalCopy)
{
internalCopy = sourceData;
data = static_cast <const char*> (internalCopy.getData());
}
}
@ -55,7 +67,7 @@ int64 MemoryInputStream::getTotalLength()
return dataSize;
}
int MemoryInputStream::read (void* buffer, int howMany)
int MemoryInputStream::read (void* const buffer, const int howMany)
{
jassert (howMany >= 0);
const int num = jmin (howMany, (int) (dataSize - position));
@ -69,10 +81,9 @@ bool MemoryInputStream::isExhausted()
return (position >= dataSize);
}
bool MemoryInputStream::setPosition (int64 pos)
bool MemoryInputStream::setPosition (const int64 pos)
{
position = (int) jlimit ((int64) 0, (int64) dataSize, pos);
return true;
}