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

Workaround for a compile error in MSVC DLL builds

Browse source
This commit is contained in:
jules 2017-02-23 09:39:28 +00:00
parent aa2598ffff
commit 297675c5cb
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/juce_core/network/juce_URL.cpp
View file

@ -28,7 +28,6 @@
==============================================================================
*/
//==============================================================================
struct FallbackDownloadTask : public URL::DownloadTask,
public Thread
{
@ -38,15 +37,18 @@ struct FallbackDownloadTask : public URL::DownloadTask,
URL::DownloadTask::Listener* listenerToUse)
: Thread ("DownloadTask thread"),
fileStream (outputStreamToUse),
stream (streamToUse),
bufferSize (bufferSizeToUse),
buffer (bufferSize),
stream (streamToUse),
listener (listenerToUse)
{
jassert (fileStream != nullptr);
jassert (stream != nullptr);
contentLength = stream->getTotalLength();
httpCode = stream->getStatusCode();
startThread ();
startThread();
}
~FallbackDownloadTask()
@ -59,7 +61,7 @@ struct FallbackDownloadTask : public URL::DownloadTask,
//==============================================================================
void run() override
{
while (! stream->isExhausted() && ! stream->isError() && ! threadShouldExit())
while (! (stream->isExhausted() || stream->isError() || threadShouldExit()))
{
if (listener != nullptr)
listener->progress (this, downloaded, contentLength);
@ -83,7 +85,7 @@ struct FallbackDownloadTask : public URL::DownloadTask,
fileStream->flush();
if (threadShouldExit() || (stream != nullptr && stream->isError()))
if (threadShouldExit() || stream->isError())
error = true;
if (contentLength > 0 && downloaded < contentLength)
@ -96,11 +98,13 @@ struct FallbackDownloadTask : public URL::DownloadTask,
}
//==============================================================================
ScopedPointer<FileOutputStream> fileStream;
size_t bufferSize;
const ScopedPointer<FileOutputStream> fileStream;
const ScopedPointer<WebInputStream> stream;
const size_t bufferSize;
HeapBlock<char> buffer;
ScopedPointer<WebInputStream> stream;
URL::DownloadTask::Listener* listener;
URL::DownloadTask::Listener* const listener;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FallbackDownloadTask)
};
void URL::DownloadTask::Listener::progress (DownloadTask*, int64, int64) {}