mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-02-07 04:10:08 +00:00
Simplified some headers in juce_audio_plugin_client to remove direct inclusion of AppConfig.h
This commit is contained in:
jules
parent
a8ca80a49d
commit
4b4b8df491
13 changed files with 70 additions and 122 deletions
|
|
@ -22,11 +22,7 @@
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
|
||||
#include "../../juce_core/native/juce_mac_ClangBugWorkaround.h"
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
|
||||
#if JucePlugin_Build_AAX && (JUCE_INCLUDED_AAX_IN_MM || defined (_WIN32) || defined (_WIN64))
|
||||
|
|
@ -1362,8 +1358,8 @@ struct AAXClasses
|
|||
descriptor.AddCategory (JucePlugin_AAXCategory);
|
||||
|
||||
#ifdef JucePlugin_AAXPageTableFile
|
||||
// optional page table setting - define this macro in your AppConfig.h if you
|
||||
// want to set this value - see Avid documentation for details about its format.
|
||||
// optional page table setting - define this macro in your project if you want
|
||||
// to set this value - see Avid documentation for details about its format.
|
||||
descriptor.AddResourceInfo (AAX_eResourceType_PageTable, JucePlugin_AAXPageTableFile);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -22,12 +22,8 @@
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
#include "../../juce_core/native/juce_mac_ClangBugWorkaround.h"
|
||||
|
||||
#if JucePlugin_Build_AU
|
||||
|
||||
|
|
|
|||
|
|
@ -22,10 +22,7 @@
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
|
||||
#if JucePlugin_Build_RTAS
|
||||
|
|
|
|||
|
|
@ -22,10 +22,7 @@
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
|
||||
#if JucePlugin_Build_RTAS
|
||||
|
|
|
|||
|
|
@ -22,10 +22,7 @@
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
|
||||
#if JucePlugin_Build_RTAS
|
||||
|
|
|
|||
|
|
@ -22,10 +22,7 @@
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
|
||||
#if JucePlugin_Build_RTAS
|
||||
|
|
|
|||
|
|
@ -22,10 +22,7 @@
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
|
||||
// (these functions are in their own file because of problems including windows.h
|
||||
|
|
|
|||
|
|
@ -22,10 +22,7 @@
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
|
||||
#if JucePlugin_Build_RTAS
|
||||
|
|
|
|||
|
|
@ -22,11 +22,8 @@
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
#include "../../juce_core/native/juce_mac_ClangBugWorkaround.h"
|
||||
|
||||
#if JucePlugin_Build_VST
|
||||
|
||||
|
|
@ -34,27 +31,13 @@
|
|||
#pragma warning (disable : 4996 4100)
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#undef _WIN32_WINNT
|
||||
#define _WIN32_WINNT 0x500
|
||||
#undef STRICT
|
||||
#define STRICT 1
|
||||
#include <windows.h>
|
||||
#elif defined (LINUX)
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xatom.h>
|
||||
#undef KeyPress
|
||||
#else
|
||||
#include <Carbon/Carbon.h>
|
||||
#endif
|
||||
#include "../utility/juce_IncludeSystemHeaders.h"
|
||||
|
||||
#ifdef PRAGMA_ALIGN_SUPPORTED
|
||||
#undef PRAGMA_ALIGN_SUPPORTED
|
||||
#define PRAGMA_ALIGN_SUPPORTED 1
|
||||
#endif
|
||||
|
||||
//==============================================================================
|
||||
#ifndef _MSC_VER
|
||||
#define __cdecl
|
||||
#endif
|
||||
|
|
@ -1154,26 +1137,26 @@ public:
|
|||
{
|
||||
switch (type)
|
||||
{
|
||||
case AudioChannelSet::ChannelType::left: return kSpeakerL;
|
||||
case AudioChannelSet::ChannelType::right: return kSpeakerR;
|
||||
case AudioChannelSet::ChannelType::centre: return kSpeakerC;
|
||||
case AudioChannelSet::ChannelType::subbass: return kSpeakerLfe;
|
||||
case AudioChannelSet::ChannelType::surroundLeft: return kSpeakerLs;
|
||||
case AudioChannelSet::ChannelType::surroundRight: return kSpeakerRs;
|
||||
case AudioChannelSet::ChannelType::centreLeft: return kSpeakerLc;
|
||||
case AudioChannelSet::ChannelType::centreRight: return kSpeakerRc;
|
||||
case AudioChannelSet::ChannelType::surround: return kSpeakerS;
|
||||
case AudioChannelSet::ChannelType::sideLeft: return kSpeakerSl;
|
||||
case AudioChannelSet::ChannelType::sideRight: return kSpeakerSr;
|
||||
case AudioChannelSet::ChannelType::topMiddle: return kSpeakerTm;
|
||||
case AudioChannelSet::ChannelType::topFrontLeft: return kSpeakerTfl;
|
||||
case AudioChannelSet::ChannelType::topFrontCentre: return kSpeakerTfc;
|
||||
case AudioChannelSet::ChannelType::topFrontRight: return kSpeakerTfr;
|
||||
case AudioChannelSet::ChannelType::topRearLeft: return kSpeakerTrl;
|
||||
case AudioChannelSet::ChannelType::topRearCentre: return kSpeakerTrc;
|
||||
case AudioChannelSet::ChannelType::topRearRight: return kSpeakerTrr;
|
||||
case AudioChannelSet::ChannelType::subbass2: return kSpeakerLfe2;
|
||||
default: break;
|
||||
case AudioChannelSet::ChannelType::left: return kSpeakerL;
|
||||
case AudioChannelSet::ChannelType::right: return kSpeakerR;
|
||||
case AudioChannelSet::ChannelType::centre: return kSpeakerC;
|
||||
case AudioChannelSet::ChannelType::subbass: return kSpeakerLfe;
|
||||
case AudioChannelSet::ChannelType::surroundLeft: return kSpeakerLs;
|
||||
case AudioChannelSet::ChannelType::surroundRight: return kSpeakerRs;
|
||||
case AudioChannelSet::ChannelType::centreLeft: return kSpeakerLc;
|
||||
case AudioChannelSet::ChannelType::centreRight: return kSpeakerRc;
|
||||
case AudioChannelSet::ChannelType::surround: return kSpeakerS;
|
||||
case AudioChannelSet::ChannelType::sideLeft: return kSpeakerSl;
|
||||
case AudioChannelSet::ChannelType::sideRight: return kSpeakerSr;
|
||||
case AudioChannelSet::ChannelType::topMiddle: return kSpeakerTm;
|
||||
case AudioChannelSet::ChannelType::topFrontLeft: return kSpeakerTfl;
|
||||
case AudioChannelSet::ChannelType::topFrontCentre: return kSpeakerTfc;
|
||||
case AudioChannelSet::ChannelType::topFrontRight: return kSpeakerTfr;
|
||||
case AudioChannelSet::ChannelType::topRearLeft: return kSpeakerTrl;
|
||||
case AudioChannelSet::ChannelType::topRearCentre: return kSpeakerTrc;
|
||||
case AudioChannelSet::ChannelType::topRearRight: return kSpeakerTrr;
|
||||
case AudioChannelSet::ChannelType::subbass2: return kSpeakerLfe2;
|
||||
default: break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -1183,26 +1166,26 @@ public:
|
|||
{
|
||||
switch (type)
|
||||
{
|
||||
case kSpeakerL: return AudioChannelSet::ChannelType::left;
|
||||
case kSpeakerR: return AudioChannelSet::ChannelType::right;
|
||||
case kSpeakerC: return AudioChannelSet::ChannelType::centre;
|
||||
case kSpeakerLfe: return AudioChannelSet::ChannelType::subbass;
|
||||
case kSpeakerLs: return AudioChannelSet::ChannelType::surroundLeft;
|
||||
case kSpeakerRs: return AudioChannelSet::ChannelType::surroundRight;
|
||||
case kSpeakerLc: return AudioChannelSet::ChannelType::centreLeft;
|
||||
case kSpeakerRc: return AudioChannelSet::ChannelType::centreRight;
|
||||
case kSpeakerS: return AudioChannelSet::ChannelType::surround;
|
||||
case kSpeakerSl: return AudioChannelSet::ChannelType::sideLeft;
|
||||
case kSpeakerSr: return AudioChannelSet::ChannelType::sideRight;
|
||||
case kSpeakerTm: return AudioChannelSet::ChannelType::topMiddle;
|
||||
case kSpeakerTfl: return AudioChannelSet::ChannelType::topFrontLeft;
|
||||
case kSpeakerTfc: return AudioChannelSet::ChannelType::topFrontCentre;
|
||||
case kSpeakerTfr: return AudioChannelSet::ChannelType::topFrontRight;
|
||||
case kSpeakerTrl: return AudioChannelSet::ChannelType::topRearLeft;
|
||||
case kSpeakerTrc: return AudioChannelSet::ChannelType::topRearCentre;
|
||||
case kSpeakerTrr: return AudioChannelSet::ChannelType::topRearRight;
|
||||
case kSpeakerLfe2: return AudioChannelSet::ChannelType::subbass2;
|
||||
default: break;
|
||||
case kSpeakerL: return AudioChannelSet::ChannelType::left;
|
||||
case kSpeakerR: return AudioChannelSet::ChannelType::right;
|
||||
case kSpeakerC: return AudioChannelSet::ChannelType::centre;
|
||||
case kSpeakerLfe: return AudioChannelSet::ChannelType::subbass;
|
||||
case kSpeakerLs: return AudioChannelSet::ChannelType::surroundLeft;
|
||||
case kSpeakerRs: return AudioChannelSet::ChannelType::surroundRight;
|
||||
case kSpeakerLc: return AudioChannelSet::ChannelType::centreLeft;
|
||||
case kSpeakerRc: return AudioChannelSet::ChannelType::centreRight;
|
||||
case kSpeakerS: return AudioChannelSet::ChannelType::surround;
|
||||
case kSpeakerSl: return AudioChannelSet::ChannelType::sideLeft;
|
||||
case kSpeakerSr: return AudioChannelSet::ChannelType::sideRight;
|
||||
case kSpeakerTm: return AudioChannelSet::ChannelType::topMiddle;
|
||||
case kSpeakerTfl: return AudioChannelSet::ChannelType::topFrontLeft;
|
||||
case kSpeakerTfc: return AudioChannelSet::ChannelType::topFrontCentre;
|
||||
case kSpeakerTfr: return AudioChannelSet::ChannelType::topFrontRight;
|
||||
case kSpeakerTrl: return AudioChannelSet::ChannelType::topRearLeft;
|
||||
case kSpeakerTrc: return AudioChannelSet::ChannelType::topRearCentre;
|
||||
case kSpeakerTrr: return AudioChannelSet::ChannelType::topRearRight;
|
||||
case kSpeakerLfe2: return AudioChannelSet::ChannelType::subbass2;
|
||||
default: break;
|
||||
}
|
||||
|
||||
return AudioChannelSet::ChannelType::unknown;
|
||||
|
|
@ -1706,17 +1689,11 @@ private:
|
|||
{
|
||||
MessageManager::getInstance()->setCurrentThreadAsMessageThread();
|
||||
|
||||
class MessageThreadCallback : public CallbackMessage
|
||||
struct MessageThreadCallback : public CallbackMessage
|
||||
{
|
||||
public:
|
||||
MessageThreadCallback (bool& tr) : triggered (tr) {}
|
||||
void messageCallback() override { triggered = true; }
|
||||
|
||||
void messageCallback() override
|
||||
{
|
||||
triggered = true;
|
||||
}
|
||||
|
||||
private:
|
||||
bool& triggered;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -22,12 +22,8 @@
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
#include "../../juce_core/native/juce_mac_ClangBugWorkaround.h"
|
||||
|
||||
#if JucePlugin_Build_VST || JucePlugin_Build_VST3
|
||||
|
||||
|
|
|
|||
|
|
@ -22,14 +22,11 @@
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
|
||||
//==============================================================================
|
||||
#if JucePlugin_Build_VST3 && (__APPLE_CPP__ || __APPLE_CC__ || _WIN32 || _WIN64)
|
||||
|
||||
#include "../../juce_core/native/juce_mac_ClangBugWorkaround.h"
|
||||
#include "../../juce_audio_processors/format_types/juce_VST3Headers.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
#include "../utility/juce_IncludeModuleHeaders.h"
|
||||
|
|
|
|||
|
|
@ -50,16 +50,23 @@
|
|||
#define JUCE_SUPPORT_CARBON 1
|
||||
#endif
|
||||
|
||||
#define Point CarbonDummyPointName
|
||||
|
||||
#if JUCE_SUPPORT_CARBON
|
||||
#define Point CarbonDummyPointName
|
||||
#define Component CarbonDummyCompName
|
||||
#include <Cocoa/Cocoa.h>
|
||||
#include <Carbon/Carbon.h>
|
||||
#undef Point
|
||||
#undef Component
|
||||
#else
|
||||
#endif
|
||||
|
||||
#ifdef __OBJC__
|
||||
#include <Cocoa/Cocoa.h>
|
||||
#endif
|
||||
|
||||
#if JUCE_SUPPORT_CARBON
|
||||
#include <Carbon/Carbon.h>
|
||||
#undef Component
|
||||
#endif
|
||||
|
||||
#undef Point
|
||||
|
||||
#include <objc/runtime.h>
|
||||
#include <objc/objc.h>
|
||||
#include <objc/message.h>
|
||||
|
|
|
|||
|
|
@ -26,10 +26,7 @@
|
|||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
// Your project must contain an AppConfig.h file with your project-specific settings in it,
|
||||
// and your header search path must make it accessible to the module's files.
|
||||
#include "AppConfig.h"
|
||||
|
||||
#include "../../juce_core/system/juce_TargetPlatform.h"
|
||||
#include "../utility/juce_CheckSettingMacros.h"
|
||||
#include "juce_IncludeModuleHeaders.h"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue