From 897c3c8044145328c6a88adf44a505751a030f9c Mon Sep 17 00:00:00 2001 From: jules Date: Sat, 5 Apr 2014 14:53:32 +0100 Subject: [PATCH] Introjucer: correctly setting the JucePlugin_ManufacturerEmail macro. --- .../Introjucer/JuceLibraryCode/BinaryData.cpp | 32 +++++++++---------- .../Introjucer/JuceLibraryCode/BinaryData.h | 4 +-- .../Source/Project/jucer_AudioPluginModule.h | 3 +- .../Source/Project/jucer_ProjectType.cpp | 1 - extras/audio plugin demo/JuceDemoPlugin.jucer | 2 +- .../JuceLibraryCode/AppConfig.h | 4 +-- 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/extras/Introjucer/JuceLibraryCode/BinaryData.cpp b/extras/Introjucer/JuceLibraryCode/BinaryData.cpp index 8fa27b5295..904658ce46 100644 --- a/extras/Introjucer/JuceLibraryCode/BinaryData.cpp +++ b/extras/Introjucer/JuceLibraryCode/BinaryData.cpp @@ -834,30 +834,30 @@ static const unsigned char temp_binary_data_14[] = " //==============================================================================\r\n" " APPCLASSNAME() {}\r\n" "\r\n" -" const String getApplicationName() { return ProjectInfo::projectName; }\r\n" -" const String getApplicationVersion() { return ProjectInfo::versionString; }\r\n" -" bool moreThanOneInstanceAllowed() { return ALLOWMORETHANONEINSTANCE; }\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" "\r\n" " //==============================================================================\r\n" -" void initialise (const String& commandLine)\r\n" +" void initialise (const String& commandLine) override\r\n" " {\r\n" " // Add your application's initialisation code here..\r\n" " }\r\n" "\r\n" -" void shutdown()\r\n" +" void shutdown() override\r\n" " {\r\n" " // Add your application's shutdown code here..\r\n" " }\r\n" "\r\n" " //==============================================================================\r\n" -" void systemRequestedQuit()\r\n" +" void systemRequestedQuit() override\r\n" " {\r\n" " // This is called when the app is being asked to quit: you can ignore this\r\n" " // request and let the app carry on running, or call quit() to allow the app to close.\r\n" " quit();\r\n" " }\r\n" "\r\n" -" void anotherInstanceStarted (const String& commandLine)\r\n" +" void anotherInstanceStarted (const String& commandLine) override\r\n" " {\r\n" " // When another instance of the app is launched while this one is running,\r\n" " // this method is invoked, and the commandLine parameter tells you what\r\n" @@ -893,19 +893,19 @@ static const unsigned char temp_binary_data_15[] = " //==============================================================================\r\n" " APPCLASSNAME() {}\r\n" "\r\n" -" const String getApplicationName() { return ProjectInfo::projectName; }\r\n" -" const String getApplicationVersion() { return ProjectInfo::versionString; }\r\n" -" bool moreThanOneInstanceAllowed() { return ALLOWMORETHANONEINSTANCE; }\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" "\r\n" " //==============================================================================\r\n" -" void initialise (const String& commandLine)\r\n" +" void initialise (const String& commandLine) override\r\n" " {\r\n" " // This method is where you should put your application's initialisation code..\r\n" "\r\n" " mainWindow = new MainWindow();\r\n" " }\r\n" "\r\n" -" void shutdown()\r\n" +" void shutdown() override\r\n" " {\r\n" " // Add your application's shutdown code here..\r\n" "\r\n" @@ -913,14 +913,14 @@ static const unsigned char temp_binary_data_15[] = " }\r\n" "\r\n" " //==============================================================================\r\n" -" void systemRequestedQuit()\r\n" +" void systemRequestedQuit() override\r\n" " {\r\n" " // This is called when the app is being asked to quit: you can ignore this\r\n" " // request and let the app carry on running, or call quit() to allow the app to close.\r\n" " quit();\r\n" " }\r\n" "\r\n" -" void anotherInstanceStarted (const String& commandLine)\r\n" +" void anotherInstanceStarted (const String& commandLine) override\r\n" " {\r\n" " // When another instance of the app is launched while this one is running,\r\n" " // this method is invoked, and the commandLine parameter tells you what\r\n" @@ -1242,8 +1242,8 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw case 0x6fa10171: numBytes = 924; return jucer_ContentCompTemplate_h; case 0x28d496ad: numBytes = 1143; return jucer_InlineComponentTemplate_h; case 0x8905395b: numBytes = 470; return jucer_MainConsoleAppTemplate_cpp; - case 0x5e5ea047: numBytes = 1947; return jucer_MainTemplate_NoWindow_cpp; - case 0x400bc026: numBytes = 3613; return jucer_MainTemplate_Window_cpp; + case 0x5e5ea047: numBytes = 2010; return jucer_MainTemplate_NoWindow_cpp; + case 0x400bc026: numBytes = 3676; return jucer_MainTemplate_Window_cpp; case 0xf4842835: numBytes = 1389; return jucer_NewComponentTemplate_cpp; case 0xe7bf237a: numBytes = 648; return jucer_NewComponentTemplate_h; case 0x02a2a077: numBytes = 262; return jucer_NewCppFileTemplate_cpp; diff --git a/extras/Introjucer/JuceLibraryCode/BinaryData.h b/extras/Introjucer/JuceLibraryCode/BinaryData.h index 7ccadd2365..070811e363 100644 --- a/extras/Introjucer/JuceLibraryCode/BinaryData.h +++ b/extras/Introjucer/JuceLibraryCode/BinaryData.h @@ -52,10 +52,10 @@ namespace BinaryData const int jucer_MainConsoleAppTemplate_cppSize = 470; extern const char* jucer_MainTemplate_NoWindow_cpp; - const int jucer_MainTemplate_NoWindow_cppSize = 1947; + const int jucer_MainTemplate_NoWindow_cppSize = 2010; extern const char* jucer_MainTemplate_Window_cpp; - const int jucer_MainTemplate_Window_cppSize = 3613; + const int jucer_MainTemplate_Window_cppSize = 3676; extern const char* jucer_NewComponentTemplate_cpp; const int jucer_NewComponentTemplate_cppSize = 1389; diff --git a/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h b/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h index 9fa843c79c..43e6f5c2ca 100644 --- a/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h +++ b/extras/Introjucer/Source/Project/jucer_AudioPluginModule.h @@ -38,7 +38,6 @@ namespace Value getPluginName (Project& project) { return project.getProjectValue ("pluginName"); } Value getPluginDesc (Project& project) { return project.getProjectValue ("pluginDesc"); } Value getPluginManufacturer (Project& project) { return project.getProjectValue ("pluginManufacturer"); } - Value getPluginManufacturerEmail (Project& project) { return project.getProjectValue ("pluginManufacturerEmail"); } Value getPluginManufacturerCode (Project& project) { return project.getProjectValue ("pluginManufacturerCode"); } Value getPluginCode (Project& project) { return project.getProjectValue ("pluginCode"); } Value getPluginChannelConfigs (Project& project) { return project.getProjectValue ("pluginChannelConfigs"); } @@ -152,7 +151,7 @@ namespace flags.set ("JucePlugin_Desc", valueToStringLiteral (getPluginDesc (project))); flags.set ("JucePlugin_Manufacturer", valueToStringLiteral (getPluginManufacturer (project))); flags.set ("JucePlugin_ManufacturerWebsite", valueToStringLiteral (project.getCompanyWebsite())); - flags.set ("JucePlugin_ManufacturerEmail", valueToStringLiteral (getPluginManufacturerEmail (project))); + flags.set ("JucePlugin_ManufacturerEmail", valueToStringLiteral (project.getCompanyEmail())); flags.set ("JucePlugin_ManufacturerCode", valueToCharLiteral (getPluginManufacturerCode (project))); flags.set ("JucePlugin_PluginCode", valueToCharLiteral (getPluginCode (project))); flags.set ("JucePlugin_MaxNumInputChannels", String (countMaxPluginChannels (getPluginChannelConfigs (project).toString(), true))); diff --git a/extras/Introjucer/Source/Project/jucer_ProjectType.cpp b/extras/Introjucer/Source/Project/jucer_ProjectType.cpp index c0f970a2c4..1cad0208f9 100644 --- a/extras/Introjucer/Source/Project/jucer_ProjectType.cpp +++ b/extras/Introjucer/Source/Project/jucer_ProjectType.cpp @@ -202,7 +202,6 @@ public: setValueIfVoid (getPluginName (project), project.getTitle()); setValueIfVoid (getPluginDesc (project), project.getTitle()); setValueIfVoid (getPluginManufacturer (project), "yourcompany"); - setValueIfVoid (getPluginManufacturerEmail (project), "support@yourcompany.com"); setValueIfVoid (getPluginManufacturerCode (project), "Manu"); setValueIfVoid (getPluginCode (project), "Plug"); setValueIfVoid (getPluginChannelConfigs (project), "{1, 1}, {2, 2}"); diff --git a/extras/audio plugin demo/JuceDemoPlugin.jucer b/extras/audio plugin demo/JuceDemoPlugin.jucer index 3c975b2a60..c290673543 100644 --- a/extras/audio plugin demo/JuceDemoPlugin.jucer +++ b/extras/audio plugin demo/JuceDemoPlugin.jucer @@ -12,7 +12,7 @@ companyName="Raw Material Software Ltd." aaxIdentifier="com.yourcompany.JuceDemoPlugin" buildAAX="0" pluginAAXCategory="AAX_ePlugInCategory_Dynamics" includeBinaryInAppConfig="1" buildVST3="1" pluginManufacturerEmail="support@yourcompany.com" - companyWebsite="www.yourcompany.com"> + companyWebsite="www.juce.com" companyEmail="info@juce.com"> diff --git a/extras/audio plugin demo/JuceLibraryCode/AppConfig.h b/extras/audio plugin demo/JuceLibraryCode/AppConfig.h index 0af16bcf84..d9a0469507 100644 --- a/extras/audio plugin demo/JuceLibraryCode/AppConfig.h +++ b/extras/audio plugin demo/JuceLibraryCode/AppConfig.h @@ -201,10 +201,10 @@ #define JucePlugin_Manufacturer "Raw Material Software" #endif #ifndef JucePlugin_ManufacturerWebsite - #define JucePlugin_ManufacturerWebsite "www.yourcompany.com" + #define JucePlugin_ManufacturerWebsite "www.juce.com" #endif #ifndef JucePlugin_ManufacturerEmail - #define JucePlugin_ManufacturerEmail "support@yourcompany.com" + #define JucePlugin_ManufacturerEmail "info@juce.com" #endif #ifndef JucePlugin_ManufacturerCode #define JucePlugin_ManufacturerCode 'RawM'