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

Simplified some inter-module dependencies and exception-catching fallbacks

Browse source
This commit is contained in:
jules 2015-12-23 11:47:18 +00:00
parent 9b167ca5e1
commit 2a1234b6ac
16 changed files with 90 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/juce_audio_devices/native/juce_win32_ASIO.cpp
View file

@ -690,31 +690,24 @@ public:
JUCE_ASIO_LOG ("showing control panel");
bool done = false;
insideControlPanelModalLoop = true;
JUCE_TRY
const uint32 started = Time::getMillisecondCounter();
if (asioObject != nullptr)
{
// are there are devices that need to be closed before showing their control panel?
// close();
insideControlPanelModalLoop = true;
asioObject->controlPanel();
const uint32 started = Time::getMillisecondCounter();
const int spent = (int) Time::getMillisecondCounter() - (int) started;
if (asioObject != nullptr)
JUCE_ASIO_LOG ("spent: " + String (spent));
if (spent > 300)
{
asioObject->controlPanel();
const int spent = (int) Time::getMillisecondCounter() - (int) started;
JUCE_ASIO_LOG ("spent: " + String (spent));
if (spent > 300)
{
shouldUsePreferredSize = true;
done = true;
}
shouldUsePreferredSize = true;
done = true;
}
}
JUCE_CATCH_ALL
insideControlPanelModalLoop = false;
return done;