| @@ -632,7 +632,7 @@ public: | |||||
| { | { | ||||
| closeClient(); | closeClient(); | ||||
| captureClient = nullptr; | captureClient = nullptr; | ||||
| reservoir.setSize (0); | |||||
| reservoir.reset(); | |||||
| } | } | ||||
| template <class SourceType> | template <class SourceType> | ||||
| @@ -442,7 +442,7 @@ struct AAXClasses | |||||
| if (chunkID != juceChunkType) | if (chunkID != juceChunkType) | ||||
| return AAX_CEffectParameters::GetChunkSize (chunkID, oSize); | return AAX_CEffectParameters::GetChunkSize (chunkID, oSize); | ||||
| tempFilterData.setSize (0); | |||||
| tempFilterData.reset(); | |||||
| pluginInstance->getStateInformation (tempFilterData); | pluginInstance->getStateInformation (tempFilterData); | ||||
| *oSize = (uint32_t) tempFilterData.getSize(); | *oSize = (uint32_t) tempFilterData.getSize(); | ||||
| return AAX_SUCCESS; | return AAX_SUCCESS; | ||||
| @@ -458,7 +458,7 @@ struct AAXClasses | |||||
| oChunk->fSize = (int32_t) tempFilterData.getSize(); | oChunk->fSize = (int32_t) tempFilterData.getSize(); | ||||
| tempFilterData.copyTo (oChunk->fData, 0, tempFilterData.getSize()); | tempFilterData.copyTo (oChunk->fData, 0, tempFilterData.getSize()); | ||||
| tempFilterData.setSize (0); | |||||
| tempFilterData.reset(); | |||||
| return AAX_SUCCESS; | return AAX_SUCCESS; | ||||
| } | } | ||||
| @@ -627,7 +627,7 @@ protected: | |||||
| { | { | ||||
| if (chunkID == juceChunkType) | if (chunkID == juceChunkType) | ||||
| { | { | ||||
| tempFilterData.setSize (0); | |||||
| tempFilterData.reset(); | |||||
| juceFilter->getStateInformation (tempFilterData); | juceFilter->getStateInformation (tempFilterData); | ||||
| *size = sizeof (SFicPlugInChunkHeader) + tempFilterData.getSize(); | *size = sizeof (SFicPlugInChunkHeader) + tempFilterData.getSize(); | ||||
| @@ -647,7 +647,7 @@ protected: | |||||
| chunk->fSize = sizeof (SFicPlugInChunkHeader) + tempFilterData.getSize(); | chunk->fSize = sizeof (SFicPlugInChunkHeader) + tempFilterData.getSize(); | ||||
| tempFilterData.copyTo ((void*) chunk->fData, 0, tempFilterData.getSize()); | tempFilterData.copyTo ((void*) chunk->fData, 0, tempFilterData.getSize()); | ||||
| tempFilterData.setSize (0); | |||||
| tempFilterData.reset(); | |||||
| return noErr; | return noErr; | ||||
| } | } | ||||
| @@ -659,7 +659,7 @@ protected: | |||||
| { | { | ||||
| if (chunkID == juceChunkType) | if (chunkID == juceChunkType) | ||||
| { | { | ||||
| tempFilterData.setSize (0); | |||||
| tempFilterData.reset(); | |||||
| if (chunk->fSize - sizeof (SFicPlugInChunkHeader) > 0) | if (chunk->fSize - sizeof (SFicPlugInChunkHeader) > 0) | ||||
| { | { | ||||
| @@ -977,7 +977,7 @@ public: | |||||
| if (filter == nullptr) | if (filter == nullptr) | ||||
| return 0; | return 0; | ||||
| chunkMemory.setSize (0); | |||||
| chunkMemory.reset(); | |||||
| if (onlyStoreCurrentProgramData) | if (onlyStoreCurrentProgramData) | ||||
| filter->getCurrentProgramStateInformation (chunkMemory); | filter->getCurrentProgramStateInformation (chunkMemory); | ||||
| else | else | ||||
| @@ -996,7 +996,7 @@ public: | |||||
| { | { | ||||
| if (filter != nullptr) | if (filter != nullptr) | ||||
| { | { | ||||
| chunkMemory.setSize (0); | |||||
| chunkMemory.reset(); | |||||
| chunkMemoryTime = 0; | chunkMemoryTime = 0; | ||||
| if (byteSize > 0 && data != nullptr) | if (byteSize > 0 && data != nullptr) | ||||
| @@ -1023,8 +1023,8 @@ public: | |||||
| && chunkMemoryTime < juce::Time::getApproximateMillisecondCounter() - 2000 | && chunkMemoryTime < juce::Time::getApproximateMillisecondCounter() - 2000 | ||||
| && ! recursionCheck) | && ! recursionCheck) | ||||
| { | { | ||||
| chunkMemory.reset(); | |||||
| chunkMemoryTime = 0; | chunkMemoryTime = 0; | ||||
| chunkMemory.setSize (0); | |||||
| } | } | ||||
| #if JUCE_MAC | #if JUCE_MAC | ||||
| @@ -127,8 +127,7 @@ void MemoryBlock::setSize (const size_t newSize, const bool initialiseToZero) | |||||
| { | { | ||||
| if (newSize <= 0) | if (newSize <= 0) | ||||
| { | { | ||||
| data.free(); | |||||
| size = 0; | |||||
| reset(); | |||||
| } | } | ||||
| else | else | ||||
| { | { | ||||
| @@ -149,6 +148,12 @@ void MemoryBlock::setSize (const size_t newSize, const bool initialiseToZero) | |||||
| } | } | ||||
| } | } | ||||
| void MemoryBlock::reset() | |||||
| { | |||||
| data.free(); | |||||
| size = 0; | |||||
| } | |||||
| void MemoryBlock::ensureSize (const size_t minimumSize, const bool initialiseToZero) | void MemoryBlock::ensureSize (const size_t minimumSize, const bool initialiseToZero) | ||||
| { | { | ||||
| if (size < minimumSize) | if (size < minimumSize) | ||||
| @@ -108,9 +108,9 @@ public: | |||||
| /** Resizes the memory block. | /** Resizes the memory block. | ||||
| This will try to keep as much of the block's current content as it can, | |||||
| and can optionally be made to clear any new space that gets allocated at | |||||
| the end of the block. | |||||
| Any data that is present in both the old and new sizes will be retained. | |||||
| When enlarging the block, the new space that is allocated at the end can either be | |||||
| cleared, or left uninitialised. | |||||
| @param newSize the new desired size for the block | @param newSize the new desired size for the block | ||||
| @param initialiseNewSpaceToZero if the block gets enlarged, this determines | @param initialiseNewSpaceToZero if the block gets enlarged, this determines | ||||
| @@ -133,6 +133,9 @@ public: | |||||
| void ensureSize (const size_t minimumSize, | void ensureSize (const size_t minimumSize, | ||||
| bool initialiseNewSpaceToZero = false); | bool initialiseNewSpaceToZero = false); | ||||
| /** Frees all the blocks data, setting its size to 0. */ | |||||
| void reset(); | |||||
| //============================================================================== | //============================================================================== | ||||
| /** Fills the entire memory block with a repeated byte value. | /** Fills the entire memory block with a repeated byte value. | ||||
| This is handy for clearing a block of memory to zero. | This is handy for clearing a block of memory to zero. | ||||
| @@ -41,17 +41,17 @@ void WebBrowserComponent::goToURL (const String& url, | |||||
| { | { | ||||
| lastURL = url; | lastURL = url; | ||||
| lastHeaders.clear(); | |||||
| if (headers != nullptr) | if (headers != nullptr) | ||||
| lastHeaders = *headers; | lastHeaders = *headers; | ||||
| else | |||||
| lastHeaders.clear(); | |||||
| lastPostData.setSize (0); | |||||
| if (postData != nullptr) | if (postData != nullptr) | ||||
| lastPostData = *postData; | lastPostData = *postData; | ||||
| else | |||||
| lastPostData.reset(); | |||||
| blankPageShown = false; | blankPageShown = false; | ||||
| } | } | ||||
| void WebBrowserComponent::stop() | void WebBrowserComponent::stop() | ||||
| @@ -46,17 +46,17 @@ void WebBrowserComponent::goToURL (const String& url, | |||||
| { | { | ||||
| lastURL = url; | lastURL = url; | ||||
| lastHeaders.clear(); | |||||
| if (headers != nullptr) | if (headers != nullptr) | ||||
| lastHeaders = *headers; | lastHeaders = *headers; | ||||
| else | |||||
| lastHeaders.clear(); | |||||
| lastPostData.setSize (0); | |||||
| if (postData != nullptr) | if (postData != nullptr) | ||||
| lastPostData = *postData; | lastPostData = *postData; | ||||
| else | |||||
| lastPostData.reset(); | |||||
| blankPageShown = false; | blankPageShown = false; | ||||
| } | } | ||||
| void WebBrowserComponent::stop() | void WebBrowserComponent::stop() | ||||
| @@ -265,13 +265,15 @@ void WebBrowserComponent::goToURL (const String& url, | |||||
| { | { | ||||
| lastURL = url; | lastURL = url; | ||||
| lastHeaders.clear(); | |||||
| if (headers != nullptr) | if (headers != nullptr) | ||||
| lastHeaders = *headers; | lastHeaders = *headers; | ||||
| else | |||||
| lastHeaders.clear(); | |||||
| lastPostData.setSize (0); | |||||
| if (postData != nullptr) | if (postData != nullptr) | ||||
| lastPostData = *postData; | lastPostData = *postData; | ||||
| else | |||||
| lastPostData.reset(); | |||||
| blankPageShown = false; | blankPageShown = false; | ||||
| @@ -214,13 +214,15 @@ void WebBrowserComponent::goToURL (const String& url, | |||||
| { | { | ||||
| lastURL = url; | lastURL = url; | ||||
| lastHeaders.clear(); | |||||
| if (headers != nullptr) | if (headers != nullptr) | ||||
| lastHeaders = *headers; | lastHeaders = *headers; | ||||
| else | |||||
| lastHeaders.clear(); | |||||
| lastPostData.setSize (0); | |||||
| if (postData != nullptr) | if (postData != nullptr) | ||||
| lastPostData = *postData; | lastPostData = *postData; | ||||
| else | |||||
| lastPostData.reset(); | |||||
| blankPageShown = false; | blankPageShown = false; | ||||