Skip to content

Upgrade compatibility with JUCE 6 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Laimonade wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade compatibility with JUCE 6 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
227 changes: 65 additions & 162 deletions JuceLibraryCode/AppConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,17 @@

// [END_USER_CODE_SECTION]

#include "JucePluginDefines.h"

/*
==============================================================================

In accordance with the terms of the JUCE 5 End-Use License Agreement, the
In accordance with the terms of the JUCE 6 End-Use License Agreement, the
JUCE Code in SECTION A cannot be removed, changed or otherwise rendered
ineffective unless you have a JUCE Indie or Pro license, or are using JUCE
under the GPL v3 license.

End User License Agreement: www.juce.com/juce-5-licence
End User License Agreement: www.juce.com/juce-6-licence

==============================================================================
*/
Expand All @@ -39,14 +41,12 @@
#define JUCE_DISPLAY_SPLASH_SCREEN 1
#endif

#ifndef JUCE_REPORT_APP_USAGE
#define JUCE_REPORT_APP_USAGE 1
#endif

// END SECTION A

#define JUCE_USE_DARK_SPLASH_SCREEN 1

#define JUCE_PROJUCER_VERSION 0x60100

//==============================================================================
#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1
#define JUCE_MODULE_AVAILABLE_juce_audio_devices 1
Expand All @@ -69,6 +69,10 @@
//==============================================================================
// juce_audio_devices flags:

#ifndef JUCE_USE_WINRT_MIDI
//#define JUCE_USE_WINRT_MIDI 0
#endif

#ifndef JUCE_ASIO
//#define JUCE_ASIO 0
#endif
Expand All @@ -77,10 +81,6 @@
//#define JUCE_WASAPI 1
#endif

#ifndef JUCE_WASAPI_EXCLUSIVE
//#define JUCE_WASAPI_EXCLUSIVE 0
#endif

#ifndef JUCE_DIRECTSOUND
//#define JUCE_DIRECTSOUND 1
#endif
Expand All @@ -98,15 +98,15 @@
#endif

#ifndef JUCE_USE_ANDROID_OBOE
//#define JUCE_USE_ANDROID_OBOE 0
//#define JUCE_USE_ANDROID_OBOE 1
#endif

#ifndef JUCE_USE_ANDROID_OPENSLES
//#define JUCE_USE_ANDROID_OPENSLES 0
#ifndef JUCE_USE_OBOE_STABILIZED_CALLBACK
//#define JUCE_USE_OBOE_STABILIZED_CALLBACK 0
#endif

#ifndef JUCE_USE_WINRT_MIDI
//#define JUCE_USE_WINRT_MIDI 0
#ifndef JUCE_USE_ANDROID_OPENSLES
//#define JUCE_USE_ANDROID_OPENSLES 0
#endif

#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS
Expand Down Expand Up @@ -139,6 +139,10 @@
//==============================================================================
// juce_audio_plugin_client flags:

#ifndef JUCE_VST3_CAN_REPLACE_VST2
//#define JUCE_VST3_CAN_REPLACE_VST2 1
#endif

#ifndef JUCE_FORCE_USE_LEGACY_PARAM_IDS
//#define JUCE_FORCE_USE_LEGACY_PARAM_IDS 0
#endif
Expand All @@ -151,6 +155,10 @@
//#define JUCE_USE_STUDIO_ONE_COMPATIBLE_PARAMETERS 1
#endif

#ifndef JUCE_AU_WRAPPERS_SAVE_PROGRAM_STATES
//#define JUCE_AU_WRAPPERS_SAVE_PROGRAM_STATES 0
#endif

#ifndef JUCE_STANDALONE_FILTER_WINDOW_USE_KIOSK_MODE
//#define JUCE_STANDALONE_FILTER_WINDOW_USE_KIOSK_MODE 0
#endif
Expand All @@ -170,6 +178,14 @@
//#define JUCE_PLUGINHOST_AU 0
#endif

#ifndef JUCE_PLUGINHOST_LADSPA
//#define JUCE_PLUGINHOST_LADSPA 0
#endif

#ifndef JUCE_CUSTOM_VST3_SDK
//#define JUCE_CUSTOM_VST3_SDK 0
#endif

//==============================================================================
// juce_audio_utils flags:

Expand Down Expand Up @@ -205,22 +221,34 @@
#endif

#ifndef JUCE_USE_CURL
//#define JUCE_USE_CURL 0
//#define JUCE_USE_CURL 1
#endif

#ifndef JUCE_LOAD_CURL_SYMBOLS_LAZILY
//#define JUCE_LOAD_CURL_SYMBOLS_LAZILY 0
#endif

#ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS
//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 1
//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0
#endif

#ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES
//#define JUCE_ALLOW_STATIC_NULL_VARIABLES 1
//#define JUCE_ALLOW_STATIC_NULL_VARIABLES 0
#endif

#ifndef JUCE_STRICT_REFCOUNTEDPOINTER
//#define JUCE_STRICT_REFCOUNTEDPOINTER 0
#endif

#ifndef JUCE_ENABLE_ALLOCATION_HOOKS
//#define JUCE_ENABLE_ALLOCATION_HOOKS 0
#endif

//==============================================================================
// juce_events flags:

#ifndef JUCE_EXECUTE_APP_SUSPEND_ON_IOS_BACKGROUND_TASK
//#define JUCE_EXECUTE_APP_SUSPEND_ON_IOS_BACKGROUND_TASK 0
#ifndef JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK
//#define JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK 0
#endif

//==============================================================================
Expand All @@ -234,6 +262,10 @@
//#define JUCE_USE_DIRECTWRITE 1
#endif

#ifndef JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING
//#define JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING 0
#endif

//==============================================================================
// juce_gui_basics flags:

Expand Down Expand Up @@ -261,13 +293,21 @@
//#define JUCE_USE_XCURSOR 1
#endif

#ifndef JUCE_WIN_PER_MONITOR_DPI_AWARE
//#define JUCE_WIN_PER_MONITOR_DPI_AWARE 1
#endif

//==============================================================================
// juce_gui_extra flags:

#ifndef JUCE_WEB_BROWSER
//#define JUCE_WEB_BROWSER 1
#endif

#ifndef JUCE_USE_WIN_WEBVIEW2
//#define JUCE_USE_WIN_WEBVIEW2 0
#endif

#ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR
//#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR 0
#endif
Expand All @@ -278,6 +318,11 @@
#ifndef JUCE_USE_CAMERA
//#define JUCE_USE_CAMERA 0
#endif

#ifndef JUCE_SYNC_VIDEO_VOLUME_WITH_OS_MEDIA_VOLUME
//#define JUCE_SYNC_VIDEO_VOLUME_WITH_OS_MEDIA_VOLUME 1
#endif

//==============================================================================
#ifndef JUCE_STANDALONE_APPLICATION
#if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone)
Expand All @@ -286,145 +331,3 @@
#define JUCE_STANDALONE_APPLICATION 0
#endif
#endif

//==============================================================================
// Audio plugin settings..

