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

64-bit VST tweaks. Removed leak warnings for messages.

Browse source
This commit is contained in:
Julian Storer 2011-04-05 13:15:52 +01:00
parent 97398dfe49
commit f73d602b45
13 changed files with 158 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

46
extras/Introjucer/Source/Project/jucer_ResourceFile.cpp
View file

@ -87,7 +87,28 @@ void ResourceFile::setClassName (const String& className_)
void ResourceFile::addFile (const File& file)
{
files.add (new File (file));
files.add (file);
const String variableNameRoot (CodeHelpers::makeBinaryDataIdentifierName (file));
String variableName (variableNameRoot);
int suffix = 2;
while (variableNames.contains (variableName))
variableName = variableNameRoot + String (suffix++);
variableNames.add (variableName);
}
const String ResourceFile::getDataVariableFor (const File& file) const
{
jassert (files.indexOf (file) >= 0);
return variableNames [files.indexOf (file)];
}
const String ResourceFile::getSizeVariableFor (const File& file) const
{
jassert (files.indexOf (file) >= 0);
return variableNames [files.indexOf (file)] + "Size";
}
int64 ResourceFile::getTotalDataSize() const
@ -95,7 +116,7 @@ int64 ResourceFile::getTotalDataSize() const
int64 total = 0;
for (int i = 0; i < files.size(); ++i)
total += files.getUnchecked(i)->getSize();
total += files.getReference(i).getSize();
return total;
}
@ -118,25 +139,12 @@ bool ResourceFile::write (const File& cppFile, OutputStream& cpp, OutputStream&
header << CodeHelpers::createIncludeStatement (juceHeader, cppFile) << newLine;
const String namespaceName (className);
StringArray variableNames, returnCodes;
StringArray returnCodes;
int i;
for (i = 0; i < files.size(); ++i)
{
String variableNameRoot (CodeHelpers::makeValidIdentifier (files.getUnchecked(i)->getFileName()
.replaceCharacters (" .", "__")
.retainCharacters ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_0123456789"),
false, true, false));
String variableName (variableNameRoot);
int suffix = 2;
while (variableNames.contains (variableName))
variableName = variableNameRoot + String (suffix++);
variableNames.add (variableName);
returnCodes.add ("numBytes = " + namespaceName + "::" + variableName + "Size; return "
+ namespaceName + "::" + variableName + ";");
}
returnCodes.add ("numBytes = " + namespaceName + "::" + variableNames[i] + "Size; return "
+ namespaceName + "::" + variableNames[i] + ";");
cpp << CodeHelpers::createIncludeStatement (cppFile.withFileExtension (".h"), cppFile) << newLine
<< newLine
@ -155,7 +163,7 @@ bool ResourceFile::write (const File& cppFile, OutputStream& cpp, OutputStream&
for (i = 0; i < files.size(); ++i)
{
const File file (*files.getUnchecked(i));
const File& file = files.getReference(i);
const int64 dataSize = file.getSize();
ScopedPointer <InputStream> fileStream (file.createInputStream());