Updated some introjucer-generated defines.

extras/Introjucer/Source/Project/jucer_AudioPluginModule.h

@@ -77,49 +77,62 @@ namespace
         return maxVal;
     }
 
+    String valueToBool (const Value& v)
+    {
+        return static_cast<bool> (v.getValue()) ? "1" : "0";
+    }
+
     void writePluginCharacteristicsFile (ProjectSaver& projectSaver)
     {
         Project& project = projectSaver.getProject();
 
+        StringPairArray flags;
+        flags.set ("JucePlugin_Build_VST",                   valueToBool (shouldBuildVST  (project)));
+        flags.set ("JucePlugin_Build_AU",                    valueToBool (shouldBuildAU   (project)));
+        flags.set ("JucePlugin_Build_RTAS",                  valueToBool (shouldBuildRTAS (project)));
+        flags.set ("JucePlugin_Name",                        getPluginName (project).toString().quoted());
+        flags.set ("JucePlugin_Desc",                        getPluginDesc (project).toString().quoted());
+        flags.set ("JucePlugin_Manufacturer",                getPluginManufacturer (project).toString().quoted());
+        flags.set ("JucePlugin_ManufacturerCode",            getPluginManufacturerCode (project).toString().trim().substring (0, 4).quoted ('\''));
+        flags.set ("JucePlugin_PluginCode",                  getPluginCode (project).toString().trim().substring (0, 4).quoted ('\''));
+        flags.set ("JucePlugin_MaxNumInputChannels",         String (countMaxPluginChannels (getPluginChannelConfigs (project).toString(), true)));
+        flags.set ("JucePlugin_MaxNumOutputChannels",        String (countMaxPluginChannels (getPluginChannelConfigs (project).toString(), false)));
+        flags.set ("JucePlugin_PreferredChannelConfigurations", getPluginChannelConfigs (project).toString());
+        flags.set ("JucePlugin_IsSynth",                     valueToBool (getPluginIsSynth (project)));
+        flags.set ("JucePlugin_WantsMidiInput",              valueToBool (getPluginWantsMidiInput (project)));
+        flags.set ("JucePlugin_ProducesMidiOutput",          valueToBool (getPluginProducesMidiOut (project)));
+        flags.set ("JucePlugin_SilenceInProducesSilenceOut", valueToBool (getPluginSilenceInProducesSilenceOut (project)));
+        flags.set ("JucePlugin_TailLengthSeconds",           String (static_cast <double> (getPluginTailLengthSeconds (project).getValue())));
+        flags.set ("JucePlugin_EditorRequiresKeyboardFocus", valueToBool (getPluginEditorNeedsKeyFocus (project)));
+        flags.set ("JucePlugin_VersionCode",                 project.getVersionAsHex());
+        flags.set ("JucePlugin_VersionString",               project.getVersion().toString().quoted());
+        flags.set ("JucePlugin_VSTUniqueID",                 "JucePlugin_PluginCode");
+        flags.set ("JucePlugin_VSTCategory",                 static_cast <bool> (getPluginIsSynth (project).getValue()) ? "kPlugCategSynth" : "kPlugCategEffect");
+        flags.set ("JucePlugin_AUMainType",                  static_cast <bool> (getPluginIsSynth (project).getValue()) ? "kAudioUnitType_MusicDevice" : "kAudioUnitType_Effect");
+        flags.set ("JucePlugin_AUSubType",                   "JucePlugin_PluginCode");
+        flags.set ("JucePlugin_AUExportPrefix",              getPluginAUExportPrefix (project).toString());
+        flags.set ("JucePlugin_AUExportPrefixQuoted",        getPluginAUExportPrefix (project).toString().quoted());
+        flags.set ("JucePlugin_AUManufacturerCode",          "JucePlugin_ManufacturerCode");
+        flags.set ("JucePlugin_CFBundleIdentifier",          project.getBundleIdentifier().toString());
+        flags.set ("JucePlugin_AUCocoaViewClassName",        getPluginAUCocoaViewClassName (project).toString());
+        flags.set ("JucePlugin_RTASCategory",                getPluginRTASCategoryCode (project));
+        flags.set ("JucePlugin_RTASManufacturerCode",        "JucePlugin_ManufacturerCode");
+        flags.set ("JucePlugin_RTASProductId",               "JucePlugin_PluginCode");
+
         MemoryOutputStream mem;
 
         mem << "//==============================================================================" << newLine
             << "// Audio plugin settings.." << newLine
-            << newLine
-            << "#define JucePlugin_Build_VST    " << ((bool) shouldBuildVST (project).getValue() ? 1 : 0) << newLine
-            << "#define JucePlugin_Build_AU     " << ((bool) shouldBuildAU (project).getValue() ? 1 : 0) << newLine
-            << "#define JucePlugin_Build_RTAS   " << ((bool) shouldBuildRTAS (project).getValue() ? 1 : 0) << newLine
-            << newLine
-            << "#define JucePlugin_Name                 "  << getPluginName (project).toString().quoted() << newLine
-            << "#define JucePlugin_Desc                 "  << getPluginDesc (project).toString().quoted() << newLine
-            << "#define JucePlugin_Manufacturer         "  << getPluginManufacturer (project).toString().quoted() << newLine
-            << "#define JucePlugin_ManufacturerCode     '" << getPluginManufacturerCode (project).toString().trim().substring (0, 4) << "'" << newLine
-            << "#define JucePlugin_PluginCode           '" << getPluginCode (project).toString().trim().substring (0, 4) << "'" << newLine
-            << "#define JucePlugin_MaxNumInputChannels  "  << countMaxPluginChannels (getPluginChannelConfigs (project).toString(), true) << newLine
-            << "#define JucePlugin_MaxNumOutputChannels "  << countMaxPluginChannels (getPluginChannelConfigs (project).toString(), false) << newLine
-            << "#define JucePlugin_PreferredChannelConfigurations   " << getPluginChannelConfigs (project).toString() << newLine
-            << "#define JucePlugin_IsSynth              "  << ((bool) getPluginIsSynth (project).getValue() ? 1 : 0) << newLine
-            << "#define JucePlugin_WantsMidiInput       "  << ((bool) getPluginWantsMidiInput (project).getValue() ? 1 : 0) << newLine
-            << "#define JucePlugin_ProducesMidiOutput   "  << ((bool) getPluginProducesMidiOut (project).getValue() ? 1 : 0) << newLine
-            << "#define JucePlugin_SilenceInProducesSilenceOut  " << ((bool) getPluginSilenceInProducesSilenceOut (project).getValue() ? 1 : 0) << newLine
-            << "#define JucePlugin_TailLengthSeconds    "  << (double) getPluginTailLengthSeconds (project).getValue() << newLine
-            << "#define JucePlugin_EditorRequiresKeyboardFocus  " << ((bool) getPluginEditorNeedsKeyFocus (project).getValue() ? 1 : 0) << newLine
-            << "#define JucePlugin_VersionCode          "  << project.getVersionAsHex() << newLine
-            << "#define JucePlugin_VersionString        "  << project.getVersion().toString().quoted() << newLine
-            << "#define JucePlugin_VSTUniqueID          JucePlugin_PluginCode" << newLine
-            << "#define JucePlugin_VSTCategory          "  << ((bool) getPluginIsSynth (project).getValue() ? "kPlugCategSynth" : "kPlugCategEffect") << newLine
-            << "#define JucePlugin_AUMainType           "  << ((bool) getPluginIsSynth (project).getValue() ? "kAudioUnitType_MusicDevice" : "kAudioUnitType_Effect") << newLine
-            << "#define JucePlugin_AUSubType            JucePlugin_PluginCode" << newLine
-            << "#define JucePlugin_AUExportPrefix       "  << getPluginAUExportPrefix (project).toString() << newLine
-            << "#define JucePlugin_AUExportPrefixQuoted "  << getPluginAUExportPrefix (project).toString().quoted() << newLine
-            << "#define JucePlugin_AUManufacturerCode   JucePlugin_ManufacturerCode" << newLine
-            << "#define JucePlugin_CFBundleIdentifier   "  << project.getBundleIdentifier().toString() << newLine
-            << "#define JucePlugin_AUCocoaViewClassName "  << getPluginAUCocoaViewClassName (project).toString() << newLine
-            << "#define JucePlugin_RTASCategory         "  << getPluginRTASCategoryCode (project) << newLine
-            << "#define JucePlugin_RTASManufacturerCode JucePlugin_ManufacturerCode" << newLine
-            << "#define JucePlugin_RTASProductId        JucePlugin_PluginCode" << newLine
             << newLine;
 
+        for (int i = 0; i < flags.size(); ++i)
+        {
+            mem << "#ifndef  " << flags.getAllKeys()[i] << newLine
+                << " #define " << flags.getAllKeys()[i].paddedRight (' ', 32) << "  "
+                               << flags.getAllValues()[i] << newLine
+                << "#endif" << newLine;
+        }
+
         projectSaver.setExtraAppConfigFileContent (mem.toString());
     }
 }

