Use juce base64 code (needs rebuild)

libs/juce/source/modules/juce_audio_plugin_client/LV2/base64/Base64.cpp

@@ -1,83 +0,0 @@
-/*
-   base64.cpp and base64.h
-
-   Copyright (C) 2004-2008 René Nyffenegger
-
-   This source code is provided 'as-is', without any express or implied
-   warranty. In no event will the author be held liable for any damages
-   arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any purpose,
-   including commercial applications, and to alter it and redistribute it
-   freely, subject to the following restrictions:
-
-   1. The origin of this source code must not be misrepresented; you must not
-      claim that you wrote the original source code. If you use this source code
-      in a product, an acknowledgment in the product documentation would be
-      appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and must not be
-      misrepresented as being the original source code.
-
-   3. This notice may not be removed or altered from any source distribution.
-
-   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
-
-*/
-
-// source code was edited - removed everything not needed for juce-lv2
-
-#include <iostream>
-
-static const std::string base64_chars =
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-        "abcdefghijklmnopqrstuvwxyz"
-        "0123456789+/";
-
-std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len) {
-    std::string ret;
-    int i = 0;
-    int j = 0;
-    unsigned char char_array_3[3];
-    unsigned char char_array_4[4];
-
-    while (in_len--) {
-        char_array_3[i++] = *(bytes_to_encode++);
-        if (i == 3) {
-            char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-            char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
-            char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
-            char_array_4[3] = char_array_3[2] & 0x3f;
-
-            for(i = 0; (i <4) ; i++)
-                ret += base64_chars[char_array_4[i]];
-            i = 0;
-        }
-    }
-
-    if (i)
-    {
-        for(j = i; j < 3; j++)
-            char_array_3[j] = '\0';
-
-        char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-        char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
-        char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
-        char_array_4[3] = char_array_3[2] & 0x3f;
-
-        for (j = 0; (j < i + 1); j++)
-            ret += base64_chars[char_array_4[j]];
-
-        while((i++ < 3))
-            ret += '=';
-
-    }
-
-    return ret;
-
-}
-
-const String Base64Encode (const MemoryBlock &dataToEncode)
-{
-    return (base64_encode ((unsigned char const *)dataToEncode.getData(), dataToEncode.getSize()).c_str());
-}

libs/juce/source/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp

@@ -83,11 +83,6 @@ namespace juce
 #define JUCE_LV2_STATE_STRING_URI "urn:juce:stateString"
 #define JUCE_LV2_STATE_BINARY_URI "urn:juce:stateBinary"
 
-#if JucePlugin_WantsLV2State && ! JucePlugin_WantsLV2StateString
- // FIXME - juce base64 algorithm does not conform to RFC used in LV2
- #include "base64/Base64.cpp"
-#endif
-
 //==============================================================================
 // Various helper functions for creating the ttl files
 
@@ -455,7 +450,7 @@ const String makePresetsFile (AudioProcessor* const filter)
  #else
         MemoryBlock chunkMemory;
         filter->getCurrentProgramStateInformation(chunkMemory);
-        const String chunkString(Base64Encode(chunkMemory));
+        const String chunkString(Base64::toBase64(chunkMemory.getData(), chunkMemory.getSize()));
 
         preset += "        <" JUCE_LV2_STATE_BINARY_URI "> [\n";
         preset += "            a atom:Chunk ;\n";
@@ -560,7 +555,7 @@ public:
     }
 
 private:
-    bool initialised;
+    volatile bool initialised;
 };
 #endif