Browse Source

Import 2 small patches from Carla

tags/2018-04-16
falkTX 10 years ago
parent
commit
dc5c62b0f9
4 changed files with 67 additions and 5 deletions
  1. +13
    -0
      libs/juce/patches/audioprocessor_changes.patch
  2. +48
    -0
      libs/juce/patches/core_always-print-leak-objs.patch
  3. +1
    -1
      libs/juce/source/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp
  4. +5
    -4
      libs/juce/source/modules/juce_core/memory/juce_LeakedObjectDetector.h

+ 13
- 0
libs/juce/patches/audioprocessor_changes.patch View File

@@ -0,0 +1,13 @@
diff --git a/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp
index d528a27..05aa7e0 100644
--- a/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp
+++ b/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp
@@ -26,7 +26,7 @@
} // (juce namespace)
-#include <ladspa.h>
+#include "ladspa.h"
namespace juce
{

+ 48
- 0
libs/juce/patches/core_always-print-leak-objs.patch View File

@@ -0,0 +1,48 @@
diff --git a/modules/juce_core/memory/juce_LeakedObjectDetector.h b/modules/juce_core/memory/juce_LeakedObjectDetector.h
index 248e7bc..74b7779 100644
--- a/modules/juce_core/memory/juce_LeakedObjectDetector.h
+++ b/modules/juce_core/memory/juce_LeakedObjectDetector.h
@@ -29,6 +29,7 @@
#ifndef JUCE_LEAKEDOBJECTDETECTOR_H_INCLUDED
#define JUCE_LEAKEDOBJECTDETECTOR_H_INCLUDED
+#define DBG2(dbgtext) { juce::String str; str << dbgtext; std::cout << str.toRawUTF8() << std::endl; }
//==============================================================================
/**
@@ -55,7 +56,7 @@ public:
{
if (--(getCounter().numObjects) < 0)
{
- DBG ("*** Dangling pointer deletion! Class: " << getLeakedObjectClassName());
+ DBG2 ("*** Dangling pointer deletion! Class: " << getLeakedObjectClassName());
/** If you hit this, then you've managed to delete more instances of this class than you've
created.. That indicates that you're deleting some dangling pointers.
@@ -68,7 +69,7 @@ public:
your object management. Tut, tut. Always, always use ScopedPointers, OwnedArrays,
ReferenceCountedObjects, etc, and avoid the 'delete' operator at all costs!
*/
- jassertfalse;
+ //jassertfalse;
}
}
@@ -83,7 +84,7 @@ private:
{
if (numObjects.value > 0)
{
- DBG ("*** Leaked objects detected: " << numObjects.value << " instance(s) of class " << getLeakedObjectClassName());
+ DBG2 ("*** Leaked objects detected: " << numObjects.value << " instance(s) of class " << getLeakedObjectClassName());
/** If you hit this, then you've leaked one or more objects of the type specified by
the 'OwnerClass' template parameter - the name should have been printed by the line above.
@@ -92,7 +93,7 @@ private:
your object management. Tut, tut. Always, always use ScopedPointers, OwnedArrays,
ReferenceCountedObjects, etc, and avoid the 'delete' operator at all costs!
*/
- jassertfalse;
+ //jassertfalse;
}
}

+ 1
- 1
libs/juce/source/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp View File

@@ -26,7 +26,7 @@
} // (juce namespace)
#include <ladspa.h>
#include "ladspa.h"
namespace juce
{


+ 5
- 4
libs/juce/source/modules/juce_core/memory/juce_LeakedObjectDetector.h View File

@@ -29,6 +29,7 @@
#ifndef JUCE_LEAKEDOBJECTDETECTOR_H_INCLUDED
#define JUCE_LEAKEDOBJECTDETECTOR_H_INCLUDED
#define DBG2(dbgtext) { juce::String str; str << dbgtext; std::cout << str.toRawUTF8() << std::endl; }
//==============================================================================
/**
@@ -55,7 +56,7 @@ public:
{
if (--(getCounter().numObjects) < 0)
{
DBG ("*** Dangling pointer deletion! Class: " << getLeakedObjectClassName());
DBG2 ("*** Dangling pointer deletion! Class: " << getLeakedObjectClassName());
/** If you hit this, then you've managed to delete more instances of this class than you've
created.. That indicates that you're deleting some dangling pointers.
@@ -68,7 +69,7 @@ public:
your object management. Tut, tut. Always, always use ScopedPointers, OwnedArrays,
ReferenceCountedObjects, etc, and avoid the 'delete' operator at all costs!
*/
jassertfalse;
//jassertfalse;
}
}
@@ -83,7 +84,7 @@ private:
{
if (numObjects.value > 0)
{
DBG ("*** Leaked objects detected: " << numObjects.value << " instance(s) of class " << getLeakedObjectClassName());
DBG2 ("*** Leaked objects detected: " << numObjects.value << " instance(s) of class " << getLeakedObjectClassName());
/** If you hit this, then you've leaked one or more objects of the type specified by
the 'OwnerClass' template parameter - the name should have been printed by the line above.
@@ -92,7 +93,7 @@ private:
your object management. Tut, tut. Always, always use ScopedPointers, OwnedArrays,
ReferenceCountedObjects, etc, and avoid the 'delete' operator at all costs!
*/
jassertfalse;
//jassertfalse;
}
}


Loading…
Cancel
Save