From c4dcf39264c1601073a9967cc23ae7381e63afa8 Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 19 Nov 2008 14:04:40 +0000 Subject: [PATCH] --- extras/audio plugin host/src/includes.h | 3 +-- extras/audio plugin host/src/juce_AppConfig.h | 2 +- .../wrapper/formats/AudioUnit/juce_AudioUnitWrapper.mm | 4 ++-- .../wrapper/formats/RTAS/juce_RTASUtilities.mm | 2 +- .../wrapper/formats/RTAS/juce_RTASWrapper.cpp | 9 +-------- .../formats/Standalone/juce_AudioFilterStreamer.h | 2 +- juce_amalgamated.cpp | 5 ++++- .../audio/processors/juce_AudioProcessorGraph.cpp | 5 ++++- 8 files changed, 15 insertions(+), 17 deletions(-) diff --git a/extras/audio plugin host/src/includes.h b/extras/audio plugin host/src/includes.h index d16e4ab20c..f8cbcf733c 100644 --- a/extras/audio plugin host/src/includes.h +++ b/extras/audio plugin host/src/includes.h @@ -1,6 +1,5 @@ #include "juce_AppConfig.h" -//#include "../../../juce_amalgamated.h" -#include "../../../juce.h" +#include "../../../juce_amalgamated.h" using JUCE_NAMESPACE::uint32; diff --git a/extras/audio plugin host/src/juce_AppConfig.h b/extras/audio plugin host/src/juce_AppConfig.h index 2d28ed0bdf..9987a3f8b8 100644 --- a/extras/audio plugin host/src/juce_AppConfig.h +++ b/extras/audio plugin host/src/juce_AppConfig.h @@ -44,7 +44,7 @@ //#define JUCE_LOG_ASSERTIONS 1 //#define JUCE_ASIO 1 //#define JUCE_ALSA 1 -//#define JUCE_QUICKTIME 1 +#define JUCE_QUICKTIME 0 //#define JUCE_OPENGL 1 //#define JUCE_USE_FLAC 1 //#define JUCE_USE_OGGVORBIS 1 diff --git a/extras/audio plugins/wrapper/formats/AudioUnit/juce_AudioUnitWrapper.mm b/extras/audio plugins/wrapper/formats/AudioUnit/juce_AudioUnitWrapper.mm index 7abb94fa8d..068fc444c1 100644 --- a/extras/audio plugins/wrapper/formats/AudioUnit/juce_AudioUnitWrapper.mm +++ b/extras/audio plugins/wrapper/formats/AudioUnit/juce_AudioUnitWrapper.mm @@ -36,8 +36,8 @@ #include "AUMIDIEffectBase.h" #include "MusicDeviceBase.h" #include "../../juce_IncludeCharacteristics.h" -//#include "../../../../../juce_amalgamated.h" -#include "../../../../../juce.h" +#include "../../../../../juce_amalgamated.h" +//#include "../../../../../juce.h" //============================================================================== #define juceFilterObjectPropertyID 0x1a45ffe9 diff --git a/extras/audio plugins/wrapper/formats/RTAS/juce_RTASUtilities.mm b/extras/audio plugins/wrapper/formats/RTAS/juce_RTASUtilities.mm index 560d1132be..8f59313720 100644 --- a/extras/audio plugins/wrapper/formats/RTAS/juce_RTASUtilities.mm +++ b/extras/audio plugins/wrapper/formats/RTAS/juce_RTASUtilities.mm @@ -30,7 +30,7 @@ */ #include -#include "../../../../../juce.h" +#include "../../../../../juce_amalgamated.h" //============================================================================== void* attachSubWindow (void* hostWindowRef, Component* comp) diff --git a/extras/audio plugins/wrapper/formats/RTAS/juce_RTASWrapper.cpp b/extras/audio plugins/wrapper/formats/RTAS/juce_RTASWrapper.cpp index d30ca72f0f..70a3769efd 100644 --- a/extras/audio plugins/wrapper/formats/RTAS/juce_RTASWrapper.cpp +++ b/extras/audio plugins/wrapper/formats/RTAS/juce_RTASWrapper.cpp @@ -88,14 +88,7 @@ #pragma pack (push, 8) #endif -// On the mac, the amalgamated build works ok, but causes a few strange problems in windows, -// so stick with the normal one on win32 for now... -#ifdef _MSC_VER - #include "../../../../../juce.h" -#else - #include "../../../../../juce.h" -#endif - +#include "../../../../../juce_amalgamated.h" #include "../../juce_IncludeCharacteristics.h" #ifdef _MSC_VER diff --git a/extras/audio plugins/wrapper/formats/Standalone/juce_AudioFilterStreamer.h b/extras/audio plugins/wrapper/formats/Standalone/juce_AudioFilterStreamer.h index a6dae09616..8b6f99182c 100644 --- a/extras/audio plugins/wrapper/formats/Standalone/juce_AudioFilterStreamer.h +++ b/extras/audio plugins/wrapper/formats/Standalone/juce_AudioFilterStreamer.h @@ -32,7 +32,7 @@ #ifndef __JUCE_AUDIOFILTERSTREAMER_JUCEHEADER__ #define __JUCE_AUDIOFILTERSTREAMER_JUCEHEADER__ -#include "../../../../../juce.h" +#include "../../../../../juce_amalgamated.h" //============================================================================== diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index c8f5ee406c..027956ab41 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -32899,7 +32899,10 @@ public: totalChans (jmax (1, totalChans_)), midiBufferToUse (midiBufferToUse_) { - channels = (float**) juce_calloc (sizeof (float*) * totalChans_); + channels = (float**) juce_calloc (sizeof (float*) * totalChans); + + while (audioChannelsToUse.size() < totalChans) + audioChannelsToUse.add (0); } ~ProcessBufferOp() throw() diff --git a/src/juce_appframework/audio/processors/juce_AudioProcessorGraph.cpp b/src/juce_appframework/audio/processors/juce_AudioProcessorGraph.cpp index 221c18a2f4..1291db5609 100644 --- a/src/juce_appframework/audio/processors/juce_AudioProcessorGraph.cpp +++ b/src/juce_appframework/audio/processors/juce_AudioProcessorGraph.cpp @@ -514,7 +514,10 @@ public: totalChans (jmax (1, totalChans_)), midiBufferToUse (midiBufferToUse_) { - channels = (float**) juce_calloc (sizeof (float*) * totalChans_); + channels = (float**) juce_calloc (sizeof (float*) * totalChans); + + while (audioChannelsToUse.size() < totalChans) + audioChannelsToUse.add (0); } ~ProcessBufferOp() throw()