#ifndef JucePlugin_Build_VST
#define JucePlugin_Build_VST 1
#endif
#ifndef JucePlugin_Build_VST3
#define JucePlugin_Build_VST3 0
#endif
#ifndef JucePlugin_Build_AU
#define JucePlugin_Build_AU 0
#endif
#ifndef JucePlugin_Build_AUv3
#define JucePlugin_Build_AUv3 0
#endif
#ifndef JucePlugin_Build_RTAS
#define JucePlugin_Build_RTAS 0
#endif
#ifndef JucePlugin_Build_AAX
#define JucePlugin_Build_AAX 0
#endif
#ifndef JucePlugin_Build_Standalone
#define JucePlugin_Build_Standalone 1
#endif
#ifndef JucePlugin_Enable_IAA
#define JucePlugin_Enable_IAA 0
#endif
#ifndef JucePlugin_Name
#define JucePlugin_Name "NeuralWavetable"
#endif
#ifndef JucePlugin_Desc
#define JucePlugin_Desc "NeuralWavetable"
#endif
#ifndef JucePlugin_Manufacturer
#define JucePlugin_Manufacturer "Georgia Tech Center for Music Technology"
#endif
#ifndef JucePlugin_ManufacturerWebsite
#define JucePlugin_ManufacturerWebsite ""
#endif
#ifndef JucePlugin_ManufacturerEmail
#define JucePlugin_ManufacturerEmail ""
#endif
#ifndef JucePlugin_ManufacturerCode
#define JucePlugin_ManufacturerCode 0x4d616e75 // 'Manu'
#endif
#ifndef JucePlugin_PluginCode
#define JucePlugin_PluginCode 0x546b7868 // 'Tkxh'
#endif
#ifndef JucePlugin_IsSynth
#define JucePlugin_IsSynth 0
#endif
#ifndef JucePlugin_WantsMidiInput
#define JucePlugin_WantsMidiInput 1
#endif
#ifndef JucePlugin_ProducesMidiOutput
#define JucePlugin_ProducesMidiOutput 1
#endif
#ifndef JucePlugin_IsMidiEffect
#define JucePlugin_IsMidiEffect 0
#endif
#ifndef JucePlugin_EditorRequiresKeyboardFocus
#define JucePlugin_EditorRequiresKeyboardFocus 0
#endif
#ifndef JucePlugin_Version
#define JucePlugin_Version 1.0.0
#endif
#ifndef JucePlugin_VersionCode
#define JucePlugin_VersionCode 0x10000
#endif
#ifndef JucePlugin_VersionString
#define JucePlugin_VersionString "1.0.0"
#endif
#ifndef JucePlugin_VSTUniqueID
#define JucePlugin_VSTUniqueID JucePlugin_PluginCode
#endif
#ifndef JucePlugin_VSTCategory
#define JucePlugin_VSTCategory kPlugCategEffect
#endif
#ifndef JucePlugin_Vst3Category
#define JucePlugin_Vst3Category "Fx"
#endif
#ifndef JucePlugin_AUMainType
#define JucePlugin_AUMainType 'aumf'
#endif
#ifndef JucePlugin_AUSubType
#define JucePlugin_AUSubType JucePlugin_PluginCode
#endif
#ifndef JucePlugin_AUExportPrefix
#define JucePlugin_AUExportPrefix NeuralWavetableAU
#endif
#ifndef JucePlugin_AUExportPrefixQuoted
#define JucePlugin_AUExportPrefixQuoted "NeuralWavetableAU"
#endif
#ifndef JucePlugin_AUManufacturerCode
#define JucePlugin_AUManufacturerCode JucePlugin_ManufacturerCode
#endif
#ifndef JucePlugin_CFBundleIdentifier
#define JucePlugin_CFBundleIdentifier com.yourcompany.NeuralWavetable
#endif
#ifndef JucePlugin_RTASCategory
#define JucePlugin_RTASCategory 0
#endif
#ifndef JucePlugin_RTASManufacturerCode
#define JucePlugin_RTASManufacturerCode JucePlugin_ManufacturerCode
#endif
#ifndef JucePlugin_RTASProductId
#define JucePlugin_RTASProductId JucePlugin_PluginCode
#endif
#ifndef JucePlugin_RTASDisableBypass
#define JucePlugin_RTASDisableBypass 0
#endif
#ifndef JucePlugin_RTASDisableMultiMono
#define JucePlugin_RTASDisableMultiMono 0
#endif
#ifndef JucePlugin_AAXIdentifier
#define JucePlugin_AAXIdentifier com.yourcompany.NeuralWavetable
#endif
#ifndef JucePlugin_AAXManufacturerCode
#define JucePlugin_AAXManufacturerCode JucePlugin_ManufacturerCode
#endif
#ifndef JucePlugin_AAXProductId
#define JucePlugin_AAXProductId JucePlugin_PluginCode
#endif
#ifndef JucePlugin_AAXCategory
#define JucePlugin_AAXCategory 0
#endif
#ifndef JucePlugin_AAXDisableBypass
#define JucePlugin_AAXDisableBypass 0
#endif
#ifndef JucePlugin_AAXDisableMultiMono
#define JucePlugin_AAXDisableMultiMono 0
#endif
#ifndef JucePlugin_IAAType
#define JucePlugin_IAAType 0x6175726d // 'aurm'
#endif
#ifndef JucePlugin_IAASubType
#define JucePlugin_IAASubType JucePlugin_PluginCode
#endif
#ifndef JucePlugin_IAAName
#define JucePlugin_IAAName "Georgia Tech Center for Music Technology: NeuralWavetable"
#endif
10 changes: 10 additions & 0 deletions JuceLibraryCode/JuceHeader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@
#include <juce_video/juce_video.h>


#if defined (JUCE_PROJUCER_VERSION) && JUCE_PROJUCER_VERSION < JUCE_VERSION
/** If you've hit this error then the version of the Projucer that was used to generate this project is
older than the version of the JUCE modules being included. To fix this error, re-save your project
using the latest version of the Projucer or, if you aren't using the Projucer to manage your project,
remove the JUCE_PROJUCER_VERSION define.
*/
#error "This project was last saved using an outdated version of the Projucer! Re-save this project with the latest version to fix this error."
#endif

#if ! DONT_SET_USING_JUCE_NAMESPACE
// If your code uses a lot of JUCE classes, then this will obviously save you
// a lot of typing, but can be disabled by setting DONT_SET_USING_JUCE_NAMESPACE.
Expand All @@ -41,6 +50,7 @@
namespace ProjectInfo
{
const char* const projectName = "NeuralWavetable";
const char* const companyName = "";
const char* const versionString = "1.0.0";
const int versionNumber = 0x10000;
}
Expand Down
Loading