diff --git a/Makefile b/Makefile index 881856c..5062170 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,10 @@ DEFINES += -DJUCE_GCC=1 -DLINUX=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HE DEFINES_debug += -DDEBUG=1 -D_DEBUG=1 DEFINES_release += -DNDEBUG +DEFINES += -DJucePlugin_Version=1.0.0 +DEFINES += -DJucePlugin_VersionCode=0x01000000 +DEFINES += -DJucePlugin_VersionString=\"1.0.0\" + INCLUDES += -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I $(VST2_SDK_PATH) -I $(LIBSRC_PATH) PACKAGES := JuceLibraryCode Source Synth Fir diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp index 53206af..b70f392 100644 --- a/Source/PluginProcessor.cpp +++ b/Source/PluginProcessor.cpp @@ -749,8 +749,9 @@ void JaySynthAudioProcessor::bank2xml(XmlElement *xml) } } -void JaySynthAudioProcessor::xml2bank(const XmlElement *xml) +void JaySynthAudioProcessor::xml2bank(const XmlElement *_xml) { + XmlElement *xml = (XmlElement*)_xml; while(xml) { // Read ID @@ -760,12 +761,13 @@ void JaySynthAudioProcessor::xml2bank(const XmlElement *xml) break; } JaySynthSound *pPatch = &patches[progID]; - - ScopedPointer xml_patch = xml->getFirstChildElement(); - if (xml_patch->hasTagName ("Patch")) { - // Read patch - xml2patch(xml_patch, pPatch); + XmlElement *xml2 = xml->getFirstChildElement(); + if (xml2->hasTagName ("Patch")) + { + // Read patch + xml2patch(xml2, pPatch); + } } xml = xml->getNextElement(); } @@ -902,10 +904,10 @@ void JaySynthAudioProcessor::loadPatch (const File &file, int index) } else if (String(".xmp") == ext) { - XmlElement *xml = XmlDocument::parse(file); + ScopedPointer xml = XmlDocument::parse(file); if (xml->hasTagName ("JSynth")) { - ScopedPointer xml2 = xml->getFirstChildElement(); + XmlElement *xml2 = xml->getFirstChildElement(); if (xml2->hasTagName ("Patch")) { xml2patch(xml2, currpatch); @@ -957,13 +959,13 @@ void JaySynthAudioProcessor::loadBank (const File &file) } else if (String(".xmb") == ext) { - XmlElement *xml = XmlDocument::parse(file); + ScopedPointer xml = XmlDocument::parse(file); if (xml->hasTagName ("JSynth")) { - XmlElement *xml2 = xml->getFirstChildElement(); + const XmlElement *xml2 = xml->getFirstChildElement(); if (xml2->hasTagName ("Bank")) { - XmlElement *xml3 = xml2->getFirstChildElement(); + const XmlElement *xml3 = xml2->getFirstChildElement(); xml2bank(xml3); setCurrentProgram(getCurrentProgram()); }