Browse Source

Improved some MemoryBlock comments and gave the class a reset() method.

tags/2021-05-28
jules 11 years ago
parent
commit
5ede2da44b
10 changed files with 38 additions and 26 deletions
  1. +1
    -1
      modules/juce_audio_devices/native/juce_win32_WASAPI.cpp
  2. +2
    -2
      modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
  3. +3
    -3
      modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp
  4. +3
    -3
      modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  5. +7
    -2
      modules/juce_core/memory/juce_MemoryBlock.cpp
  6. +6
    -3
      modules/juce_core/memory/juce_MemoryBlock.h
  7. +4
    -4
      modules/juce_gui_extra/native/juce_android_WebBrowserComponent.cpp
  8. +4
    -4
      modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp
  9. +4
    -2
      modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm
  10. +4
    -2
      modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp

+ 1
- 1
modules/juce_audio_devices/native/juce_win32_WASAPI.cpp View File

@@ -632,7 +632,7 @@ public:
{
closeClient();
captureClient = nullptr;
reservoir.setSize (0);
reservoir.reset();
}
template <class SourceType>


+ 2
- 2
modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp View File

@@ -442,7 +442,7 @@ struct AAXClasses
if (chunkID != juceChunkType)
return AAX_CEffectParameters::GetChunkSize (chunkID, oSize);
tempFilterData.setSize (0);
tempFilterData.reset();
pluginInstance->getStateInformation (tempFilterData);
*oSize = (uint32_t) tempFilterData.getSize();
return AAX_SUCCESS;
@@ -458,7 +458,7 @@ struct AAXClasses
oChunk->fSize = (int32_t) tempFilterData.getSize();
tempFilterData.copyTo (oChunk->fData, 0, tempFilterData.getSize());
tempFilterData.setSize (0);
tempFilterData.reset();
return AAX_SUCCESS;
}


+ 3
- 3
modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp View File

@@ -627,7 +627,7 @@ protected:
{
if (chunkID == juceChunkType)
{
tempFilterData.setSize (0);
tempFilterData.reset();
juceFilter->getStateInformation (tempFilterData);
*size = sizeof (SFicPlugInChunkHeader) + tempFilterData.getSize();
@@ -647,7 +647,7 @@ protected:
chunk->fSize = sizeof (SFicPlugInChunkHeader) + tempFilterData.getSize();
tempFilterData.copyTo ((void*) chunk->fData, 0, tempFilterData.getSize());
tempFilterData.setSize (0);
tempFilterData.reset();
return noErr;
}
@@ -659,7 +659,7 @@ protected:
{
if (chunkID == juceChunkType)
{
tempFilterData.setSize (0);
tempFilterData.reset();
if (chunk->fSize - sizeof (SFicPlugInChunkHeader) > 0)
{


+ 3
- 3
modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp View File

@@ -977,7 +977,7 @@ public:
if (filter == nullptr)
return 0;
chunkMemory.setSize (0);
chunkMemory.reset();
if (onlyStoreCurrentProgramData)
filter->getCurrentProgramStateInformation (chunkMemory);
else
@@ -996,7 +996,7 @@ public:
{
if (filter != nullptr)
{
chunkMemory.setSize (0);
chunkMemory.reset();
chunkMemoryTime = 0;
if (byteSize > 0 && data != nullptr)
@@ -1023,8 +1023,8 @@ public:
&& chunkMemoryTime < juce::Time::getApproximateMillisecondCounter() - 2000
&& ! recursionCheck)
{
chunkMemory.reset();
chunkMemoryTime = 0;
chunkMemory.setSize (0);
}
#if JUCE_MAC


+ 7
- 2
modules/juce_core/memory/juce_MemoryBlock.cpp View File

@@ -127,8 +127,7 @@ void MemoryBlock::setSize (const size_t newSize, const bool initialiseToZero)
{
if (newSize <= 0)
{
data.free();
size = 0;
reset();
}
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)
{
if (size < minimumSize)


+ 6
- 3
modules/juce_core/memory/juce_MemoryBlock.h View File

@@ -108,9 +108,9 @@ public:
/** 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 initialiseNewSpaceToZero if the block gets enlarged, this determines
@@ -133,6 +133,9 @@ public:
void ensureSize (const size_t minimumSize,
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.
This is handy for clearing a block of memory to zero.


+ 4
- 4
modules/juce_gui_extra/native/juce_android_WebBrowserComponent.cpp View File

@@ -41,17 +41,17 @@ void WebBrowserComponent::goToURL (const String& url,
{
lastURL = url;
lastHeaders.clear();
if (headers != nullptr)
lastHeaders = *headers;
else
lastHeaders.clear();
lastPostData.setSize (0);
if (postData != nullptr)
lastPostData = *postData;
else
lastPostData.reset();
blankPageShown = false;
}
void WebBrowserComponent::stop()


+ 4
- 4
modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp View File

@@ -46,17 +46,17 @@ void WebBrowserComponent::goToURL (const String& url,
{
lastURL = url;
lastHeaders.clear();
if (headers != nullptr)
lastHeaders = *headers;
else
lastHeaders.clear();
lastPostData.setSize (0);
if (postData != nullptr)
lastPostData = *postData;
else
lastPostData.reset();
blankPageShown = false;
}
void WebBrowserComponent::stop()


+ 4
- 2
modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm View File

@@ -265,13 +265,15 @@ void WebBrowserComponent::goToURL (const String& url,
{
lastURL = url;
lastHeaders.clear();
if (headers != nullptr)
lastHeaders = *headers;
else
lastHeaders.clear();
lastPostData.setSize (0);
if (postData != nullptr)
lastPostData = *postData;
else
lastPostData.reset();
blankPageShown = false;


+ 4
- 2
modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp View File

@@ -214,13 +214,15 @@ void WebBrowserComponent::goToURL (const String& url,
{
lastURL = url;
lastHeaders.clear();
if (headers != nullptr)
lastHeaders = *headers;
else
lastHeaders.clear();
lastPostData.setSize (0);
if (postData != nullptr)
lastPostData = *postData;
else
lastPostData.reset();
blankPageShown = false;


Loading…
Cancel
Save