diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.cpp b/extras/Projucer/JuceLibraryCode/BinaryData.cpp index 8302712c25..669eec2f3d 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.cpp +++ b/extras/Projucer/JuceLibraryCode/BinaryData.cpp @@ -5335,18 +5335,18 @@ static const unsigned char temp_binary_data_24[] = "\r\n" "#pragma once\r\n" "\r\n" -"INCLUDE_JUCE\r\n" +"%%include_juce%%\r\n" "\r\n" "//==============================================================================\r\n" "/*\r\n" " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class CONTENTCOMPCLASS : public AnimatedAppComponent\r\n" +"class %%content_component_class%% : public AnimatedAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" CONTENTCOMPCLASS()\r\n" +" %%content_component_class%%()\r\n" " {\r\n" " // Make sure you set the size of the component after\r\n" " // you add any child components.\r\n" @@ -5354,7 +5354,7 @@ static const unsigned char temp_binary_data_24[] = " setFramesPerSecond (60); // This sets the frequency of the update calls.\r\n" " }\r\n" "\r\n" -" ~CONTENTCOMPCLASS()\r\n" +" ~%%content_component_class%%()\r\n" " {\r\n" " }\r\n" "\r\n" @@ -5387,7 +5387,7 @@ static const unsigned char temp_binary_data_24[] = " // Your private member variables go here...\r\n" "\r\n" "\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%)\r\n" "};\r\n"; const char* jucer_AnimatedComponentSimpleTemplate_h = (const char*) temp_binary_data_24; @@ -5402,10 +5402,10 @@ static const unsigned char temp_binary_data_25[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"INCLUDE_CORRESPONDING_HEADER\r\n" +"%%include_corresponding_header%%\r\n" "\r\n" "//==============================================================================\r\n" -"CONTENTCOMPCLASS::CONTENTCOMPCLASS()\r\n" +"%%content_component_class%%::%%content_component_class%%()\r\n" "{\r\n" " // Make sure you set the size of the component after\r\n" " // you add any child components.\r\n" @@ -5413,19 +5413,19 @@ static const unsigned char temp_binary_data_25[] = " setFramesPerSecond (60); // This sets the frequency of the update calls.\r\n" "}\r\n" "\r\n" -"CONTENTCOMPCLASS::~CONTENTCOMPCLASS()\r\n" +"%%content_component_class%%::~%%content_component_class%%()\r\n" "{\r\n" "}\r\n" "\r\n" "//==============================================================================\r\n" -"void CONTENTCOMPCLASS::update()\r\n" +"void %%content_component_class%%::update()\r\n" "{\r\n" " // This function is called at the frequency specified by the setFramesPerSecond() call\r\n" " // in the constructor. You can use it to update counters, animate values, etc.\r\n" "}\r\n" "\r\n" "//==============================================================================\r\n" -"void CONTENTCOMPCLASS::paint (Graphics& g)\r\n" +"void %%content_component_class%%::paint (Graphics& g)\r\n" "{\r\n" " // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n" " g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));\r\n" @@ -5433,7 +5433,7 @@ static const unsigned char temp_binary_data_25[] = " // You can add your drawing code here!\r\n" "}\r\n" "\r\n" -"void CONTENTCOMPCLASS::resized()\r\n" +"void %%content_component_class%%::resized()\r\n" "{\r\n" " // This is called when the MainContentComponent is resized.\r\n" " // If you add any child components, this is where you should\r\n" @@ -5454,19 +5454,19 @@ static const unsigned char temp_binary_data_26[] = "\r\n" "#pragma once\r\n" "\r\n" -"INCLUDE_JUCE\r\n" +"%%include_juce%%\r\n" "\r\n" "//==============================================================================\r\n" "/*\r\n" " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class CONTENTCOMPCLASS : public AnimatedAppComponent\r\n" +"class %%content_component_class%% : public AnimatedAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" CONTENTCOMPCLASS();\r\n" -" ~CONTENTCOMPCLASS();\r\n" +" %%content_component_class%%();\r\n" +" ~%%content_component_class%%();\r\n" "\r\n" " //==============================================================================\r\n" " void update() override;\r\n" @@ -5480,7 +5480,7 @@ static const unsigned char temp_binary_data_26[] = " // Your private member variables go here...\r\n" "\r\n" "\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%)\r\n" "};\r\n"; const char* jucer_AnimatedComponentTemplate_h = (const char*) temp_binary_data_26; @@ -5497,18 +5497,18 @@ static const unsigned char temp_binary_data_27[] = "\r\n" "#pragma once\r\n" "\r\n" -"INCLUDE_JUCE\r\n" +"%%include_juce%%\r\n" "\r\n" "//==============================================================================\r\n" "/*\r\n" " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class CONTENTCOMPCLASS : public AudioAppComponent\r\n" +"class %%content_component_class%% : public AudioAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" CONTENTCOMPCLASS()\r\n" +" %%content_component_class%%()\r\n" " {\r\n" " // Make sure you set the size of the component after\r\n" " // you add any child components.\r\n" @@ -5518,7 +5518,7 @@ static const unsigned char temp_binary_data_27[] = " setAudioChannels (2, 2);\r\n" " }\r\n" "\r\n" -" ~CONTENTCOMPCLASS()\r\n" +" ~%%content_component_class%%()\r\n" " {\r\n" " // This shuts down the audio device and clears the audio source.\r\n" " shutdownAudio();\r\n" @@ -5577,7 +5577,7 @@ static const unsigned char temp_binary_data_27[] = " // Your private member variables go here...\r\n" "\r\n" "\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%)\r\n" "};\r\n"; const char* jucer_AudioComponentSimpleTemplate_h = (const char*) temp_binary_data_27; @@ -5592,10 +5592,10 @@ static const unsigned char temp_binary_data_28[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"INCLUDE_CORRESPONDING_HEADER\r\n" +"%%include_corresponding_header%%\r\n" "\r\n" "//==============================================================================\r\n" -"CONTENTCOMPCLASS::CONTENTCOMPCLASS()\r\n" +"%%content_component_class%%::%%content_component_class%%()\r\n" "{\r\n" " // Make sure you set the size of the component after\r\n" " // you add any child components.\r\n" @@ -5605,14 +5605,14 @@ static const unsigned char temp_binary_data_28[] = " setAudioChannels (2, 2);\r\n" "}\r\n" "\r\n" -"CONTENTCOMPCLASS::~CONTENTCOMPCLASS()\r\n" +"%%content_component_class%%::~%%content_component_class%%()\r\n" "{\r\n" " // This shuts down the audio device and clears the audio source.\r\n" " shutdownAudio();\r\n" "}\r\n" "\r\n" "//==============================================================================\r\n" -"void CONTENTCOMPCLASS::prepareToPlay (int samplesPerBlockExpected, double sampleRate)\r\n" +"void %%content_component_class%%::prepareToPlay (int samplesPerBlockExpected, double sampleRate)\r\n" "{\r\n" " // This function will be called when the audio device is started, or when\r\n" " // its settings (i.e. sample rate, block size, etc) are changed.\r\n" @@ -5623,7 +5623,7 @@ static const unsigned char temp_binary_data_28[] = " // For more details, see the help for AudioProcessor::prepareToPlay()\r\n" "}\r\n" "\r\n" -"void CONTENTCOMPCLASS::getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill)\r\n" +"void %%content_component_class%%::getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill)\r\n" "{\r\n" " // Your audio-processing code goes here!\r\n" "\r\n" @@ -5634,7 +5634,7 @@ static const unsigned char temp_binary_data_28[] = " bufferToFill.clearActiveBufferRegion();\r\n" "}\r\n" "\r\n" -"void CONTENTCOMPCLASS::releaseResources()\r\n" +"void %%content_component_class%%::releaseResources()\r\n" "{\r\n" " // This will be called when the audio device stops, or when it is being\r\n" " // restarted due to a setting change.\r\n" @@ -5643,7 +5643,7 @@ static const unsigned char temp_binary_data_28[] = "}\r\n" "\r\n" "//==============================================================================\r\n" -"void CONTENTCOMPCLASS::paint (Graphics& g)\r\n" +"void %%content_component_class%%::paint (Graphics& g)\r\n" "{\r\n" " // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n" " g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));\r\n" @@ -5651,7 +5651,7 @@ static const unsigned char temp_binary_data_28[] = " // You can add your drawing code here!\r\n" "}\r\n" "\r\n" -"void CONTENTCOMPCLASS::resized()\r\n" +"void %%content_component_class%%::resized()\r\n" "{\r\n" " // This is called when the MainContentComponent is resized.\r\n" " // If you add any child components, this is where you should\r\n" @@ -5672,19 +5672,19 @@ static const unsigned char temp_binary_data_29[] = "\r\n" "#pragma once\r\n" "\r\n" -"INCLUDE_JUCE\r\n" +"%%include_juce%%\r\n" "\r\n" "//==============================================================================\r\n" "/*\r\n" " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class CONTENTCOMPCLASS : public AudioAppComponent\r\n" +"class %%content_component_class%% : public AudioAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" CONTENTCOMPCLASS();\r\n" -" ~CONTENTCOMPCLASS();\r\n" +" %%content_component_class%%();\r\n" +" ~%%content_component_class%%();\r\n" "\r\n" " //==============================================================================\r\n" " void prepareToPlay (int samplesPerBlockExpected, double sampleRate) override;\r\n" @@ -5700,7 +5700,7 @@ static const unsigned char temp_binary_data_29[] = " // Your private member variables go here...\r\n" "\r\n" "\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%)\r\n" "};\r\n"; const char* jucer_AudioComponentTemplate_h = (const char*) temp_binary_data_29; @@ -5717,11 +5717,10 @@ static const unsigned char temp_binary_data_30[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"EDITORCPPHEADERS\r\n" -"\r\n" +"%%editor_cpp_headers%%\r\n" "\r\n" "//==============================================================================\r\n" -"EDITORCLASSNAME::EDITORCLASSNAME (FILTERCLASSNAME& p)\r\n" +"%%editor_class_name%%::%%editor_class_name%% (%%filter_class_name%%& p)\r\n" " : AudioProcessorEditor (&p), processor (p)\r\n" "{\r\n" " // Make sure that before the constructor has finished, you've set the\r\n" @@ -5729,12 +5728,12 @@ static const unsigned char temp_binary_data_30[] = " setSize (400, 300);\r\n" "}\r\n" "\r\n" -"EDITORCLASSNAME::~EDITORCLASSNAME()\r\n" +"%%editor_class_name%%::~%%editor_class_name%%()\r\n" "{\r\n" "}\r\n" "\r\n" "//==============================================================================\r\n" -"void EDITORCLASSNAME::paint (Graphics& g)\r\n" +"void %%editor_class_name%%::paint (Graphics& g)\r\n" "{\r\n" " // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n" " g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));\r\n" @@ -5744,7 +5743,7 @@ static const unsigned char temp_binary_data_30[] = " g.drawFittedText (\"Hello World!\", getLocalBounds(), Justification::centred, 1);\r\n" "}\r\n" "\r\n" -"void EDITORCLASSNAME::resized()\r\n" +"void %%editor_class_name%%::resized()\r\n" "{\r\n" " // This is generally where you'll want to lay out the positions of any\r\n" " // subcomponents in your editor..\r\n" @@ -5766,17 +5765,16 @@ static const unsigned char temp_binary_data_31[] = "\r\n" "#pragma once\r\n" "\r\n" -"EDITORHEADERS\r\n" -"\r\n" +"%%editor_headers%%\r\n" "\r\n" "//==============================================================================\r\n" "/**\r\n" "*/\r\n" -"class EDITORCLASSNAME : public AudioProcessorEditor\r\n" +"class %%editor_class_name%% : public AudioProcessorEditor\r\n" "{\r\n" "public:\r\n" -" EDITORCLASSNAME (FILTERCLASSNAME&);\r\n" -" ~EDITORCLASSNAME();\r\n" +" %%editor_class_name%% (%%filter_class_name%%&);\r\n" +" ~%%editor_class_name%%();\r\n" "\r\n" " //==============================================================================\r\n" " void paint (Graphics&) override;\r\n" @@ -5785,9 +5783,9 @@ static const unsigned char temp_binary_data_31[] = "private:\r\n" " // This reference is provided as a quick way for your editor to\r\n" " // access the processor object that created it.\r\n" -" FILTERCLASSNAME& processor;\r\n" +" %%filter_class_name%%& processor;\r\n" "\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (EDITORCLASSNAME)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%editor_class_name%%)\r\n" "};\r\n"; const char* jucer_AudioPluginEditorTemplate_h = (const char*) temp_binary_data_31; @@ -5804,11 +5802,10 @@ static const unsigned char temp_binary_data_32[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"FILTERHEADERS\r\n" -"\r\n" +"%%filter_headers%%\r\n" "\r\n" "//==============================================================================\r\n" -"FILTERCLASSNAME::FILTERCLASSNAME()\r\n" +"%%filter_class_name%%::%%filter_class_name%%()\r\n" "#ifndef JucePlugin_PreferredChannelConfigurations\r\n" " : AudioProcessor (BusesProperties()\r\n" " #if ! JucePlugin_IsMidiEffect\r\n" @@ -5822,17 +5819,17 @@ static const unsigned char temp_binary_data_32[] = "{\r\n" "}\r\n" "\r\n" -"FILTERCLASSNAME::~FILTERCLASSNAME()\r\n" +"%%filter_class_name%%::~%%filter_class_name%%()\r\n" "{\r\n" "}\r\n" "\r\n" "//==============================================================================\r\n" -"const String FILTERCLASSNAME::getName() const\r\n" +"const String %%filter_class_name%%::getName() const\r\n" "{\r\n" " return JucePlugin_Name;\r\n" "}\r\n" "\r\n" -"bool FILTERCLASSNAME::acceptsMidi() const\r\n" +"bool %%filter_class_name%%::acceptsMidi() const\r\n" "{\r\n" " #if JucePlugin_WantsMidiInput\r\n" " return true;\r\n" @@ -5841,7 +5838,7 @@ static const unsigned char temp_binary_data_32[] = " #endif\r\n" "}\r\n" "\r\n" -"bool FILTERCLASSNAME::producesMidi() const\r\n" +"bool %%filter_class_name%%::producesMidi() const\r\n" "{\r\n" " #if JucePlugin_ProducesMidiOutput\r\n" " return true;\r\n" @@ -5850,7 +5847,7 @@ static const unsigned char temp_binary_data_32[] = " #endif\r\n" "}\r\n" "\r\n" -"bool FILTERCLASSNAME::isMidiEffect() const\r\n" +"bool %%filter_class_name%%::isMidiEffect() const\r\n" "{\r\n" " #if JucePlugin_IsMidiEffect\r\n" " return true;\r\n" @@ -5859,50 +5856,50 @@ static const unsigned char temp_binary_data_32[] = " #endif\r\n" "}\r\n" "\r\n" -"double FILTERCLASSNAME::getTailLengthSeconds() const\r\n" +"double %%filter_class_name%%::getTailLengthSeconds() const\r\n" "{\r\n" " return 0.0;\r\n" "}\r\n" "\r\n" -"int FILTERCLASSNAME::getNumPrograms()\r\n" +"int %%filter_class_name%%::getNumPrograms()\r\n" "{\r\n" " return 1; // NB: some hosts don't cope very well if you tell them there are 0 programs,\r\n" " // so this should be at least 1, even if you're not really implementing programs.\r\n" "}\r\n" "\r\n" -"int FILTERCLASSNAME::getCurrentProgram()\r\n" +"int %%filter_class_name%%::getCurrentProgram()\r\n" "{\r\n" " return 0;\r\n" "}\r\n" "\r\n" -"void FILTERCLASSNAME::setCurrentProgram (int index)\r\n" +"void %%filter_class_name%%::setCurrentProgram (int index)\r\n" "{\r\n" "}\r\n" "\r\n" -"const String FILTERCLASSNAME::getProgramName (int index)\r\n" +"const String %%filter_class_name%%::getProgramName (int index)\r\n" "{\r\n" " return {};\r\n" "}\r\n" "\r\n" -"void FILTERCLASSNAME::changeProgramName (int index, const String& newName)\r\n" +"void %%filter_class_name%%::changeProgramName (int index, const String& newName)\r\n" "{\r\n" "}\r\n" "\r\n" "//==============================================================================\r\n" -"void FILTERCLASSNAME::prepareToPlay (double sampleRate, int samplesPerBlock)\r\n" +"void %%filter_class_name%%::prepareToPlay (double sampleRate, int samplesPerBlock)\r\n" "{\r\n" " // Use this method as the place to do any pre-playback\r\n" " // initialisation that you need..\r\n" "}\r\n" "\r\n" -"void FILTERCLASSNAME::releaseResources()\r\n" +"void %%filter_class_name%%::releaseResources()\r\n" "{\r\n" " // When playback stops, you can use this as an opportunity to free up any\r\n" " // spare memory, etc.\r\n" "}\r\n" "\r\n" "#ifndef JucePlugin_PreferredChannelConfigurations\r\n" -"bool FILTERCLASSNAME::isBusesLayoutSupported (const BusesLayout& layouts) const\r\n" +"bool %%filter_class_name%%::isBusesLayoutSupported (const BusesLayout& layouts) const\r\n" "{\r\n" " #if JucePlugin_IsMidiEffect\r\n" " ignoreUnused (layouts);\r\n" @@ -5925,7 +5922,7 @@ static const unsigned char temp_binary_data_32[] = "}\r\n" "#endif\r\n" "\r\n" -"void FILTERCLASSNAME::processBlock (AudioBuffer& buffer, MidiBuffer& midiMessages)\r\n" +"void %%filter_class_name%%::processBlock (AudioBuffer& buffer, MidiBuffer& midiMessages)\r\n" "{\r\n" " ScopedNoDenormals noDenormals;\r\n" " auto totalNumInputChannels = getTotalNumInputChannels();\r\n" @@ -5955,25 +5952,25 @@ static const unsigned char temp_binary_data_32[] = "}\r\n" "\r\n" "//==============================================================================\r\n" -"bool FILTERCLASSNAME::hasEditor() const\r\n" +"bool %%filter_class_name%%::hasEditor() const\r\n" "{\r\n" " return true; // (change this to false if you choose to not supply an editor)\r\n" "}\r\n" "\r\n" -"AudioProcessorEditor* FILTERCLASSNAME::createEditor()\r\n" +"AudioProcessorEditor* %%filter_class_name%%::createEditor()\r\n" "{\r\n" -" return new EDITORCLASSNAME (*this);\r\n" +" return new %%editor_class_name%% (*this);\r\n" "}\r\n" "\r\n" "//==============================================================================\r\n" -"void FILTERCLASSNAME::getStateInformation (MemoryBlock& destData)\r\n" +"void %%filter_class_name%%::getStateInformation (MemoryBlock& destData)\r\n" "{\r\n" " // You should use this method to store your parameters in the memory block.\r\n" " // You could do that either as raw data, or use the XML or ValueTree classes\r\n" " // as intermediaries to make it easy to save and load complex data.\r\n" "}\r\n" "\r\n" -"void FILTERCLASSNAME::setStateInformation (const void* data, int sizeInBytes)\r\n" +"void %%filter_class_name%%::setStateInformation (const void* data, int sizeInBytes)\r\n" "{\r\n" " // You should use this method to restore your parameters from this memory block,\r\n" " // whose contents will have been created by the getStateInformation() call.\r\n" @@ -5983,7 +5980,7 @@ static const unsigned char temp_binary_data_32[] = "// This creates new instances of the plugin..\r\n" "AudioProcessor* JUCE_CALLTYPE createPluginFilter()\r\n" "{\r\n" -" return new FILTERCLASSNAME();\r\n" +" return new %%filter_class_name%%();\r\n" "}\r\n"; const char* jucer_AudioPluginFilterTemplate_cpp = (const char*) temp_binary_data_32; @@ -6002,18 +5999,17 @@ static const unsigned char temp_binary_data_33[] = "\r\n" "#pragma once\r\n" "\r\n" -"APPHEADERS\r\n" -"\r\n" +"%%app_headers%%\r\n" "\r\n" "//==============================================================================\r\n" "/**\r\n" "*/\r\n" -"class FILTERCLASSNAME : public AudioProcessor\r\n" +"class %%filter_class_name%% : public AudioProcessor\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" FILTERCLASSNAME();\r\n" -" ~FILTERCLASSNAME();\r\n" +" %%filter_class_name%%();\r\n" +" ~%%filter_class_name%%();\r\n" "\r\n" " //==============================================================================\r\n" " void prepareToPlay (double sampleRate, int samplesPerBlock) override;\r\n" @@ -6050,7 +6046,7 @@ static const unsigned char temp_binary_data_33[] = "\r\n" "private:\r\n" " //==============================================================================\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FILTERCLASSNAME)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%filter_class_name%%)\r\n" "};\r\n"; const char* jucer_AudioPluginFilterTemplate_h = (const char*) temp_binary_data_33; @@ -6079,13 +6075,13 @@ static const unsigned char temp_binary_data_34[] = "//[Headers] You can add your own extra header files here...\r\n" "//[/Headers]\r\n" "\r\n" -"%%includeFilesCPP%%\r\n" +"%%include_files_cpp%%\r\n" "\r\n" "//[MiscUserDefs] You can add your own user definitions and misc code here...\r\n" "//[/MiscUserDefs]\r\n" "\r\n" "//==============================================================================\r\n" -"%%className%%::%%className%% (%%constructorParams%%)\r\n" +"%%class_name%%::%%class_name%% (%%constructor_params%%)\r\n" "%%initialisers%%{\r\n" " //[Constructor_pre] You can add your own custom stuff here..\r\n" " //[/Constructor_pre]\r\n" @@ -6096,7 +6092,7 @@ static const unsigned char temp_binary_data_34[] = " //[/Constructor]\r\n" "}\r\n" "\r\n" -"%%className%%::~%%className%%()\r\n" +"%%class_name%%::~%%class_name%%()\r\n" "{\r\n" " //[Destructor_pre]. You can add your own custom destruction code here..\r\n" " //[/Destructor_pre]\r\n" @@ -6108,7 +6104,7 @@ static const unsigned char temp_binary_data_34[] = "}\r\n" "\r\n" "//==============================================================================\r\n" -"%%methodDefinitions%%\r\n" +"%%method_definitions%%\r\n" "\r\n" "//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...\r\n" "//[/MiscUserCode]\r\n" @@ -6128,7 +6124,7 @@ static const unsigned char temp_binary_data_34[] = "*/\r\n" "#endif\r\n" "\r\n" -"%%staticMemberDefinitions%%\r\n" +"%%static_member_definitions%%\r\n" "//[EndFile] You can add extra defines here...\r\n" "//[/EndFile]\r\n"; @@ -6158,10 +6154,10 @@ static const unsigned char temp_binary_data_35[] = "#pragma once\r\n" "\r\n" "//[Headers] -- You can add your own extra header files here --\r\n" -"%%includeJUCEHeader%%\r\n" +"%%include_juce_header%%\r\n" "//[/Headers]\r\n" "\r\n" -"%%includeFilesH%%\r\n" +"%%include_files_h%%\r\n" "\r\n" "//==============================================================================\r\n" "/**\r\n" @@ -6171,28 +6167,28 @@ static const unsigned char temp_binary_data_35[] = " Describe your class and how it works here!\r\n" " //[/Comments]\r\n" "*/\r\n" -"%%classDeclaration%%\r\n" +"%%class_declaration%%\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" %%className%% (%%constructorParams%%);\r\n" -" ~%%className%%();\r\n" +" %%class_name%% (%%constructor_params%%);\r\n" +" ~%%class_name%%();\r\n" "\r\n" " //==============================================================================\r\n" " //[UserMethods] -- You can add your own custom methods in this section.\r\n" " //[/UserMethods]\r\n" "\r\n" -" %%publicMemberDeclarations%%\r\n" +" %%public_member_declarations%%\r\n" "\r\n" "private:\r\n" " //[UserVariables] -- You can add your own custom variables in this section.\r\n" " //[/UserVariables]\r\n" "\r\n" " //==============================================================================\r\n" -" %%privateMemberDeclarations%%\r\n" +" %%private_member_declarations%%\r\n" "\r\n" " //==============================================================================\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%className%%)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%class_name%%)\r\n" "};\r\n" "\r\n" "//[EndFile] You can add extra defines here...\r\n" @@ -6212,23 +6208,23 @@ static const unsigned char temp_binary_data_36[] = "\r\n" "#pragma once\r\n" "\r\n" -"INCLUDE_JUCE\r\n" +"%%include_juce%%\r\n" "\r\n" "//==============================================================================\r\n" "/*\r\n" " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class CONTENTCOMPCLASS : public Component\r\n" +"class %%content_component_class%% : public Component\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" CONTENTCOMPCLASS()\r\n" +" %%content_component_class%%()\r\n" " {\r\n" " setSize (600, 400);\r\n" " }\r\n" "\r\n" -" ~CONTENTCOMPCLASS()\r\n" +" ~%%content_component_class%%()\r\n" " {\r\n" " }\r\n" "\r\n" @@ -6245,7 +6241,7 @@ static const unsigned char temp_binary_data_36[] = "\r\n" " void resized() override\r\n" " {\r\n" -" // This is called when the CONTENTCOMPCLASS is resized.\r\n" +" // This is called when the %%content_component_class%% is resized.\r\n" " // If you add any child components, this is where you should\r\n" " // update their positions.\r\n" " }\r\n" @@ -6256,7 +6252,7 @@ static const unsigned char temp_binary_data_36[] = " // Your private member variables go here...\r\n" "\r\n" "\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%)\r\n" "};\r\n"; const char* jucer_ContentCompSimpleTemplate_h = (const char*) temp_binary_data_36; @@ -6271,20 +6267,20 @@ static const unsigned char temp_binary_data_37[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"INCLUDE_CORRESPONDING_HEADER\r\n" +"%%include_corresponding_header%%\r\n" "\r\n" "//==============================================================================\r\n" -"CONTENTCOMPCLASS::CONTENTCOMPCLASS()\r\n" +"%%content_component_class%%::%%content_component_class%%()\r\n" "{\r\n" " setSize (600, 400);\r\n" "}\r\n" "\r\n" -"CONTENTCOMPCLASS::~CONTENTCOMPCLASS()\r\n" +"%%content_component_class%%::~%%content_component_class%%()\r\n" "{\r\n" "}\r\n" "\r\n" "//==============================================================================\r\n" -"void CONTENTCOMPCLASS::paint (Graphics& g)\r\n" +"void %%content_component_class%%::paint (Graphics& g)\r\n" "{\r\n" " // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n" " g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));\r\n" @@ -6294,9 +6290,9 @@ static const unsigned char temp_binary_data_37[] = " g.drawText (\"Hello World!\", getLocalBounds(), Justification::centred, true);\r\n" "}\r\n" "\r\n" -"void CONTENTCOMPCLASS::resized()\r\n" +"void %%content_component_class%%::resized()\r\n" "{\r\n" -" // This is called when the CONTENTCOMPCLASS is resized.\r\n" +" // This is called when the %%content_component_class%% is resized.\r\n" " // If you add any child components, this is where you should\r\n" " // update their positions.\r\n" "}\r\n"; @@ -6315,19 +6311,19 @@ static const unsigned char temp_binary_data_38[] = "\r\n" "#pragma once\r\n" "\r\n" -"INCLUDE_JUCE\r\n" +"%%include_juce%%\r\n" "\r\n" "//==============================================================================\r\n" "/*\r\n" " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class CONTENTCOMPCLASS : public Component\r\n" +"class %%content_component_class%% : public Component\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" CONTENTCOMPCLASS();\r\n" -" ~CONTENTCOMPCLASS();\r\n" +" %%content_component_class%%();\r\n" +" ~%%content_component_class%%();\r\n" "\r\n" " //==============================================================================\r\n" " void paint (Graphics&) override;\r\n" @@ -6338,7 +6334,7 @@ static const unsigned char temp_binary_data_38[] = " // Your private member variables go here...\r\n" "\r\n" "\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%)\r\n" "};\r\n"; const char* jucer_ContentCompTemplate_h = (const char*) temp_binary_data_38; @@ -6346,17 +6342,17 @@ const char* jucer_ContentCompTemplate_h = (const char*) temp_binary_data_38; //================== jucer_InlineComponentTemplate.h ================== static const unsigned char temp_binary_data_39[] = "//==============================================================================\r\n" -"class COMPONENTCLASS : public Component\r\n" +"class %%component_class%% : public Component\r\n" "{\r\n" "public:\r\n" -" COMPONENTCLASS()\r\n" +" %%component_class%%()\r\n" " {\r\n" " // In your constructor, you should add any child components, and\r\n" " // initialise any special settings that your component needs.\r\n" "\r\n" " }\r\n" "\r\n" -" ~COMPONENTCLASS()\r\n" +" ~%%component_class%%()\r\n" " {\r\n" " }\r\n" "\r\n" @@ -6371,7 +6367,7 @@ static const unsigned char temp_binary_data_39[] = "\r\n" " g.setColour (Colours::white);\r\n" " g.setFont (14.0f);\r\n" -" g.drawText (\"COMPONENTCLASS\", getLocalBounds(),\r\n" +" g.drawText (\"%%component_class%%\", getLocalBounds(),\r\n" " Justification::centred, true); // draw some placeholder text\r\n" " }\r\n" "\r\n" @@ -6383,7 +6379,7 @@ static const unsigned char temp_binary_data_39[] = " }\r\n" "\r\n" "private:\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%component_class%%)\r\n" "};\r\n"; const char* jucer_InlineComponentTemplate_h = (const char*) temp_binary_data_39; @@ -6400,8 +6396,7 @@ static const unsigned char temp_binary_data_40[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"APPHEADERS\r\n" -"\r\n" +"%%app_headers%%\r\n" "\r\n" "//==============================================================================\r\n" "int main (int argc, char* argv[])\r\n" @@ -6427,19 +6422,18 @@ static const unsigned char temp_binary_data_41[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"APPHEADERS\r\n" -"\r\n" +"%%app_headers%%\r\n" "\r\n" "//==============================================================================\r\n" -"class APPCLASSNAME : public JUCEApplication\r\n" +"class %%app_class_name%% : public JUCEApplication\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" APPCLASSNAME() {}\r\n" +" %%app_class_name%%() {}\r\n" "\r\n" " const String getApplicationName() override { return ProjectInfo::projectName; }\r\n" " const String getApplicationVersion() override { return ProjectInfo::versionString; }\r\n" -" bool moreThanOneInstanceAllowed() override { return ALLOWMORETHANONEINSTANCE; }\r\n" +" bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; }\r\n" "\r\n" " //==============================================================================\r\n" " void initialise (const String& commandLine) override\r\n" @@ -6470,7 +6464,7 @@ static const unsigned char temp_binary_data_41[] = "\r\n" "//==============================================================================\r\n" "// This macro generates the main() routine that launches the app.\r\n" -"START_JUCE_APPLICATION (APPCLASSNAME)\r\n"; +"START_JUCE_APPLICATION (%%app_class_name%%)\r\n"; const char* jucer_MainTemplate_NoWindow_cpp = (const char*) temp_binary_data_41; @@ -6486,18 +6480,18 @@ static const unsigned char temp_binary_data_42[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"APPHEADERS\r\n" +"%%app_headers%%\r\n" "\r\n" "//==============================================================================\r\n" -"class APPCLASSNAME : public JUCEApplication\r\n" +"class %%app_class_name%% : public JUCEApplication\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" APPCLASSNAME() {}\r\n" +" %%app_class_name%%() {}\r\n" "\r\n" " const String getApplicationName() override { return ProjectInfo::projectName; }\r\n" " const String getApplicationVersion() override { return ProjectInfo::versionString; }\r\n" -" bool moreThanOneInstanceAllowed() override { return ALLOWMORETHANONEINSTANCE; }\r\n" +" bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; }\r\n" "\r\n" " //==============================================================================\r\n" " void initialise (const String& commandLine) override\r\n" @@ -6532,7 +6526,7 @@ static const unsigned char temp_binary_data_42[] = " //==============================================================================\r\n" " /*\r\n" " This class implements the desktop window that contains an instance of\r\n" -" our CONTENTCOMPCLASS class.\r\n" +" our %%content_component_class%% class.\r\n" " */\r\n" " class MainWindow : public DocumentWindow\r\n" " {\r\n" @@ -6543,7 +6537,7 @@ static const unsigned char temp_binary_data_42[] = " DocumentWindow::allButtons)\r\n" " {\r\n" " setUsingNativeTitleBar (true);\r\n" -" setContentOwned (new CONTENTCOMPCLASS(), true);\r\n" +" setContentOwned (new %%content_component_class%%(), true);\r\n" " setResizable (true, true);\r\n" "\r\n" " centreWithSize (getWidth(), getHeight());\r\n" @@ -6575,7 +6569,7 @@ static const unsigned char temp_binary_data_42[] = "\r\n" "//==============================================================================\r\n" "// This macro generates the main() routine that launches the app.\r\n" -"START_JUCE_APPLICATION (APPCLASSNAME)\r\n"; +"START_JUCE_APPLICATION (%%app_class_name%%)\r\n"; const char* jucer_MainTemplate_SimpleWindow_cpp = (const char*) temp_binary_data_42; @@ -6591,19 +6585,18 @@ static const unsigned char temp_binary_data_43[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"APPHEADERS\r\n" -"\r\n" +"%%app_headers%%\r\n" "\r\n" "//==============================================================================\r\n" -"class APPCLASSNAME : public JUCEApplication\r\n" +"class %%app_class_name%% : public JUCEApplication\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" APPCLASSNAME() {}\r\n" +" %%app_class_name%%() {}\r\n" "\r\n" " const String getApplicationName() override { return ProjectInfo::projectName; }\r\n" " const String getApplicationVersion() override { return ProjectInfo::versionString; }\r\n" -" bool moreThanOneInstanceAllowed() override { return ALLOWMORETHANONEINSTANCE; }\r\n" +" bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; }\r\n" "\r\n" " //==============================================================================\r\n" " void initialise (const String& commandLine) override\r\n" @@ -6638,7 +6631,7 @@ static const unsigned char temp_binary_data_43[] = " //==============================================================================\r\n" " /*\r\n" " This class implements the desktop window that contains an instance of\r\n" -" our CONTENTCOMPCLASS class.\r\n" +" our %%content_component_class%% class.\r\n" " */\r\n" " class MainWindow : public DocumentWindow\r\n" " {\r\n" @@ -6649,7 +6642,7 @@ static const unsigned char temp_binary_data_43[] = " DocumentWindow::allButtons)\r\n" " {\r\n" " setUsingNativeTitleBar (true);\r\n" -" setContentOwned (new CONTENTCOMPCLASS(), true);\r\n" +" setContentOwned (new %%content_component_class%%(), true);\r\n" "\r\n" " centreWithSize (getWidth(), getHeight());\r\n" " setVisible (true);\r\n" @@ -6680,7 +6673,7 @@ static const unsigned char temp_binary_data_43[] = "\r\n" "//==============================================================================\r\n" "// This macro generates the main() routine that launches the app.\r\n" -"START_JUCE_APPLICATION (APPCLASSNAME)\r\n"; +"START_JUCE_APPLICATION (%%app_class_name%%)\r\n"; const char* jucer_MainTemplate_Window_cpp = (const char*) temp_binary_data_43; @@ -6689,29 +6682,29 @@ static const unsigned char temp_binary_data_44[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" FILENAME\r\n" -" Created: DATE\r\n" -" Author: AUTHOR\r\n" +" %%filename%%\r\n" +" Created: %%date%%\r\n" +" Author: %%author%%\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" "\r\n" -"INCLUDE_JUCE\r\n" -"INCLUDE_CORRESPONDING_HEADER\r\n" +"%%include_juce%%\r\n" +"%%include_corresponding_header%%\r\n" "\r\n" "//==============================================================================\r\n" -"COMPONENTCLASS::COMPONENTCLASS()\r\n" +"%%component_class%%::%%component_class%%()\r\n" "{\r\n" " // In your constructor, you should add any child components, and\r\n" " // initialise any special settings that your component needs.\r\n" "\r\n" "}\r\n" "\r\n" -"COMPONENTCLASS::~COMPONENTCLASS()\r\n" +"%%component_class%%::~%%component_class%%()\r\n" "{\r\n" "}\r\n" "\r\n" -"void COMPONENTCLASS::paint (Graphics& g)\r\n" +"void %%component_class%%::paint (Graphics& g)\r\n" "{\r\n" " /* This demo code just fills the component's background and\r\n" " draws some placeholder text to get you started.\r\n" @@ -6727,11 +6720,11 @@ static const unsigned char temp_binary_data_44[] = "\r\n" " g.setColour (Colours::white);\r\n" " g.setFont (14.0f);\r\n" -" g.drawText (\"COMPONENTCLASS\", getLocalBounds(),\r\n" +" g.drawText (\"%%component_class%%\", getLocalBounds(),\r\n" " Justification::centred, true); // draw some placeholder text\r\n" "}\r\n" "\r\n" -"void COMPONENTCLASS::resized()\r\n" +"void %%component_class%%::resized()\r\n" "{\r\n" " // This method is where you should set the bounds of any child\r\n" " // components that your component contains..\r\n" @@ -6745,31 +6738,31 @@ static const unsigned char temp_binary_data_45[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" FILENAME\r\n" -" Created: DATE\r\n" -" Author: AUTHOR\r\n" +" %%filename%%\r\n" +" Created: %%date%%\r\n" +" Author: %%author%%\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" "\r\n" "#pragma once\r\n" "\r\n" -"INCLUDE_JUCE\r\n" +"%%include_juce%%\r\n" "\r\n" "//==============================================================================\r\n" "/*\r\n" "*/\r\n" -"class COMPONENTCLASS : public Component\r\n" +"class %%component_class%% : public Component\r\n" "{\r\n" "public:\r\n" -" COMPONENTCLASS();\r\n" -" ~COMPONENTCLASS();\r\n" +" %%component_class%%();\r\n" +" ~%%component_class%%();\r\n" "\r\n" " void paint (Graphics&) override;\r\n" " void resized() override;\r\n" "\r\n" "private:\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%component_class%%)\r\n" "};\r\n"; const char* jucer_NewComponentTemplate_h = (const char*) temp_binary_data_45; @@ -6779,14 +6772,14 @@ static const unsigned char temp_binary_data_46[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" FILENAME\r\n" -" Created: DATE\r\n" -" Author: AUTHOR\r\n" +" %%filename%%\r\n" +" Created: %%date%%\r\n" +" Author: %%author%%\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" "\r\n" -"INCLUDE_CORRESPONDING_HEADER\r\n"; +"%%include_corresponding_header%%\r\n"; const char* jucer_NewCppFileTemplate_cpp = (const char*) temp_binary_data_46; @@ -6795,9 +6788,9 @@ static const unsigned char temp_binary_data_47[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" FILENAME\r\n" -" Created: DATE\r\n" -" Author: AUTHOR\r\n" +" %%filename%%\r\n" +" Created: %%date%%\r\n" +" Author: %%author%%\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" @@ -6811,31 +6804,31 @@ static const unsigned char temp_binary_data_48[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" FILENAME\r\n" -" Created: DATE\r\n" -" Author: AUTHOR\r\n" +" %%filename%%\r\n" +" Created: %%date%%\r\n" +" Author: %%author%%\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" "\r\n" "#pragma once\r\n" "\r\n" -"INCLUDE_JUCE\r\n" +"%%include_juce%%\r\n" "\r\n" "//==============================================================================\r\n" "/*\r\n" "*/\r\n" -"class COMPONENTCLASS : public Component\r\n" +"class %%component_class%% : public Component\r\n" "{\r\n" "public:\r\n" -" COMPONENTCLASS()\r\n" +" %%component_class%%()\r\n" " {\r\n" " // In your constructor, you should add any child components, and\r\n" " // initialise any special settings that your component needs.\r\n" "\r\n" " }\r\n" "\r\n" -" ~COMPONENTCLASS()\r\n" +" ~%%component_class%%()\r\n" " {\r\n" " }\r\n" "\r\n" @@ -6855,7 +6848,7 @@ static const unsigned char temp_binary_data_48[] = "\r\n" " g.setColour (Colours::white);\r\n" " g.setFont (14.0f);\r\n" -" g.drawText (\"COMPONENTCLASS\", getLocalBounds(),\r\n" +" g.drawText (\"%%component_class%%\", getLocalBounds(),\r\n" " Justification::centred, true); // draw some placeholder text\r\n" " }\r\n" "\r\n" @@ -6867,7 +6860,7 @@ static const unsigned char temp_binary_data_48[] = " }\r\n" "\r\n" "private:\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%component_class%%)\r\n" "};\r\n"; const char* jucer_NewInlineComponentTemplate_h = (const char*) temp_binary_data_48; @@ -6884,25 +6877,25 @@ static const unsigned char temp_binary_data_49[] = "\r\n" "#pragma once\r\n" "\r\n" -"INCLUDE_JUCE\r\n" +"%%include_juce%%\r\n" "\r\n" "//==============================================================================\r\n" "/*\r\n" " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class CONTENTCOMPCLASS : public OpenGLAppComponent\r\n" +"class %%content_component_class%% : public OpenGLAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" CONTENTCOMPCLASS()\r\n" +" %%content_component_class%%()\r\n" " {\r\n" " // Make sure you set the size of the component after\r\n" " // you add any child components.\r\n" " setSize (800, 600);\r\n" " }\r\n" "\r\n" -" ~CONTENTCOMPCLASS()\r\n" +" ~%%content_component_class%%()\r\n" " {\r\n" " // This shuts down the GL system and stops the rendering calls.\r\n" " shutdownOpenGL();\r\n" @@ -6947,7 +6940,7 @@ static const unsigned char temp_binary_data_49[] = " // Your private member variables go here...\r\n" "\r\n" "\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%)\r\n" "};\r\n"; const char* jucer_OpenGLComponentSimpleTemplate_h = (const char*) temp_binary_data_49; @@ -6962,34 +6955,34 @@ static const unsigned char temp_binary_data_50[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" -"INCLUDE_CORRESPONDING_HEADER\r\n" +"%%include_corresponding_header%%\r\n" "\r\n" "//==============================================================================\r\n" -"CONTENTCOMPCLASS::CONTENTCOMPCLASS()\r\n" +"%%content_component_class%%::%%content_component_class%%()\r\n" "{\r\n" " // Make sure you set the size of the component after\r\n" " // you add any child components.\r\n" " setSize (800, 600);\r\n" "}\r\n" "\r\n" -"CONTENTCOMPCLASS::~CONTENTCOMPCLASS()\r\n" +"%%content_component_class%%::~%%content_component_class%%()\r\n" "{\r\n" " // This shuts down the GL system and stops the rendering calls.\r\n" " shutdownOpenGL();\r\n" "}\r\n" "\r\n" "//==============================================================================\r\n" -"void CONTENTCOMPCLASS::initialise()\r\n" +"void %%content_component_class%%::initialise()\r\n" "{\r\n" " // Initialise GL objects for rendering here.\r\n" "}\r\n" "\r\n" -"void CONTENTCOMPCLASS::shutdown()\r\n" +"void %%content_component_class%%::shutdown()\r\n" "{\r\n" " // Free any GL objects created for rendering here.\r\n" "}\r\n" "\r\n" -"void CONTENTCOMPCLASS::render()\r\n" +"void %%content_component_class%%::render()\r\n" "{\r\n" " // This clears the context with a black background.\r\n" " OpenGLHelpers::clear (Colours::black);\r\n" @@ -6998,15 +6991,15 @@ static const unsigned char temp_binary_data_50[] = "}\r\n" "\r\n" "//==============================================================================\r\n" -"void CONTENTCOMPCLASS::paint (Graphics& g)\r\n" +"void %%content_component_class%%::paint (Graphics& g)\r\n" "{\r\n" " // You can add your component specific drawing code here!\r\n" " // This will draw over the top of the openGL background.\r\n" "}\r\n" "\r\n" -"void CONTENTCOMPCLASS::resized()\r\n" +"void %%content_component_class%%::resized()\r\n" "{\r\n" -" // This is called when the MainContentComponent is resized.\r\n" +" // This is called when the %%content_component_class%% is resized.\r\n" " // If you add any child components, this is where you should\r\n" " // update their positions.\r\n" "}\r\n"; @@ -7025,19 +7018,19 @@ static const unsigned char temp_binary_data_51[] = "\r\n" "#pragma once\r\n" "\r\n" -"INCLUDE_JUCE\r\n" +"%%include_juce%%\r\n" "\r\n" "//==============================================================================\r\n" "/*\r\n" " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class CONTENTCOMPCLASS : public OpenGLAppComponent\r\n" +"class %%content_component_class%% : public OpenGLAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" -" CONTENTCOMPCLASS();\r\n" -" ~CONTENTCOMPCLASS();\r\n" +" %%content_component_class%%();\r\n" +" ~%%content_component_class%%();\r\n" "\r\n" " //==============================================================================\r\n" " void initialise() override;\r\n" @@ -7053,7 +7046,7 @@ static const unsigned char temp_binary_data_51[] = " // Your private member variables go here...\r\n" "\r\n" "\r\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS)\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%)\r\n" "};\r\n"; const char* jucer_OpenGLComponentTemplate_h = (const char*) temp_binary_data_51; @@ -7403,34 +7396,34 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw case 0x52a8dfdf: numBytes = 1859; return wizard_Openfile_svg; case 0x58e2ae48: numBytes = 4551; return wizard_OpenGL_svg; case 0xb1da6f9e: numBytes = 7488; return wizard_StaticLibrary_svg; - case 0xd11e6d35: numBytes = 2037; return jucer_AnimatedComponentSimpleTemplate_h; - case 0x6cf2645e: numBytes = 1482; return jucer_AnimatedComponentTemplate_cpp; - case 0x97b055e3: numBytes = 1153; return jucer_AnimatedComponentTemplate_h; - case 0xfb6f6d96: numBytes = 3146; return jucer_AudioComponentSimpleTemplate_h; - case 0xafccbd3f: numBytes = 2532; return jucer_AudioComponentTemplate_cpp; - case 0x915d7304: numBytes = 1326; return jucer_AudioComponentTemplate_h; - case 0x27c5a93a: numBytes = 1310; return jucer_AudioPluginEditorTemplate_cpp; - case 0x4d0721bf: numBytes = 938; return jucer_AudioPluginEditorTemplate_h; - case 0x51b49ac5: numBytes = 5889; return jucer_AudioPluginFilterTemplate_cpp; - case 0x488afa0a: numBytes = 2245; return jucer_AudioPluginFilterTemplate_h; - case 0xabad7041: numBytes = 2116; return jucer_ComponentTemplate_cpp; - case 0xfc72fe86: numBytes = 2029; return jucer_ComponentTemplate_h; - case 0x1657b643: numBytes = 1634; return jucer_ContentCompSimpleTemplate_h; - case 0x0b66646c: numBytes = 1109; return jucer_ContentCompTemplate_cpp; - case 0x6fa10171: numBytes = 1023; return jucer_ContentCompTemplate_h; - case 0x28d496ad: numBytes = 1208; return jucer_InlineComponentTemplate_h; - case 0x8905395b: numBytes = 470; return jucer_MainConsoleAppTemplate_cpp; - case 0x5e5ea047: numBytes = 1992; return jucer_MainTemplate_NoWindow_cpp; - case 0xda2391f8: numBytes = 3951; return jucer_MainTemplate_SimpleWindow_cpp; - case 0x400bc026: numBytes = 3913; return jucer_MainTemplate_Window_cpp; - case 0xf4842835: numBytes = 1436; return jucer_NewComponentTemplate_cpp; - case 0xe7bf237a: numBytes = 610; return jucer_NewComponentTemplate_h; - case 0x02a2a077: numBytes = 262; return jucer_NewCppFileTemplate_cpp; - case 0x0842c43c: numBytes = 246; return jucer_NewCppFileTemplate_h; - case 0x36e634a1: numBytes = 1635; return jucer_NewInlineComponentTemplate_h; - case 0x6bdeb129: numBytes = 2126; return jucer_OpenGLComponentSimpleTemplate_h; - case 0x7fbac252: numBytes = 1555; return jucer_OpenGLComponentTemplate_cpp; - case 0x491fa0d7: numBytes = 1215; return jucer_OpenGLComponentTemplate_h; + case 0xd11e6d35: numBytes = 2085; return jucer_AnimatedComponentSimpleTemplate_h; + case 0x6cf2645e: numBytes = 1563; return jucer_AnimatedComponentTemplate_cpp; + case 0x97b055e3: numBytes = 1201; return jucer_AnimatedComponentTemplate_h; + case 0xfb6f6d96: numBytes = 3194; return jucer_AudioComponentSimpleTemplate_h; + case 0xafccbd3f: numBytes = 2635; return jucer_AudioComponentTemplate_cpp; + case 0x915d7304: numBytes = 1374; return jucer_AudioComponentTemplate_h; + case 0x27c5a93a: numBytes = 1356; return jucer_AudioPluginEditorTemplate_cpp; + case 0x4d0721bf: numBytes = 977; return jucer_AudioPluginEditorTemplate_h; + case 0x51b49ac5: numBytes = 6036; return jucer_AudioPluginFilterTemplate_cpp; + case 0x488afa0a: numBytes = 2272; return jucer_AudioPluginFilterTemplate_h; + case 0xabad7041: numBytes = 2126; return jucer_ComponentTemplate_cpp; + case 0xfc72fe86: numBytes = 2042; return jucer_ComponentTemplate_h; + case 0x1657b643: numBytes = 1693; return jucer_ContentCompSimpleTemplate_h; + case 0x0b66646c: numBytes = 1190; return jucer_ContentCompTemplate_cpp; + case 0x6fa10171: numBytes = 1071; return jucer_ContentCompTemplate_h; + case 0x28d496ad: numBytes = 1233; return jucer_InlineComponentTemplate_h; + case 0x8905395b: numBytes = 473; return jucer_MainConsoleAppTemplate_cpp; + case 0x5e5ea047: numBytes = 2021; return jucer_MainTemplate_NoWindow_cpp; + case 0xda2391f8: numBytes = 4004; return jucer_MainTemplate_SimpleWindow_cpp; + case 0x400bc026: numBytes = 3964; return jucer_MainTemplate_Window_cpp; + case 0xf4842835: numBytes = 1491; return jucer_NewComponentTemplate_cpp; + case 0xe7bf237a: numBytes = 646; return jucer_NewComponentTemplate_h; + case 0x02a2a077: numBytes = 278; return jucer_NewCppFileTemplate_cpp; + case 0x0842c43c: numBytes = 258; return jucer_NewCppFileTemplate_h; + case 0x36e634a1: numBytes = 1676; return jucer_NewInlineComponentTemplate_h; + case 0x6bdeb129: numBytes = 2174; return jucer_OpenGLComponentSimpleTemplate_h; + case 0x7fbac252: numBytes = 1665; return jucer_OpenGLComponentTemplate_cpp; + case 0x491fa0d7: numBytes = 1263; return jucer_OpenGLComponentTemplate_h; case 0x763d39dc: numBytes = 1050; return colourscheme_dark_xml; case 0xe8b08520: numBytes = 1050; return colourscheme_light_xml; case 0xf11580d8: numBytes = 1155; return offlinepage_html; diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.h b/extras/Projucer/JuceLibraryCode/BinaryData.h index d0cd61c34c..069e80c241 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.h +++ b/extras/Projucer/JuceLibraryCode/BinaryData.h @@ -81,88 +81,88 @@ namespace BinaryData const int wizard_StaticLibrary_svgSize = 7488; extern const char* jucer_AnimatedComponentSimpleTemplate_h; - const int jucer_AnimatedComponentSimpleTemplate_hSize = 2037; + const int jucer_AnimatedComponentSimpleTemplate_hSize = 2085; extern const char* jucer_AnimatedComponentTemplate_cpp; - const int jucer_AnimatedComponentTemplate_cppSize = 1482; + const int jucer_AnimatedComponentTemplate_cppSize = 1563; extern const char* jucer_AnimatedComponentTemplate_h; - const int jucer_AnimatedComponentTemplate_hSize = 1153; + const int jucer_AnimatedComponentTemplate_hSize = 1201; extern const char* jucer_AudioComponentSimpleTemplate_h; - const int jucer_AudioComponentSimpleTemplate_hSize = 3146; + const int jucer_AudioComponentSimpleTemplate_hSize = 3194; extern const char* jucer_AudioComponentTemplate_cpp; - const int jucer_AudioComponentTemplate_cppSize = 2532; + const int jucer_AudioComponentTemplate_cppSize = 2635; extern const char* jucer_AudioComponentTemplate_h; - const int jucer_AudioComponentTemplate_hSize = 1326; + const int jucer_AudioComponentTemplate_hSize = 1374; extern const char* jucer_AudioPluginEditorTemplate_cpp; - const int jucer_AudioPluginEditorTemplate_cppSize = 1310; + const int jucer_AudioPluginEditorTemplate_cppSize = 1356; extern const char* jucer_AudioPluginEditorTemplate_h; - const int jucer_AudioPluginEditorTemplate_hSize = 938; + const int jucer_AudioPluginEditorTemplate_hSize = 977; extern const char* jucer_AudioPluginFilterTemplate_cpp; - const int jucer_AudioPluginFilterTemplate_cppSize = 5889; + const int jucer_AudioPluginFilterTemplate_cppSize = 6036; extern const char* jucer_AudioPluginFilterTemplate_h; - const int jucer_AudioPluginFilterTemplate_hSize = 2245; + const int jucer_AudioPluginFilterTemplate_hSize = 2272; extern const char* jucer_ComponentTemplate_cpp; - const int jucer_ComponentTemplate_cppSize = 2116; + const int jucer_ComponentTemplate_cppSize = 2126; extern const char* jucer_ComponentTemplate_h; - const int jucer_ComponentTemplate_hSize = 2029; + const int jucer_ComponentTemplate_hSize = 2042; extern const char* jucer_ContentCompSimpleTemplate_h; - const int jucer_ContentCompSimpleTemplate_hSize = 1634; + const int jucer_ContentCompSimpleTemplate_hSize = 1693; extern const char* jucer_ContentCompTemplate_cpp; - const int jucer_ContentCompTemplate_cppSize = 1109; + const int jucer_ContentCompTemplate_cppSize = 1190; extern const char* jucer_ContentCompTemplate_h; - const int jucer_ContentCompTemplate_hSize = 1023; + const int jucer_ContentCompTemplate_hSize = 1071; extern const char* jucer_InlineComponentTemplate_h; - const int jucer_InlineComponentTemplate_hSize = 1208; + const int jucer_InlineComponentTemplate_hSize = 1233; extern const char* jucer_MainConsoleAppTemplate_cpp; - const int jucer_MainConsoleAppTemplate_cppSize = 470; + const int jucer_MainConsoleAppTemplate_cppSize = 473; extern const char* jucer_MainTemplate_NoWindow_cpp; - const int jucer_MainTemplate_NoWindow_cppSize = 1992; + const int jucer_MainTemplate_NoWindow_cppSize = 2021; extern const char* jucer_MainTemplate_SimpleWindow_cpp; - const int jucer_MainTemplate_SimpleWindow_cppSize = 3951; + const int jucer_MainTemplate_SimpleWindow_cppSize = 4004; extern const char* jucer_MainTemplate_Window_cpp; - const int jucer_MainTemplate_Window_cppSize = 3913; + const int jucer_MainTemplate_Window_cppSize = 3964; extern const char* jucer_NewComponentTemplate_cpp; - const int jucer_NewComponentTemplate_cppSize = 1436; + const int jucer_NewComponentTemplate_cppSize = 1491; extern const char* jucer_NewComponentTemplate_h; - const int jucer_NewComponentTemplate_hSize = 610; + const int jucer_NewComponentTemplate_hSize = 646; extern const char* jucer_NewCppFileTemplate_cpp; - const int jucer_NewCppFileTemplate_cppSize = 262; + const int jucer_NewCppFileTemplate_cppSize = 278; extern const char* jucer_NewCppFileTemplate_h; - const int jucer_NewCppFileTemplate_hSize = 246; + const int jucer_NewCppFileTemplate_hSize = 258; extern const char* jucer_NewInlineComponentTemplate_h; - const int jucer_NewInlineComponentTemplate_hSize = 1635; + const int jucer_NewInlineComponentTemplate_hSize = 1676; extern const char* jucer_OpenGLComponentSimpleTemplate_h; - const int jucer_OpenGLComponentSimpleTemplate_hSize = 2126; + const int jucer_OpenGLComponentSimpleTemplate_hSize = 2174; extern const char* jucer_OpenGLComponentTemplate_cpp; - const int jucer_OpenGLComponentTemplate_cppSize = 1555; + const int jucer_OpenGLComponentTemplate_cppSize = 1665; extern const char* jucer_OpenGLComponentTemplate_h; - const int jucer_OpenGLComponentTemplate_hSize = 1215; + const int jucer_OpenGLComponentTemplate_hSize = 1263; extern const char* colourscheme_dark_xml; const int colourscheme_dark_xmlSize = 1050; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentSimpleTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentSimpleTemplate.h index 7c638200e6..62ff60ab56 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentSimpleTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentSimpleTemplate.h @@ -8,18 +8,18 @@ #pragma once -INCLUDE_JUCE +%%include_juce%% //============================================================================== /* This component lives inside our window, and this is where you should put all your controls and content. */ -class CONTENTCOMPCLASS : public AnimatedAppComponent +class %%content_component_class%% : public AnimatedAppComponent { public: //============================================================================== - CONTENTCOMPCLASS() + %%content_component_class%%() { // Make sure you set the size of the component after // you add any child components. @@ -27,7 +27,7 @@ public: setFramesPerSecond (60); // This sets the frequency of the update calls. } - ~CONTENTCOMPCLASS() + ~%%content_component_class%%() { } @@ -60,5 +60,5 @@ private: // Your private member variables go here... - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentTemplate.cpp index 2fd8c45356..fbbcbc897c 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentTemplate.cpp @@ -6,10 +6,10 @@ ============================================================================== */ -INCLUDE_CORRESPONDING_HEADER +%%include_corresponding_header%% //============================================================================== -CONTENTCOMPCLASS::CONTENTCOMPCLASS() +%%content_component_class%%::%%content_component_class%%() { // Make sure you set the size of the component after // you add any child components. @@ -17,19 +17,19 @@ CONTENTCOMPCLASS::CONTENTCOMPCLASS() setFramesPerSecond (60); // This sets the frequency of the update calls. } -CONTENTCOMPCLASS::~CONTENTCOMPCLASS() +%%content_component_class%%::~%%content_component_class%%() { } //============================================================================== -void CONTENTCOMPCLASS::update() +void %%content_component_class%%::update() { // This function is called at the frequency specified by the setFramesPerSecond() call // in the constructor. You can use it to update counters, animate values, etc. } //============================================================================== -void CONTENTCOMPCLASS::paint (Graphics& g) +void %%content_component_class%%::paint (Graphics& g) { // (Our component is opaque, so we must completely fill the background with a solid colour) g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); @@ -37,7 +37,7 @@ void CONTENTCOMPCLASS::paint (Graphics& g) // You can add your drawing code here! } -void CONTENTCOMPCLASS::resized() +void %%content_component_class%%::resized() { // This is called when the MainContentComponent is resized. // If you add any child components, this is where you should diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentTemplate.h index 562380867c..f8e8f7afc0 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_AnimatedComponentTemplate.h @@ -8,19 +8,19 @@ #pragma once -INCLUDE_JUCE +%%include_juce%% //============================================================================== /* This component lives inside our window, and this is where you should put all your controls and content. */ -class CONTENTCOMPCLASS : public AnimatedAppComponent +class %%content_component_class%% : public AnimatedAppComponent { public: //============================================================================== - CONTENTCOMPCLASS(); - ~CONTENTCOMPCLASS(); + %%content_component_class%%(); + ~%%content_component_class%%(); //============================================================================== void update() override; @@ -34,5 +34,5 @@ private: // Your private member variables go here... - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentSimpleTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentSimpleTemplate.h index 8c4d6d77e1..8007840e77 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentSimpleTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentSimpleTemplate.h @@ -8,18 +8,18 @@ #pragma once -INCLUDE_JUCE +%%include_juce%% //============================================================================== /* This component lives inside our window, and this is where you should put all your controls and content. */ -class CONTENTCOMPCLASS : public AudioAppComponent +class %%content_component_class%% : public AudioAppComponent { public: //============================================================================== - CONTENTCOMPCLASS() + %%content_component_class%%() { // Make sure you set the size of the component after // you add any child components. @@ -29,7 +29,7 @@ public: setAudioChannels (2, 2); } - ~CONTENTCOMPCLASS() + ~%%content_component_class%%() { // This shuts down the audio device and clears the audio source. shutdownAudio(); @@ -88,5 +88,5 @@ private: // Your private member variables go here... - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentTemplate.cpp index 0d2e1a349d..b24e6e741f 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentTemplate.cpp @@ -6,10 +6,10 @@ ============================================================================== */ -INCLUDE_CORRESPONDING_HEADER +%%include_corresponding_header%% //============================================================================== -CONTENTCOMPCLASS::CONTENTCOMPCLASS() +%%content_component_class%%::%%content_component_class%%() { // Make sure you set the size of the component after // you add any child components. @@ -19,14 +19,14 @@ CONTENTCOMPCLASS::CONTENTCOMPCLASS() setAudioChannels (2, 2); } -CONTENTCOMPCLASS::~CONTENTCOMPCLASS() +%%content_component_class%%::~%%content_component_class%%() { // This shuts down the audio device and clears the audio source. shutdownAudio(); } //============================================================================== -void CONTENTCOMPCLASS::prepareToPlay (int samplesPerBlockExpected, double sampleRate) +void %%content_component_class%%::prepareToPlay (int samplesPerBlockExpected, double sampleRate) { // This function will be called when the audio device is started, or when // its settings (i.e. sample rate, block size, etc) are changed. @@ -37,7 +37,7 @@ void CONTENTCOMPCLASS::prepareToPlay (int samplesPerBlockExpected, double sample // For more details, see the help for AudioProcessor::prepareToPlay() } -void CONTENTCOMPCLASS::getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill) +void %%content_component_class%%::getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill) { // Your audio-processing code goes here! @@ -48,7 +48,7 @@ void CONTENTCOMPCLASS::getNextAudioBlock (const AudioSourceChannelInfo& bufferTo bufferToFill.clearActiveBufferRegion(); } -void CONTENTCOMPCLASS::releaseResources() +void %%content_component_class%%::releaseResources() { // This will be called when the audio device stops, or when it is being // restarted due to a setting change. @@ -57,7 +57,7 @@ void CONTENTCOMPCLASS::releaseResources() } //============================================================================== -void CONTENTCOMPCLASS::paint (Graphics& g) +void %%content_component_class%%::paint (Graphics& g) { // (Our component is opaque, so we must completely fill the background with a solid colour) g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); @@ -65,7 +65,7 @@ void CONTENTCOMPCLASS::paint (Graphics& g) // You can add your drawing code here! } -void CONTENTCOMPCLASS::resized() +void %%content_component_class%%::resized() { // This is called when the MainContentComponent is resized. // If you add any child components, this is where you should diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentTemplate.h index 9c2c7c7c66..99c2590a26 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioComponentTemplate.h @@ -8,19 +8,19 @@ #pragma once -INCLUDE_JUCE +%%include_juce%% //============================================================================== /* This component lives inside our window, and this is where you should put all your controls and content. */ -class CONTENTCOMPCLASS : public AudioAppComponent +class %%content_component_class%% : public AudioAppComponent { public: //============================================================================== - CONTENTCOMPCLASS(); - ~CONTENTCOMPCLASS(); + %%content_component_class%%(); + ~%%content_component_class%%(); //============================================================================== void prepareToPlay (int samplesPerBlockExpected, double sampleRate) override; @@ -36,5 +36,5 @@ private: // Your private member variables go here... - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginEditorTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginEditorTemplate.cpp index 09953b65b2..b94d9843f5 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginEditorTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginEditorTemplate.cpp @@ -8,11 +8,10 @@ ============================================================================== */ -EDITORCPPHEADERS - +%%editor_cpp_headers%% //============================================================================== -EDITORCLASSNAME::EDITORCLASSNAME (FILTERCLASSNAME& p) +%%editor_class_name%%::%%editor_class_name%% (%%filter_class_name%%& p) : AudioProcessorEditor (&p), processor (p) { // Make sure that before the constructor has finished, you've set the @@ -20,12 +19,12 @@ EDITORCLASSNAME::EDITORCLASSNAME (FILTERCLASSNAME& p) setSize (400, 300); } -EDITORCLASSNAME::~EDITORCLASSNAME() +%%editor_class_name%%::~%%editor_class_name%%() { } //============================================================================== -void EDITORCLASSNAME::paint (Graphics& g) +void %%editor_class_name%%::paint (Graphics& g) { // (Our component is opaque, so we must completely fill the background with a solid colour) g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); @@ -35,7 +34,7 @@ void EDITORCLASSNAME::paint (Graphics& g) g.drawFittedText ("Hello World!", getLocalBounds(), Justification::centred, 1); } -void EDITORCLASSNAME::resized() +void %%editor_class_name%%::resized() { // This is generally where you'll want to lay out the positions of any // subcomponents in your editor.. diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginEditorTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginEditorTemplate.h index b2a2a07fe0..50c948ce08 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginEditorTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginEditorTemplate.h @@ -10,17 +10,16 @@ #pragma once -EDITORHEADERS - +%%editor_headers%% //============================================================================== /** */ -class EDITORCLASSNAME : public AudioProcessorEditor +class %%editor_class_name%% : public AudioProcessorEditor { public: - EDITORCLASSNAME (FILTERCLASSNAME&); - ~EDITORCLASSNAME(); + %%editor_class_name%% (%%filter_class_name%%&); + ~%%editor_class_name%%(); //============================================================================== void paint (Graphics&) override; @@ -29,7 +28,7 @@ public: private: // This reference is provided as a quick way for your editor to // access the processor object that created it. - FILTERCLASSNAME& processor; + %%filter_class_name%%& processor; - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (EDITORCLASSNAME) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%editor_class_name%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.cpp index 03ee0532d2..66387e98ed 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.cpp @@ -8,11 +8,10 @@ ============================================================================== */ -FILTERHEADERS - +%%filter_headers%% //============================================================================== -FILTERCLASSNAME::FILTERCLASSNAME() +%%filter_class_name%%::%%filter_class_name%%() #ifndef JucePlugin_PreferredChannelConfigurations : AudioProcessor (BusesProperties() #if ! JucePlugin_IsMidiEffect @@ -26,17 +25,17 @@ FILTERCLASSNAME::FILTERCLASSNAME() { } -FILTERCLASSNAME::~FILTERCLASSNAME() +%%filter_class_name%%::~%%filter_class_name%%() { } //============================================================================== -const String FILTERCLASSNAME::getName() const +const String %%filter_class_name%%::getName() const { return JucePlugin_Name; } -bool FILTERCLASSNAME::acceptsMidi() const +bool %%filter_class_name%%::acceptsMidi() const { #if JucePlugin_WantsMidiInput return true; @@ -45,7 +44,7 @@ bool FILTERCLASSNAME::acceptsMidi() const #endif } -bool FILTERCLASSNAME::producesMidi() const +bool %%filter_class_name%%::producesMidi() const { #if JucePlugin_ProducesMidiOutput return true; @@ -54,7 +53,7 @@ bool FILTERCLASSNAME::producesMidi() const #endif } -bool FILTERCLASSNAME::isMidiEffect() const +bool %%filter_class_name%%::isMidiEffect() const { #if JucePlugin_IsMidiEffect return true; @@ -63,50 +62,50 @@ bool FILTERCLASSNAME::isMidiEffect() const #endif } -double FILTERCLASSNAME::getTailLengthSeconds() const +double %%filter_class_name%%::getTailLengthSeconds() const { return 0.0; } -int FILTERCLASSNAME::getNumPrograms() +int %%filter_class_name%%::getNumPrograms() { return 1; // NB: some hosts don't cope very well if you tell them there are 0 programs, // so this should be at least 1, even if you're not really implementing programs. } -int FILTERCLASSNAME::getCurrentProgram() +int %%filter_class_name%%::getCurrentProgram() { return 0; } -void FILTERCLASSNAME::setCurrentProgram (int index) +void %%filter_class_name%%::setCurrentProgram (int index) { } -const String FILTERCLASSNAME::getProgramName (int index) +const String %%filter_class_name%%::getProgramName (int index) { return {}; } -void FILTERCLASSNAME::changeProgramName (int index, const String& newName) +void %%filter_class_name%%::changeProgramName (int index, const String& newName) { } //============================================================================== -void FILTERCLASSNAME::prepareToPlay (double sampleRate, int samplesPerBlock) +void %%filter_class_name%%::prepareToPlay (double sampleRate, int samplesPerBlock) { // Use this method as the place to do any pre-playback // initialisation that you need.. } -void FILTERCLASSNAME::releaseResources() +void %%filter_class_name%%::releaseResources() { // When playback stops, you can use this as an opportunity to free up any // spare memory, etc. } #ifndef JucePlugin_PreferredChannelConfigurations -bool FILTERCLASSNAME::isBusesLayoutSupported (const BusesLayout& layouts) const +bool %%filter_class_name%%::isBusesLayoutSupported (const BusesLayout& layouts) const { #if JucePlugin_IsMidiEffect ignoreUnused (layouts); @@ -129,7 +128,7 @@ bool FILTERCLASSNAME::isBusesLayoutSupported (const BusesLayout& layouts) const } #endif -void FILTERCLASSNAME::processBlock (AudioBuffer& buffer, MidiBuffer& midiMessages) +void %%filter_class_name%%::processBlock (AudioBuffer& buffer, MidiBuffer& midiMessages) { ScopedNoDenormals noDenormals; auto totalNumInputChannels = getTotalNumInputChannels(); @@ -159,25 +158,25 @@ void FILTERCLASSNAME::processBlock (AudioBuffer& buffer, MidiBuffer& midi } //============================================================================== -bool FILTERCLASSNAME::hasEditor() const +bool %%filter_class_name%%::hasEditor() const { return true; // (change this to false if you choose to not supply an editor) } -AudioProcessorEditor* FILTERCLASSNAME::createEditor() +AudioProcessorEditor* %%filter_class_name%%::createEditor() { - return new EDITORCLASSNAME (*this); + return new %%editor_class_name%% (*this); } //============================================================================== -void FILTERCLASSNAME::getStateInformation (MemoryBlock& destData) +void %%filter_class_name%%::getStateInformation (MemoryBlock& destData) { // You should use this method to store your parameters in the memory block. // You could do that either as raw data, or use the XML or ValueTree classes // as intermediaries to make it easy to save and load complex data. } -void FILTERCLASSNAME::setStateInformation (const void* data, int sizeInBytes) +void %%filter_class_name%%::setStateInformation (const void* data, int sizeInBytes) { // You should use this method to restore your parameters from this memory block, // whose contents will have been created by the getStateInformation() call. @@ -187,5 +186,5 @@ void FILTERCLASSNAME::setStateInformation (const void* data, int sizeInBytes) // This creates new instances of the plugin.. AudioProcessor* JUCE_CALLTYPE createPluginFilter() { - return new FILTERCLASSNAME(); + return new %%filter_class_name%%(); } diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.h index f1ceeaca06..d1668e9596 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.h @@ -10,18 +10,17 @@ #pragma once -APPHEADERS - +%%app_headers%% //============================================================================== /** */ -class FILTERCLASSNAME : public AudioProcessor +class %%filter_class_name%% : public AudioProcessor { public: //============================================================================== - FILTERCLASSNAME(); - ~FILTERCLASSNAME(); + %%filter_class_name%%(); + ~%%filter_class_name%%(); //============================================================================== void prepareToPlay (double sampleRate, int samplesPerBlock) override; @@ -58,5 +57,5 @@ public: private: //============================================================================== - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FILTERCLASSNAME) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%filter_class_name%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.cpp index 4f2f6413e8..11845388f0 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.cpp @@ -20,13 +20,13 @@ //[Headers] You can add your own extra header files here... //[/Headers] -%%includeFilesCPP%% +%%include_files_cpp%% //[MiscUserDefs] You can add your own user definitions and misc code here... //[/MiscUserDefs] //============================================================================== -%%className%%::%%className%% (%%constructorParams%%) +%%class_name%%::%%class_name%% (%%constructor_params%%) %%initialisers%%{ //[Constructor_pre] You can add your own custom stuff here.. //[/Constructor_pre] @@ -37,7 +37,7 @@ //[/Constructor] } -%%className%%::~%%className%%() +%%class_name%%::~%%class_name%%() { //[Destructor_pre]. You can add your own custom destruction code here.. //[/Destructor_pre] @@ -49,7 +49,7 @@ } //============================================================================== -%%methodDefinitions%% +%%method_definitions%% //[MiscUserCode] You can add your own definitions of your custom methods or any other code here... //[/MiscUserCode] @@ -69,6 +69,6 @@ END_JUCER_METADATA */ #endif -%%staticMemberDefinitions%% +%%static_member_definitions%% //[EndFile] You can add extra defines here... //[/EndFile] diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h index e41ee60a95..d47a398799 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_ComponentTemplate.h @@ -20,10 +20,10 @@ #pragma once //[Headers] -- You can add your own extra header files here -- -%%includeJUCEHeader%% +%%include_juce_header%% //[/Headers] -%%includeFilesH%% +%%include_files_h%% //============================================================================== /** @@ -33,28 +33,28 @@ Describe your class and how it works here! //[/Comments] */ -%%classDeclaration%% +%%class_declaration%% { public: //============================================================================== - %%className%% (%%constructorParams%%); - ~%%className%%(); + %%class_name%% (%%constructor_params%%); + ~%%class_name%%(); //============================================================================== //[UserMethods] -- You can add your own custom methods in this section. //[/UserMethods] - %%publicMemberDeclarations%% + %%public_member_declarations%% private: //[UserVariables] -- You can add your own custom variables in this section. //[/UserVariables] //============================================================================== - %%privateMemberDeclarations%% + %%private_member_declarations%% //============================================================================== - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%className%%) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%class_name%%) }; //[EndFile] You can add extra defines here... diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompSimpleTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompSimpleTemplate.h index 5d0aa78fa9..8178bea4f4 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompSimpleTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompSimpleTemplate.h @@ -8,23 +8,23 @@ #pragma once -INCLUDE_JUCE +%%include_juce%% //============================================================================== /* This component lives inside our window, and this is where you should put all your controls and content. */ -class CONTENTCOMPCLASS : public Component +class %%content_component_class%% : public Component { public: //============================================================================== - CONTENTCOMPCLASS() + %%content_component_class%%() { setSize (600, 400); } - ~CONTENTCOMPCLASS() + ~%%content_component_class%%() { } @@ -41,7 +41,7 @@ public: void resized() override { - // This is called when the CONTENTCOMPCLASS is resized. + // This is called when the %%content_component_class%% is resized. // If you add any child components, this is where you should // update their positions. } @@ -52,5 +52,5 @@ private: // Your private member variables go here... - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.cpp index 5a77487443..a55ad08889 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.cpp @@ -6,20 +6,20 @@ ============================================================================== */ -INCLUDE_CORRESPONDING_HEADER +%%include_corresponding_header%% //============================================================================== -CONTENTCOMPCLASS::CONTENTCOMPCLASS() +%%content_component_class%%::%%content_component_class%%() { setSize (600, 400); } -CONTENTCOMPCLASS::~CONTENTCOMPCLASS() +%%content_component_class%%::~%%content_component_class%%() { } //============================================================================== -void CONTENTCOMPCLASS::paint (Graphics& g) +void %%content_component_class%%::paint (Graphics& g) { // (Our component is opaque, so we must completely fill the background with a solid colour) g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); @@ -29,9 +29,9 @@ void CONTENTCOMPCLASS::paint (Graphics& g) g.drawText ("Hello World!", getLocalBounds(), Justification::centred, true); } -void CONTENTCOMPCLASS::resized() +void %%content_component_class%%::resized() { - // This is called when the CONTENTCOMPCLASS is resized. + // This is called when the %%content_component_class%% is resized. // If you add any child components, this is where you should // update their positions. } diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.h index 85579863ad..2a87c80ef6 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.h @@ -8,19 +8,19 @@ #pragma once -INCLUDE_JUCE +%%include_juce%% //============================================================================== /* This component lives inside our window, and this is where you should put all your controls and content. */ -class CONTENTCOMPCLASS : public Component +class %%content_component_class%% : public Component { public: //============================================================================== - CONTENTCOMPCLASS(); - ~CONTENTCOMPCLASS(); + %%content_component_class%%(); + ~%%content_component_class%%(); //============================================================================== void paint (Graphics&) override; @@ -31,5 +31,5 @@ private: // Your private member variables go here... - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_InlineComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_InlineComponentTemplate.h index 00d51b0835..cd73fcf50c 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_InlineComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_InlineComponentTemplate.h @@ -1,15 +1,15 @@ //============================================================================== -class COMPONENTCLASS : public Component +class %%component_class%% : public Component { public: - COMPONENTCLASS() + %%component_class%%() { // In your constructor, you should add any child components, and // initialise any special settings that your component needs. } - ~COMPONENTCLASS() + ~%%component_class%%() { } @@ -24,7 +24,7 @@ public: g.setColour (Colours::white); g.setFont (14.0f); - g.drawText ("COMPONENTCLASS", getLocalBounds(), + g.drawText ("%%component_class%%", getLocalBounds(), Justification::centred, true); // draw some placeholder text } @@ -36,5 +36,5 @@ public: } private: - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%component_class%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_MainConsoleAppTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_MainConsoleAppTemplate.cpp index 58c536cd00..27987d4aa1 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_MainConsoleAppTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_MainConsoleAppTemplate.cpp @@ -8,8 +8,7 @@ ============================================================================== */ -APPHEADERS - +%%app_headers%% //============================================================================== int main (int argc, char* argv[]) diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_NoWindow.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_NoWindow.cpp index 87a09f6f0e..2409003539 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_NoWindow.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_NoWindow.cpp @@ -8,19 +8,18 @@ ============================================================================== */ -APPHEADERS - +%%app_headers%% //============================================================================== -class APPCLASSNAME : public JUCEApplication +class %%app_class_name%% : public JUCEApplication { public: //============================================================================== - APPCLASSNAME() {} + %%app_class_name%%() {} const String getApplicationName() override { return ProjectInfo::projectName; } const String getApplicationVersion() override { return ProjectInfo::versionString; } - bool moreThanOneInstanceAllowed() override { return ALLOWMORETHANONEINSTANCE; } + bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; } //============================================================================== void initialise (const String& commandLine) override @@ -51,4 +50,4 @@ public: //============================================================================== // This macro generates the main() routine that launches the app. -START_JUCE_APPLICATION (APPCLASSNAME) +START_JUCE_APPLICATION (%%app_class_name%%) diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_SimpleWindow.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_SimpleWindow.cpp index eb8de9c81d..b854043584 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_SimpleWindow.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_SimpleWindow.cpp @@ -8,18 +8,18 @@ ============================================================================== */ -APPHEADERS +%%app_headers%% //============================================================================== -class APPCLASSNAME : public JUCEApplication +class %%app_class_name%% : public JUCEApplication { public: //============================================================================== - APPCLASSNAME() {} + %%app_class_name%%() {} const String getApplicationName() override { return ProjectInfo::projectName; } const String getApplicationVersion() override { return ProjectInfo::versionString; } - bool moreThanOneInstanceAllowed() override { return ALLOWMORETHANONEINSTANCE; } + bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; } //============================================================================== void initialise (const String& commandLine) override @@ -54,7 +54,7 @@ public: //============================================================================== /* This class implements the desktop window that contains an instance of - our CONTENTCOMPCLASS class. + our %%content_component_class%% class. */ class MainWindow : public DocumentWindow { @@ -65,7 +65,7 @@ public: DocumentWindow::allButtons) { setUsingNativeTitleBar (true); - setContentOwned (new CONTENTCOMPCLASS(), true); + setContentOwned (new %%content_component_class%%(), true); setResizable (true, true); centreWithSize (getWidth(), getHeight()); @@ -97,4 +97,4 @@ private: //============================================================================== // This macro generates the main() routine that launches the app. -START_JUCE_APPLICATION (APPCLASSNAME) +START_JUCE_APPLICATION (%%app_class_name%%) diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_Window.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_Window.cpp index 5d3c079e6b..77cdc194db 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_Window.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_Window.cpp @@ -8,19 +8,18 @@ ============================================================================== */ -APPHEADERS - +%%app_headers%% //============================================================================== -class APPCLASSNAME : public JUCEApplication +class %%app_class_name%% : public JUCEApplication { public: //============================================================================== - APPCLASSNAME() {} + %%app_class_name%%() {} const String getApplicationName() override { return ProjectInfo::projectName; } const String getApplicationVersion() override { return ProjectInfo::versionString; } - bool moreThanOneInstanceAllowed() override { return ALLOWMORETHANONEINSTANCE; } + bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; } //============================================================================== void initialise (const String& commandLine) override @@ -55,7 +54,7 @@ public: //============================================================================== /* This class implements the desktop window that contains an instance of - our CONTENTCOMPCLASS class. + our %%content_component_class%% class. */ class MainWindow : public DocumentWindow { @@ -66,7 +65,7 @@ public: DocumentWindow::allButtons) { setUsingNativeTitleBar (true); - setContentOwned (new CONTENTCOMPCLASS(), true); + setContentOwned (new %%content_component_class%%(), true); centreWithSize (getWidth(), getHeight()); setVisible (true); @@ -97,4 +96,4 @@ private: //============================================================================== // This macro generates the main() routine that launches the app. -START_JUCE_APPLICATION (APPCLASSNAME) +START_JUCE_APPLICATION (%%app_class_name%%) diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.cpp index bbbaae0270..6b39426076 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.cpp @@ -1,29 +1,29 @@ /* ============================================================================== - FILENAME - Created: DATE - Author: AUTHOR + %%filename%% + Created: %%date%% + Author: %%author%% ============================================================================== */ -INCLUDE_JUCE -INCLUDE_CORRESPONDING_HEADER +%%include_juce%% +%%include_corresponding_header%% //============================================================================== -COMPONENTCLASS::COMPONENTCLASS() +%%component_class%%::%%component_class%%() { // In your constructor, you should add any child components, and // initialise any special settings that your component needs. } -COMPONENTCLASS::~COMPONENTCLASS() +%%component_class%%::~%%component_class%%() { } -void COMPONENTCLASS::paint (Graphics& g) +void %%component_class%%::paint (Graphics& g) { /* This demo code just fills the component's background and draws some placeholder text to get you started. @@ -39,11 +39,11 @@ void COMPONENTCLASS::paint (Graphics& g) g.setColour (Colours::white); g.setFont (14.0f); - g.drawText ("COMPONENTCLASS", getLocalBounds(), + g.drawText ("%%component_class%%", getLocalBounds(), Justification::centred, true); // draw some placeholder text } -void COMPONENTCLASS::resized() +void %%component_class%%::resized() { // This method is where you should set the bounds of any child // components that your component contains.. diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.h index d50d9fb71c..2cb07326cd 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.h @@ -1,29 +1,29 @@ /* ============================================================================== - FILENAME - Created: DATE - Author: AUTHOR + %%filename%% + Created: %%date%% + Author: %%author%% ============================================================================== */ #pragma once -INCLUDE_JUCE +%%include_juce%% //============================================================================== /* */ -class COMPONENTCLASS : public Component +class %%component_class%% : public Component { public: - COMPONENTCLASS(); - ~COMPONENTCLASS(); + %%component_class%%(); + ~%%component_class%%(); void paint (Graphics&) override; void resized() override; private: - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%component_class%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_NewCppFileTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_NewCppFileTemplate.cpp index e06315dbf6..6c450fbd7a 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_NewCppFileTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_NewCppFileTemplate.cpp @@ -1,11 +1,11 @@ /* ============================================================================== - FILENAME - Created: DATE - Author: AUTHOR + %%filename%% + Created: %%date%% + Author: %%author%% ============================================================================== */ -INCLUDE_CORRESPONDING_HEADER +%%include_corresponding_header%% diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_NewCppFileTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_NewCppFileTemplate.h index 1f789d193d..168af84765 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_NewCppFileTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_NewCppFileTemplate.h @@ -1,9 +1,9 @@ /* ============================================================================== - FILENAME - Created: DATE - Author: AUTHOR + %%filename%% + Created: %%date%% + Author: %%author%% ============================================================================== */ diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_NewInlineComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_NewInlineComponentTemplate.h index 32d8cf2b7d..2a37648661 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_NewInlineComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_NewInlineComponentTemplate.h @@ -1,31 +1,31 @@ /* ============================================================================== - FILENAME - Created: DATE - Author: AUTHOR + %%filename%% + Created: %%date%% + Author: %%author%% ============================================================================== */ #pragma once -INCLUDE_JUCE +%%include_juce%% //============================================================================== /* */ -class COMPONENTCLASS : public Component +class %%component_class%% : public Component { public: - COMPONENTCLASS() + %%component_class%%() { // In your constructor, you should add any child components, and // initialise any special settings that your component needs. } - ~COMPONENTCLASS() + ~%%component_class%%() { } @@ -45,7 +45,7 @@ public: g.setColour (Colours::white); g.setFont (14.0f); - g.drawText ("COMPONENTCLASS", getLocalBounds(), + g.drawText ("%%component_class%%", getLocalBounds(), Justification::centred, true); // draw some placeholder text } @@ -57,5 +57,5 @@ public: } private: - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%component_class%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentSimpleTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentSimpleTemplate.h index fb3c777471..e2f463f60e 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentSimpleTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentSimpleTemplate.h @@ -8,25 +8,25 @@ #pragma once -INCLUDE_JUCE +%%include_juce%% //============================================================================== /* This component lives inside our window, and this is where you should put all your controls and content. */ -class CONTENTCOMPCLASS : public OpenGLAppComponent +class %%content_component_class%% : public OpenGLAppComponent { public: //============================================================================== - CONTENTCOMPCLASS() + %%content_component_class%%() { // Make sure you set the size of the component after // you add any child components. setSize (800, 600); } - ~CONTENTCOMPCLASS() + ~%%content_component_class%%() { // This shuts down the GL system and stops the rendering calls. shutdownOpenGL(); @@ -71,5 +71,5 @@ private: // Your private member variables go here... - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%) }; diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.cpp index 1fcfe8b253..1a53e14c9d 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.cpp @@ -6,34 +6,34 @@ ============================================================================== */ -INCLUDE_CORRESPONDING_HEADER +%%include_corresponding_header%% //============================================================================== -CONTENTCOMPCLASS::CONTENTCOMPCLASS() +%%content_component_class%%::%%content_component_class%%() { // Make sure you set the size of the component after // you add any child components. setSize (800, 600); } -CONTENTCOMPCLASS::~CONTENTCOMPCLASS() +%%content_component_class%%::~%%content_component_class%%() { // This shuts down the GL system and stops the rendering calls. shutdownOpenGL(); } //============================================================================== -void CONTENTCOMPCLASS::initialise() +void %%content_component_class%%::initialise() { // Initialise GL objects for rendering here. } -void CONTENTCOMPCLASS::shutdown() +void %%content_component_class%%::shutdown() { // Free any GL objects created for rendering here. } -void CONTENTCOMPCLASS::render() +void %%content_component_class%%::render() { // This clears the context with a black background. OpenGLHelpers::clear (Colours::black); @@ -42,15 +42,15 @@ void CONTENTCOMPCLASS::render() } //============================================================================== -void CONTENTCOMPCLASS::paint (Graphics& g) +void %%content_component_class%%::paint (Graphics& g) { // You can add your component specific drawing code here! // This will draw over the top of the openGL background. } -void CONTENTCOMPCLASS::resized() +void %%content_component_class%%::resized() { - // This is called when the MainContentComponent is resized. + // This is called when the %%content_component_class%% is resized. // If you add any child components, this is where you should // update their positions. } diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.h index b7d256210f..c5ad25da1d 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.h @@ -8,19 +8,19 @@ #pragma once -INCLUDE_JUCE +%%include_juce%% //============================================================================== /* This component lives inside our window, and this is where you should put all your controls and content. */ -class CONTENTCOMPCLASS : public OpenGLAppComponent +class %%content_component_class%% : public OpenGLAppComponent { public: //============================================================================== - CONTENTCOMPCLASS(); - ~CONTENTCOMPCLASS(); + %%content_component_class%%(); + ~%%content_component_class%%(); //============================================================================== void initialise() override; @@ -36,5 +36,5 @@ private: // Your private member variables go here... - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CONTENTCOMPCLASS) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%content_component_class%%) }; diff --git a/extras/Projucer/Source/CodeEditor/jucer_SourceCodeEditor.cpp b/extras/Projucer/Source/CodeEditor/jucer_SourceCodeEditor.cpp index b730a30ab6..4ec4e4eebb 100644 --- a/extras/Projucer/Source/CodeEditor/jucer_SourceCodeEditor.cpp +++ b/extras/Projucer/Source/CodeEditor/jucer_SourceCodeEditor.cpp @@ -642,7 +642,7 @@ void CppCodeEditorComponent::insertComponentClass() if (className == CodeHelpers::makeValidIdentifier (className, false, true, false)) { String code (BinaryData::jucer_InlineComponentTemplate_h); - code = code.replace ("COMPONENTCLASS", className); + code = code.replace ("%%component_class%%", className); insertTextAtCaret (code); break; diff --git a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp index fc7c9754fd..0b43f9eef9 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp +++ b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.cpp @@ -327,29 +327,29 @@ void GeneratedCode::applyToCode (String& code, replaceTemplate (code, "version", JUCEApplicationBase::getInstance()->getApplicationVersion()); replaceTemplate (code, "creationTime", Time::getCurrentTime().toString (true, true, true)); - replaceTemplate (code, "className", className); - replaceTemplate (code, "constructorParams", constructorParams); + replaceTemplate (code, "class_name", className); + replaceTemplate (code, "constructor_params", constructorParams); replaceTemplate (code, "initialisers", getInitialiserList()); - replaceTemplate (code, "classDeclaration", getClassDeclaration()); - replaceTemplate (code, "privateMemberDeclarations", privateMemberDeclarations); - replaceTemplate (code, "publicMemberDeclarations", getCallbackDeclarations() + newLine + publicMemberDeclarations); + replaceTemplate (code, "class_declaration", getClassDeclaration()); + replaceTemplate (code, "private_member_declarations", privateMemberDeclarations); + replaceTemplate (code, "public_member_declarations", getCallbackDeclarations() + newLine + publicMemberDeclarations); - replaceTemplate (code, "methodDefinitions", getCallbackDefinitions()); + replaceTemplate (code, "method_definitions", getCallbackDefinitions()); File juceHeaderFile = project != nullptr ? project->getAppIncludeFile() : targetFile.getSiblingFile ("JuceHeader.h"); - replaceTemplate (code, "includeJUCEHeader", CodeHelpers::createIncludeStatement (juceHeaderFile, targetFile)); + replaceTemplate (code, "include_juce_header", CodeHelpers::createIncludeStatement (juceHeaderFile, targetFile)); - replaceTemplate (code, "includeFilesH", getIncludeFileCode (includeFilesH, targetFile)); - replaceTemplate (code, "includeFilesCPP", getIncludeFileCode (includeFilesCPP, targetFile)); + replaceTemplate (code, "include_files_h", getIncludeFileCode (includeFilesH, targetFile)); + replaceTemplate (code, "include_files_cpp", getIncludeFileCode (includeFilesCPP, targetFile)); replaceTemplate (code, "constructor", constructorCode); replaceTemplate (code, "destructor", destructorCode); replaceTemplate (code, "metadata", jucerMetadata); - replaceTemplate (code, "staticMemberDefinitions", staticMemberDefinitions); + replaceTemplate (code, "static_member_definitions", staticMemberDefinitions); copyAcrossUserSections (code, oldFileWithUserData); } diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp b/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp index 10817977ae..68b28eca78 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp +++ b/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.cpp @@ -135,14 +135,6 @@ namespace CodeHelpers return "#include \"" + includePath + "\""; } - String makeHeaderGuardName (const File& file) - { - return file.getFileName().toUpperCase() - .replaceCharacters (" .", "__") - .retainCharacters ("_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") - + "_INCLUDED"; - } - String makeBinaryDataIdentifierName (const File& file) { return makeValidIdentifier (file.getFileName() diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.h b/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.h index 537c336f05..d348f8367a 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.h +++ b/extras/Projucer/Source/Utility/Helpers/jucer_CodeHelpers.h @@ -36,7 +36,6 @@ namespace CodeHelpers bool allowTemplates, bool allowAsterisks = false); String createIncludeStatement (const File& includedFile, const File& targetFile); String createIncludeStatement (const String& includePath); - String makeHeaderGuardName (const File& file); String makeBinaryDataIdentifierName (const File& file); String stringLiteral (const String& text, int maxLineLength = -1); diff --git a/extras/Projucer/Source/Wizards/jucer_NewFileWizard.cpp b/extras/Projucer/Source/Wizards/jucer_NewFileWizard.cpp index ea7da5d5be..19e2c61725 100644 --- a/extras/Projucer/Source/Wizards/jucer_NewFileWizard.cpp +++ b/extras/Projucer/Source/Wizards/jucer_NewFileWizard.cpp @@ -35,11 +35,10 @@ namespace static String fillInBasicTemplateFields (const File& file, const Project::Item& item, const char* templateName) { return item.project.getFileTemplate (templateName) - .replace ("FILENAME", file.getFileName(), false) - .replace ("DATE", Time::getCurrentTime().toString (true, true, true), false) - .replace ("AUTHOR", SystemStats::getFullUserName(), false) - .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (file), false) - .replace ("INCLUDE_CORRESPONDING_HEADER", CodeHelpers::createIncludeStatement (file.withFileExtension (".h"), file)); + .replace ("%%filename%%", file.getFileName(), false) + .replace ("%%date%%", Time::getCurrentTime().toString (true, true, true), false) + .replace ("%%author%%", SystemStats::getFullUserName(), false) + .replace ("%%include_corresponding_header%%", CodeHelpers::createIncludeStatement (file.withFileExtension (".h"), file)); } static bool fillInNewCppFileTemplate (const File& file, const Project::Item& item, const char* templateName) @@ -169,8 +168,8 @@ public: const File& newFile, const char* templateName) { String content = fillInBasicTemplateFields (newFile, parent, templateName) - .replace ("COMPONENTCLASS", className) - .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (parent.project.getAppIncludeFile(), newFile)); + .replace ("%%component_class%%", className) + .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (parent.project.getAppIncludeFile(), newFile)); if (FileHelpers::overwriteFileWithNewDataIfDifferent (newFile, content)) { diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Animated.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Animated.h index 599c075cfd..6988b26baf 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Animated.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Animated.h @@ -78,9 +78,8 @@ struct AnimatedAppWizard : public NewProjectWizard String windowH = project.getFileTemplate (createCppFile ? "jucer_AnimatedComponentTemplate_h" : "jucer_AnimatedComponentSimpleTemplate_h") - .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false) - .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (contentCompH), false); + .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) + .replace ("%%content_component_class%%", contentCompName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompH, windowH)) failedFiles.add (contentCompH.getFullPathName()); @@ -90,9 +89,9 @@ struct AnimatedAppWizard : public NewProjectWizard if (createCppFile) { String windowCpp = project.getFileTemplate ("jucer_AnimatedComponentTemplate_cpp") - .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) - .replace ("INCLUDE_CORRESPONDING_HEADER", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false); + .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) + .replace ("%%include_corresponding_header%%", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) + .replace ("%%content_component_class%%", contentCompName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompCpp, windowCpp)) failedFiles.add (contentCompCpp.getFullPathName()); @@ -102,11 +101,10 @@ struct AnimatedAppWizard : public NewProjectWizard // create main cpp String mainCpp = project.getFileTemplate ("jucer_MainTemplate_SimpleWindow_cpp") - .replace ("APPHEADERS", appHeaders, false) - .replace ("APPCLASSNAME", CodeHelpers::makeValidIdentifier (appTitle + "Application", false, true, false), false) - .replace ("APPNAME", CppTokeniserFunctions::addEscapeChars (appTitle), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false) - .replace ("ALLOWMORETHANONEINSTANCE", "true", false); + .replace ("%%app_headers%%", appHeaders, false) + .replace ("%%app_class_name%%", CodeHelpers::makeValidIdentifier (appTitle + "Application", false, true, false), false) + .replace ("%%content_component_class%%", contentCompName, false) + .replace ("%%allow_more_than_one_instance%%", "true", false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (mainCppFile, mainCpp)) failedFiles.add (mainCppFile.getFullPathName()); diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h index 8df9cb6dfb..80aa745f1d 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h @@ -78,9 +78,8 @@ struct AudioAppWizard : public NewProjectWizard String windowH = project.getFileTemplate (createCppFile ? "jucer_AudioComponentTemplate_h" : "jucer_AudioComponentSimpleTemplate_h") - .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false) - .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (contentCompH), false); + .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) + .replace ("%%content_component_class%%", contentCompName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompH, windowH)) failedFiles.add (contentCompH.getFullPathName()); @@ -90,9 +89,9 @@ struct AudioAppWizard : public NewProjectWizard if (createCppFile) { String windowCpp = project.getFileTemplate ("jucer_AudioComponentTemplate_cpp") - .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) - .replace ("INCLUDE_CORRESPONDING_HEADER", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false); + .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) + .replace ("%%include_corresponding_header%%", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) + .replace ("%%content_component_class%%", contentCompName, false); @@ -104,11 +103,10 @@ struct AudioAppWizard : public NewProjectWizard // create main cpp String mainCpp = project.getFileTemplate ("jucer_MainTemplate_SimpleWindow_cpp") - .replace ("APPHEADERS", appHeaders, false) - .replace ("APPCLASSNAME", CodeHelpers::makeValidIdentifier (appTitle + "Application", false, true, false), false) - .replace ("APPNAME", CppTokeniserFunctions::addEscapeChars (appTitle), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false) - .replace ("ALLOWMORETHANONEINSTANCE", "true", false); + .replace ("%%app_headers%%", appHeaders, false) + .replace ("%%app_class_name%%", CodeHelpers::makeValidIdentifier (appTitle + "Application", false, true, false), false) + .replace ("%%content_component_class%%", contentCompName, false) + .replace ("%%allow_more_than_one_instance%%", "true", false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (mainCppFile, mainCpp)) failedFiles.add (mainCppFile.getFullPathName()); diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h index 08ed3e8cc5..75ee38e0fa 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h @@ -66,27 +66,25 @@ struct AudioPluginAppWizard : public NewProjectWizard String appHeaders (CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), filterCppFile)); String filterCpp = project.getFileTemplate ("jucer_AudioPluginFilterTemplate_cpp") - .replace ("FILTERHEADERS", CodeHelpers::createIncludeStatement (filterHFile, filterCppFile) + .replace ("%%filter_headers%%", CodeHelpers::createIncludeStatement (filterHFile, filterCppFile) + newLine + CodeHelpers::createIncludeStatement (editorHFile, filterCppFile), false) - .replace ("FILTERCLASSNAME", filterClassName, false) - .replace ("EDITORCLASSNAME", editorClassName, false); + .replace ("%%filter_class_name%%", filterClassName, false) + .replace ("%%editor_class_name%%", editorClassName, false); String filterH = project.getFileTemplate ("jucer_AudioPluginFilterTemplate_h") - .replace ("APPHEADERS", appHeaders, false) - .replace ("FILTERCLASSNAME", filterClassName, false) - .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (filterHFile), false); + .replace ("%%app_headers%%", appHeaders, false) + .replace ("%%filter_class_name%%", filterClassName, false); String editorCpp = project.getFileTemplate ("jucer_AudioPluginEditorTemplate_cpp") - .replace ("EDITORCPPHEADERS", CodeHelpers::createIncludeStatement (filterHFile, filterCppFile) + .replace ("%%editor_cpp_headers%%", CodeHelpers::createIncludeStatement (filterHFile, filterCppFile) + newLine + CodeHelpers::createIncludeStatement (editorHFile, filterCppFile), false) - .replace ("FILTERCLASSNAME", filterClassName, false) - .replace ("EDITORCLASSNAME", editorClassName, false); + .replace ("%%filter_class_name%%", filterClassName, false) + .replace ("%%editor_class_name%%", editorClassName, false); String editorH = project.getFileTemplate ("jucer_AudioPluginEditorTemplate_h") - .replace ("EDITORHEADERS", appHeaders + newLine + CodeHelpers::createIncludeStatement (filterHFile, filterCppFile), false) - .replace ("FILTERCLASSNAME", filterClassName, false) - .replace ("EDITORCLASSNAME", editorClassName, false) - .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (editorHFile), false); + .replace ("%%editor_headers%%", appHeaders + newLine + CodeHelpers::createIncludeStatement (filterHFile, filterCppFile), false) + .replace ("%%filter_class_name%%", filterClassName, false) + .replace ("%%editor_class_name%%", editorClassName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (filterCppFile, filterCpp)) failedFiles.add (filterCppFile.getFullPathName()); diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Console.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Console.h index 853f7fbd55..277bd8b081 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Console.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_Console.h @@ -72,7 +72,7 @@ struct ConsoleAppWizard : public NewProjectWizard String appHeaders (CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), mainCppFile)); String mainCpp = project.getFileTemplate ("jucer_MainConsoleAppTemplate_cpp") - .replace ("APPHEADERS", appHeaders, false); + .replace ("%%app_headers%%", appHeaders, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (mainCppFile, mainCpp)) failedFiles.add (mainCppFile.getFullPathName()); diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h index 50c1fb2fd1..2f39be9a4c 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h @@ -83,9 +83,8 @@ struct GUIAppWizard : public NewProjectWizard String windowH = project.getFileTemplate (createCppFile ? "jucer_ContentCompTemplate_h" : "jucer_ContentCompSimpleTemplate_h") - .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false) - .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (contentCompH), false); + .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) + .replace ("%%content_component_class%%", contentCompName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompH, windowH)) failedFiles.add (contentCompH.getFullPathName()); @@ -95,9 +94,9 @@ struct GUIAppWizard : public NewProjectWizard if (createCppFile) { String windowCpp = project.getFileTemplate ("jucer_ContentCompTemplate_cpp") - .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) - .replace ("INCLUDE_CORRESPONDING_HEADER", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false); + .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) + .replace ("%%include_corresponding_header%%", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) + .replace ("%%content_component_class%%", contentCompName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompCpp, windowCpp)) failedFiles.add (contentCompCpp.getFullPathName()); @@ -110,11 +109,10 @@ struct GUIAppWizard : public NewProjectWizard { String mainCpp = project.getFileTemplate (createWindow ? "jucer_MainTemplate_Window_cpp" : "jucer_MainTemplate_NoWindow_cpp") - .replace ("APPHEADERS", appHeaders, false) - .replace ("APPCLASSNAME", CodeHelpers::makeValidIdentifier (appTitle + "Application", false, true, false), false) - .replace ("APPNAME", CppTokeniserFunctions::addEscapeChars (appTitle), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false) - .replace ("ALLOWMORETHANONEINSTANCE", "true", false); + .replace ("%%app_headers%%", appHeaders, false) + .replace ("%%app_class_name%%", CodeHelpers::makeValidIdentifier (appTitle + "Application", false, true, false), false) + .replace ("%%content_component_class%%", contentCompName, false) + .replace ("%%allow_more_than_one_instance%%", "true", false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (mainCppFile, mainCpp)) failedFiles.add (mainCppFile.getFullPathName()); diff --git a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_openGL.h b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_openGL.h index 600aef4871..44dee4c0fa 100644 --- a/extras/Projucer/Source/Wizards/jucer_ProjectWizard_openGL.h +++ b/extras/Projucer/Source/Wizards/jucer_ProjectWizard_openGL.h @@ -78,9 +78,8 @@ struct OpenGLAppWizard : public NewProjectWizard String windowH = project.getFileTemplate (createCppFile ? "jucer_OpenGLComponentTemplate_h" : "jucer_OpenGLComponentSimpleTemplate_h") - .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false) - .replace ("HEADERGUARD", CodeHelpers::makeHeaderGuardName (contentCompH), false); + .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompH), false) + .replace ("%%content_component_class%%", contentCompName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompH, windowH)) failedFiles.add (contentCompH.getFullPathName()); @@ -90,9 +89,9 @@ struct OpenGLAppWizard : public NewProjectWizard if (createCppFile) { String windowCpp = project.getFileTemplate ("jucer_OpenGLComponentTemplate_cpp") - .replace ("INCLUDE_JUCE", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) - .replace ("INCLUDE_CORRESPONDING_HEADER", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false); + .replace ("%%include_juce%%", CodeHelpers::createIncludeStatement (project.getAppIncludeFile(), contentCompCpp), false) + .replace ("%%include_corresponding_header%%", CodeHelpers::createIncludeStatement (contentCompH, contentCompCpp), false) + .replace ("%%content_component_class%%", contentCompName, false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (contentCompCpp, windowCpp)) failedFiles.add (contentCompCpp.getFullPathName()); @@ -102,11 +101,10 @@ struct OpenGLAppWizard : public NewProjectWizard // create main cpp String mainCpp = project.getFileTemplate ("jucer_MainTemplate_SimpleWindow_cpp") - .replace ("APPHEADERS", appHeaders, false) - .replace ("APPCLASSNAME", CodeHelpers::makeValidIdentifier (appTitle + "Application", false, true, false), false) - .replace ("APPNAME", CppTokeniserFunctions::addEscapeChars (appTitle), false) - .replace ("CONTENTCOMPCLASS", contentCompName, false) - .replace ("ALLOWMORETHANONEINSTANCE", "true", false); + .replace ("%%app_headers%%", appHeaders, false) + .replace ("%%app_class_name%%", CodeHelpers::makeValidIdentifier (appTitle + "Application", false, true, false), false) + .replace ("%%content_component_class%%", contentCompName, false) + .replace ("%%allow_more_than_one_instance%%", "true", false); if (! FileHelpers::overwriteFileWithNewDataIfDifferent (mainCppFile, mainCpp)) failedFiles.add (mainCppFile.getFullPathName());