extras/audio plugin demo/JuceLibraryCode/AppConfig.h

@@ -136,37 +136,98 @@
 //==============================================================================
 // Audio plugin settings..
 
-#define JucePlugin_Build_VST    1
-#define JucePlugin_Build_AU     1
-#define JucePlugin_Build_RTAS   0
-
-#define JucePlugin_Name                 "Juce Demo Plugin"
-#define JucePlugin_Desc                 "Juce Demo Plugin"
-#define JucePlugin_Manufacturer         "Raw Material Software"
-#define JucePlugin_ManufacturerCode     'RawM'
-#define JucePlugin_PluginCode           'Jcdm'
-#define JucePlugin_MaxNumInputChannels  2
-#define JucePlugin_MaxNumOutputChannels 2
-#define JucePlugin_PreferredChannelConfigurations   {1, 1}, {2, 2}
-#define JucePlugin_IsSynth              0
-#define JucePlugin_WantsMidiInput       1
-#define JucePlugin_ProducesMidiOutput   1
-#define JucePlugin_SilenceInProducesSilenceOut  0
-#define JucePlugin_TailLengthSeconds    0
-#define JucePlugin_EditorRequiresKeyboardFocus  1
-#define JucePlugin_VersionCode          0x10000
-#define JucePlugin_VersionString        "1.0.0"
-#define JucePlugin_VSTUniqueID          JucePlugin_PluginCode
-#define JucePlugin_VSTCategory          kPlugCategEffect
-#define JucePlugin_AUMainType           kAudioUnitType_Effect
-#define JucePlugin_AUSubType            JucePlugin_PluginCode
-#define JucePlugin_AUExportPrefix       JuceDemoProjectAU
-#define JucePlugin_AUExportPrefixQuoted "JuceDemoProjectAU"
-#define JucePlugin_AUManufacturerCode   JucePlugin_ManufacturerCode
-#define JucePlugin_CFBundleIdentifier   com.rawmaterialsoftware.JuceDemoPlugin
-#define JucePlugin_AUCocoaViewClassName JuceDemoProjectAU_V1
-#define JucePlugin_RTASCategory         ePlugInCategory_None
-#define JucePlugin_RTASManufacturerCode JucePlugin_ManufacturerCode
-#define JucePlugin_RTASProductId        JucePlugin_PluginCode
+#ifndef  JucePlugin_Build_VST
+ #define JucePlugin_Build_VST              1
+#endif
+#ifndef  JucePlugin_Build_AU
+ #define JucePlugin_Build_AU               1
+#endif
+#ifndef  JucePlugin_Build_RTAS
+ #define JucePlugin_Build_RTAS             0
+#endif
+#ifndef  JucePlugin_Name
+ #define JucePlugin_Name                   "Juce Demo Plugin"
+#endif
+#ifndef  JucePlugin_Desc
+ #define JucePlugin_Desc                   "Juce Demo Plugin"
+#endif
+#ifndef  JucePlugin_Manufacturer
+ #define JucePlugin_Manufacturer           "Raw Material Software"
+#endif
+#ifndef  JucePlugin_ManufacturerCode
+ #define JucePlugin_ManufacturerCode       'RawM'
+#endif
+#ifndef  JucePlugin_PluginCode
+ #define JucePlugin_PluginCode             'Jcdm'
+#endif
+#ifndef  JucePlugin_MaxNumInputChannels
+ #define JucePlugin_MaxNumInputChannels    2
+#endif
+#ifndef  JucePlugin_MaxNumOutputChannels
+ #define JucePlugin_MaxNumOutputChannels   2
+#endif
+#ifndef  JucePlugin_PreferredChannelConfigurations
+ #define JucePlugin_PreferredChannelConfigurations  {1, 1}, {2, 2}
+#endif
+#ifndef  JucePlugin_IsSynth
+ #define JucePlugin_IsSynth                0
+#endif
+#ifndef  JucePlugin_WantsMidiInput
+ #define JucePlugin_WantsMidiInput         1
+#endif
+#ifndef  JucePlugin_ProducesMidiOutput
+ #define JucePlugin_ProducesMidiOutput     1
+#endif
+#ifndef  JucePlugin_SilenceInProducesSilenceOut
+ #define JucePlugin_SilenceInProducesSilenceOut  0
+#endif
+#ifndef  JucePlugin_TailLengthSeconds
+ #define JucePlugin_TailLengthSeconds      0
+#endif
+#ifndef  JucePlugin_EditorRequiresKeyboardFocus
+ #define JucePlugin_EditorRequiresKeyboardFocus  1
+#endif
+#ifndef  JucePlugin_VersionCode
+ #define JucePlugin_VersionCode            0x10000
+#endif
+#ifndef  JucePlugin_VersionString
+ #define JucePlugin_VersionString          "1.0.0"
+#endif
+#ifndef  JucePlugin_VSTUniqueID
+ #define JucePlugin_VSTUniqueID            JucePlugin_PluginCode
+#endif
+#ifndef  JucePlugin_VSTCategory
+ #define JucePlugin_VSTCategory            kPlugCategEffect
+#endif
+#ifndef  JucePlugin_AUMainType
+ #define JucePlugin_AUMainType             kAudioUnitType_Effect
+#endif
+#ifndef  JucePlugin_AUSubType
+ #define JucePlugin_AUSubType              JucePlugin_PluginCode
+#endif
+#ifndef  JucePlugin_AUExportPrefix
+ #define JucePlugin_AUExportPrefix         JuceDemoProjectAU
+#endif
+#ifndef  JucePlugin_AUExportPrefixQuoted
+ #define JucePlugin_AUExportPrefixQuoted   "JuceDemoProjectAU"
+#endif
+#ifndef  JucePlugin_AUManufacturerCode
+ #define JucePlugin_AUManufacturerCode     JucePlugin_ManufacturerCode
+#endif
+#ifndef  JucePlugin_CFBundleIdentifier
+ #define JucePlugin_CFBundleIdentifier     com.rawmaterialsoftware.JuceDemoPlugin
+#endif
+#ifndef  JucePlugin_AUCocoaViewClassName
+ #define JucePlugin_AUCocoaViewClassName   JuceDemoProjectAU_V1
+#endif
+#ifndef  JucePlugin_RTASCategory
+ #define JucePlugin_RTASCategory           ePlugInCategory_None
+#endif
+#ifndef  JucePlugin_RTASManufacturerCode
+ #define JucePlugin_RTASManufacturerCode   JucePlugin_ManufacturerCode
+#endif
+#ifndef  JucePlugin_RTASProductId
+ #define JucePlugin_RTASProductId          JucePlugin_PluginCode
+#endif
 
 #endif  // __JUCE_APPCONFIG_0NRD9LLGO__

modules/juce_audio_formats/juce_audio_formats.cpp

@@ -43,7 +43,9 @@
 #if JUCE_MAC
  #define Point CarbonDummyPointName
  #define Component CarbonDummyCompName
- #import <QTKit/QTKit.h>
+ #if JUCE_QUICKTIME
+  #import <QTKit/QTKit.h>
+ #endif
  #include <AudioToolbox/AudioToolbox.h>
  #undef Component
  #undef Point