mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-14 00:14:18 +00:00
Tidied up some win32 linkage declarations. Fixed some component size constraining problems on mac and win32.
This commit is contained in:
parent
ea16741b3d
commit
618d3fdf64
19 changed files with 192 additions and 158 deletions
|
|
@ -76,35 +76,38 @@ bool PluginDirectoryScanner::scanNextFile (const bool dontRescanIfAlreadyInList)
|
|||
{
|
||||
String file (filesOrIdentifiersToScan [nextIndex]);
|
||||
|
||||
if (file.isNotEmpty())
|
||||
if (file.isNotEmpty() && ! list.isListingUpToDate (file))
|
||||
{
|
||||
if (! list.isListingUpToDate (file))
|
||||
{
|
||||
OwnedArray <PluginDescription> typesFound;
|
||||
OwnedArray <PluginDescription> typesFound;
|
||||
|
||||
// Add this plugin to the end of the dead-man's pedal list in case it crashes...
|
||||
StringArray crashedPlugins (getDeadMansPedalFile());
|
||||
crashedPlugins.removeString (file);
|
||||
crashedPlugins.add (file);
|
||||
setDeadMansPedalFile (crashedPlugins);
|
||||
// Add this plugin to the end of the dead-man's pedal list in case it crashes...
|
||||
StringArray crashedPlugins (getDeadMansPedalFile());
|
||||
crashedPlugins.removeString (file);
|
||||
crashedPlugins.add (file);
|
||||
setDeadMansPedalFile (crashedPlugins);
|
||||
|
||||
list.scanAndAddFile (file,
|
||||
dontRescanIfAlreadyInList,
|
||||
typesFound,
|
||||
format);
|
||||
list.scanAndAddFile (file,
|
||||
dontRescanIfAlreadyInList,
|
||||
typesFound,
|
||||
format);
|
||||
|
||||
// Managed to load without crashing, so remove it from the dead-man's-pedal..
|
||||
crashedPlugins.removeString (file);
|
||||
setDeadMansPedalFile (crashedPlugins);
|
||||
// Managed to load without crashing, so remove it from the dead-man's-pedal..
|
||||
crashedPlugins.removeString (file);
|
||||
setDeadMansPedalFile (crashedPlugins);
|
||||
|
||||
if (typesFound.size() == 0)
|
||||
failedFiles.add (file);
|
||||
}
|
||||
|
||||
++nextIndex;
|
||||
progress = nextIndex / (float) filesOrIdentifiersToScan.size();
|
||||
if (typesFound.size() == 0)
|
||||
failedFiles.add (file);
|
||||
}
|
||||
|
||||
return skipNextFile();
|
||||
}
|
||||
|
||||
bool PluginDirectoryScanner::skipNextFile()
|
||||
{
|
||||
if (nextIndex >= filesOrIdentifiersToScan.size())
|
||||
return false;
|
||||
|
||||
progress = ++nextIndex / (float) filesOrIdentifiersToScan.size();
|
||||
return nextIndex < filesOrIdentifiersToScan.size();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue