mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-02-02 03:20:06 +00:00
This commit is contained in:
parent
8fce8a97e9
commit
c4dcf39264
8 changed files with 15 additions and 17 deletions
|
|
@ -1,6 +1,5 @@
|
|||
|
||||
#include "juce_AppConfig.h"
|
||||
//#include "../../../juce_amalgamated.h"
|
||||
#include "../../../juce.h"
|
||||
#include "../../../juce_amalgamated.h"
|
||||
using JUCE_NAMESPACE::uint32;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*/
|
||||
|
||||
#include <Cocoa/Cocoa.h>
|
||||
#include "../../../../../juce.h"
|
||||
#include "../../../../../juce_amalgamated.h"
|
||||
|
||||
//==============================================================================
|
||||
void* attachSubWindow (void* hostWindowRef, Component* comp)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#ifndef __JUCE_AUDIOFILTERSTREAMER_JUCEHEADER__
|
||||
#define __JUCE_AUDIOFILTERSTREAMER_JUCEHEADER__
|
||||
|
||||
#include "../../../../../juce.h"
|
||||
#include "../../../../../juce_amalgamated.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue