Rename the custom mini juce fork to "water"

Makefile

@@ -55,9 +55,9 @@ ALL_LIBS += $(MODULEDIR)/carla_engine_plugin.a
 ALL_LIBS += $(MODULEDIR)/carla_plugin.a
 ALL_LIBS += $(MODULEDIR)/jackbridge.a
 ALL_LIBS += $(MODULEDIR)/native-plugins.a
-ALL_LIBS += $(MODULEDIR)/juce_audio_graph.a
 ALL_LIBS += $(MODULEDIR)/lilv.a
 ALL_LIBS += $(MODULEDIR)/rtmempool.a
+ALL_LIBS += $(MODULEDIR)/water.a
 
 ifeq ($(HAVE_DGL),true)
 ALL_LIBS += $(MODULEDIR)/dgl.a
@@ -149,9 +149,9 @@ theme: libs
 # Binaries (posix32)
 
 LIBS_POSIX32  = $(MODULEDIR)/jackbridge.posix32.a
-LIBS_POSIX32 += $(MODULEDIR)/juce_audio_graph.posix32.a
 LIBS_POSIX32 += $(MODULEDIR)/lilv.posix32.a
 LIBS_POSIX32 += $(MODULEDIR)/rtmempool.posix32.a
+LIBS_POSIX32 += $(MODULEDIR)/water.posix32.a
 
 posix32: $(LIBS_POSIX32)
 	$(MAKE) -C source/bridges-plugin posix32
@@ -161,9 +161,9 @@ posix32: $(LIBS_POSIX32)
 # Binaries (posix64)
 
 LIBS_POSIX64  = $(MODULEDIR)/jackbridge.posix64.a
-LIBS_POSIX64 += $(MODULEDIR)/juce_audio_graph.posix64.a
 LIBS_POSIX64 += $(MODULEDIR)/lilv.posix64.a
 LIBS_POSIX64 += $(MODULEDIR)/rtmempool.posix64.a
+LIBS_POSIX64 += $(MODULEDIR)/water.posix64.a
 
 posix64: $(LIBS_POSIX64)
 	$(MAKE) -C source/bridges-plugin posix64
@@ -177,9 +177,9 @@ LIBS_WIN32  = $(MODULEDIR)/jackbridge.win32.a
 else
 LIBS_WIN32  = $(MODULEDIR)/jackbridge.win32e.a
 endif
-LIBS_WIN32 += $(MODULEDIR)/juce_audio_graph.win32.a
 LIBS_WIN32 += $(MODULEDIR)/lilv.win32.a
 LIBS_WIN32 += $(MODULEDIR)/rtmempool.win32.a
+LIBS_WIN32 += $(MODULEDIR)/water.win32.a
 
 win32: $(LIBS_WIN32)
 	$(MAKE) -C source/bridges-plugin win32
@@ -193,9 +193,9 @@ LIBS_WIN64  = $(MODULEDIR)/jackbridge.win64.a
 else
 LIBS_WIN64  = $(MODULEDIR)/jackbridge.win64e.a
 endif
-LIBS_WIN64 += $(MODULEDIR)/juce_audio_graph.win64.a
 LIBS_WIN64 += $(MODULEDIR)/lilv.win64.a
 LIBS_WIN64 += $(MODULEDIR)/rtmempool.win64.a
+LIBS_WIN64 += $(MODULEDIR)/water.win64.a
 
 win64: $(LIBS_WIN64)
 	$(MAKE) -C source/bridges-plugin win64

source/Makefile.mk

@@ -379,8 +379,8 @@ endif
 ifeq ($(LINUX),true)
 HYLIA_FLAGS           = -DLINK_PLATFORM_LINUX=1
 JACKBRIDGE_LIBS       = -ldl -lpthread -lrt
-JUCE_CORE_LIBS        = -ldl -lpthread -lrt
 LILV_LIBS             = -ldl -lm -lrt
+WATER_LIBS            = -ldl -lpthread -lrt
 ifeq ($(HAVE_DGL),true)
 DGL_FLAGS             = $(shell pkg-config --cflags gl x11)
 DGL_LIBS              = $(shell pkg-config --libs gl x11)
@@ -401,21 +401,21 @@ ifeq ($(MACOS),true)
 DGL_LIBS               = -framework OpenGL -framework Cocoa
 HYLIA_FLAGS            = -DLINK_PLATFORM_MACOSX=1
 JACKBRIDGE_LIBS        = -ldl -lpthread
-JUCE_CORE_LIBS         = -framework AppKit
 LILV_LIBS              = -ldl -lm
 RTAUDIO_FLAGS         += -D__MACOSX_CORE__
 RTMIDI_FLAGS          += -D__MACOSX_CORE__
+WATER_LIBS             = -framework AppKit
 endif
 
 ifeq ($(WIN32),true)
 DGL_LIBS               = -lopengl32 -lgdi32
 HYLIA_FLAGS            = -DLINK_PLATFORM_WINDOWS=1
 JACKBRIDGE_LIBS        = -lpthread
-JUCE_CORE_LIBS         = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm
 LILV_LIBS              = -lm
 RTAUDIO_FLAGS         += -D__WINDOWS_ASIO__ -D__WINDOWS_DS__ -D__WINDOWS_WASAPI__
 RTAUDIO_LIBS          += -ldsound -luuid -lksuser -lwinmm
 RTMIDI_FLAGS          += -D__WINDOWS_MM__
+WATER_LIBS             = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm
 endif
 
 # --------------------------------------------------------------

source/backend/CarlaEngine.hpp

@@ -24,7 +24,7 @@
 struct CarlaOscData;
 #endif
 
-namespace juce2 {
+namespace water {
 class MemoryOutputStream;
 class XmlDocument;
 }
@@ -1134,12 +1134,12 @@ protected:
     /*!
      * Common save project function for main engine and plugin.
      */
-    void saveProjectInternal(juce2::MemoryOutputStream& outStrm) const;
+    void saveProjectInternal(water::MemoryOutputStream& outStrm) const;
 
     /*!
      * Common load project function for main engine and plugin.
      */
-    bool loadProjectInternal(juce2::XmlDocument& xmlDoc);
+    bool loadProjectInternal(water::XmlDocument& xmlDoc);
 
 #ifndef BUILD_BRIDGE
     // -------------------------------------------------------------------

source/backend/CarlaHostCommon.cpp

@@ -18,7 +18,7 @@
 #include "CarlaHost.h"
 #include "CarlaString.hpp"
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
 namespace CB = CarlaBackend;
 
@@ -106,7 +106,7 @@ const char* carla_get_library_filename()
 
     if (ret.isEmpty())
     {
-        using namespace juce2;
+        using namespace water;
         ret = File(File::getSpecialLocation(File::currentExecutableFile)).getFullPathName().toRawUTF8();
     }
 
@@ -121,7 +121,7 @@ const char* carla_get_library_folder()
 
     if (ret.isEmpty())
     {
-        using namespace juce2;
+        using namespace water;
         ret = File(File::getSpecialLocation(File::currentExecutableFile).getParentDirectory()).getFullPathName().toRawUTF8();
     }
 

source/backend/CarlaStandalone.cpp

@@ -28,7 +28,7 @@
 #include "CarlaBase64Utils.hpp"
 
 #ifdef BUILD_BRIDGE
-# include "juce_audio_graph/juce_audio_graph.h"
+# include "water/water.h"
 #else
 # include "CarlaLogThread.hpp"
 #endif
@@ -144,7 +144,7 @@ static void carla_engine_init_common()
     gStandalone.engine->setFileCallback(gStandalone.fileCallback, gStandalone.fileCallbackPtr);
 
 #ifdef BUILD_BRIDGE
-    using juce2::File;
+    using water::File;
     File juceBinaryDir(File::getSpecialLocation(File::currentExecutableFile).getParentDirectory());
 
     /*

source/backend/CarlaStandaloneNSM.cpp

@@ -29,7 +29,7 @@
 #include "CarlaOscUtils.hpp"
 #include "CarlaString.hpp"
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
 namespace CB = CarlaBackend;
 
@@ -267,7 +267,7 @@ protected:
         }
         else
         {
-            using namespace juce2;
+            using namespace water;
 
             if (carla_is_engine_running())
                 carla_engine_close();

source/backend/CarlaUtils.cpp

@@ -513,7 +513,7 @@ const char* carla_get_supported_file_extensions()
 #if 0
         // Audio files
         {
-            using namespace juce2;
+            using namespace water;
 
             AudioFormatManager afm;
             afm.registerBasicFormats();
@@ -693,7 +693,7 @@ const char* carla_get_library_filename()
 
     if (ret.isEmpty())
     {
-        using juce2::File;
+        using water::File;
         ret = File(File::getSpecialLocation(File::currentExecutableFile)).getFullPathName().toRawUTF8();
     }
 
@@ -708,7 +708,7 @@ const char* carla_get_library_folder()
 
     if (ret.isEmpty())
     {
-        using juce2::File;
+        using water::File;
         ret = File(File::getSpecialLocation(File::currentExecutableFile).getParentDirectory()).getFullPathName().toRawUTF8();
     }
 

source/backend/Makefile

@@ -26,10 +26,10 @@ STANDALONE_LIBS  = $(MODULEDIR)/carla_engine.a
 STANDALONE_LIBS += $(MODULEDIR)/carla_plugin.a
 
 STANDALONE_LIBS += $(MODULEDIR)/jackbridge.a
-STANDALONE_LIBS += $(MODULEDIR)/juce_audio_graph.a
 STANDALONE_LIBS += $(MODULEDIR)/lilv.a
 STANDALONE_LIBS += $(MODULEDIR)/native-plugins.a
 STANDALONE_LIBS += $(MODULEDIR)/rtmempool.a
+STANDALONE_LIBS += $(MODULEDIR)/water.a
 
 ifeq ($(HAVE_DGL),true)
 STANDALONE_LIBS += $(MODULEDIR)/dgl.a
@@ -42,16 +42,16 @@ endif
 STANDALONE_LIBS += $(MODULEDIR)/rtaudio.a
 STANDALONE_LIBS += $(MODULEDIR)/rtmidi.a
 
-UTILS_LIBS += $(MODULEDIR)/juce_audio_graph.a
 UTILS_LIBS += $(MODULEDIR)/lilv.a
+UTILS_LIBS += $(MODULEDIR)/water.a
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
 STANDALONE_LINK_FLAGS  = $(JACKBRIDGE_LIBS)
-STANDALONE_LINK_FLAGS += $(JUCE_CORE_LIBS)
 STANDALONE_LINK_FLAGS += $(LILV_LIBS)
 STANDALONE_LINK_FLAGS += $(NATIVE_PLUGINS_LIBS)
 STANDALONE_LINK_FLAGS += $(RTMEMPOOL_LIBS)
+STANDALONE_LINK_FLAGS += $(WATER_LIBS)
 
 STANDALONE_LINK_FLAGS += $(RTAUDIO_LIBS)
 STANDALONE_LINK_FLAGS += $(RTMIDI_LIBS)
@@ -76,8 +76,8 @@ ifeq ($(HAVE_X11),true)
 STANDALONE_LINK_FLAGS += $(X11_LIBS)
 endif
 
-UTILS_LINK_FLAGS += $(JUCE_CORE_LIBS)
 UTILS_LINK_FLAGS += $(LILV_LIBS)
+UTILS_LINK_FLAGS += $(WATER_LIBS)
 
 ifeq ($(HAVE_X11),true)
 UTILS_LINK_FLAGS += $(X11_LIBS)

source/backend/engine/CarlaEngine.cpp

@@ -35,16 +35,16 @@
 
 #include "jackbridge/JackBridge.hpp"
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
-using juce2::Array;
-using juce2::CharPointer_UTF8;
-using juce2::File;
-using juce2::MemoryOutputStream;
-using juce2::String;
-using juce2::StringArray;
-using juce2::XmlDocument;
-using juce2::XmlElement;
+using water::Array;
+using water::CharPointer_UTF8;
+using water::File;
+using water::MemoryOutputStream;
+using water::String;
+using water::StringArray;
+using water::XmlDocument;
+using water::XmlElement;
 
 CARLA_BACKEND_START_NAMESPACE
 
@@ -1672,7 +1672,7 @@ void CarlaEngine::setPluginPeaks(const uint pluginId, float const inPeaks[2], fl
     pluginData.outsPeak[1] = outPeaks[1];
 }
 
-void CarlaEngine::saveProjectInternal(juce2::MemoryOutputStream& outStream) const
+void CarlaEngine::saveProjectInternal(water::MemoryOutputStream& outStream) const
 {
     // send initial prepareForSave first, giving time for bridges to act
     for (uint i=0; i < pData->curPluginCount; ++i)
@@ -1874,7 +1874,7 @@ static String findBinaryInCustomPath(const char* const searchPath, const char* c
     return String();
 }
 
-bool CarlaEngine::loadProjectInternal(juce2::XmlDocument& xmlDoc)
+bool CarlaEngine::loadProjectInternal(water::XmlDocument& xmlDoc)
 {
     ScopedPointer<XmlElement> xmlElement(xmlDoc.getDocumentElement(true));
     CARLA_SAFE_ASSERT_RETURN_ERR(xmlElement != nullptr, "Failed to parse project file");

source/backend/engine/CarlaEngineBridge.cpp

@@ -31,15 +31,15 @@
 # include <xmmintrin.h>
 #endif
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
 // must be last
 #include "jackbridge/JackBridge.hpp"
 
-using juce2::File;
-using juce2::MemoryBlock;
-using juce2::String;
-using juce2::Time;
+using water::File;
+using water::MemoryBlock;
+using water::String;
+using water::Time;
 
 CARLA_BACKEND_START_NAMESPACE
 

source/backend/engine/CarlaEngineNative.cpp

@@ -34,13 +34,13 @@
 #include "CarlaHost.h"
 #include "CarlaNative.hpp"
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
-using juce2::File;
-using juce2::MemoryOutputStream;
-using juce2::String;
-using juce2::XmlDocument;
-using juce2::XmlElement;
+using water::File;
+using water::MemoryOutputStream;
+using water::String;
+using water::XmlDocument;
+using water::XmlElement;
 
 CARLA_BACKEND_START_NAMESPACE
 

source/backend/plugin/CarlaPlugin.cpp

@@ -25,15 +25,15 @@
 
 #include <ctime>
 
-#include "juce_audio_graph/juce_audio_graph.h"
-
-using juce2::CharPointer_UTF8;
-using juce2::File;
-using juce2::MemoryOutputStream;
-using juce2::Result;
-using juce2::String;
-using juce2::XmlDocument;
-using juce2::XmlElement;
+#include "water/water.h"
+
+using water::CharPointer_UTF8;
+using water::File;
+using water::MemoryOutputStream;
+using water::Result;
+using water::String;
+using water::XmlDocument;
+using water::XmlElement;
 
 CARLA_BACKEND_START_NAMESPACE
 

source/backend/plugin/CarlaPluginBridge.cpp

@@ -30,15 +30,15 @@
 
 #include <ctime>
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-using juce2::ChildProcess;
-using juce2::File;
-using juce2::String;
-using juce2::StringArray;
-using juce2::Time;
+using water::ChildProcess;
+using water::File;
+using water::String;
+using water::StringArray;
+using water::Time;
 
 CARLA_BACKEND_START_NAMESPACE
 
@@ -172,7 +172,7 @@ protected:
         arguments.add(fLabel);
 
         // uniqueId
-        arguments.add(String(static_cast<juce2::int64>(kPlugin->getUniqueId())));
+        arguments.add(String(static_cast<water::int64>(kPlugin->getUniqueId())));
 
         bool started;
 

source/backend/plugin/CarlaPluginDSSI.cpp

@@ -27,9 +27,9 @@
 # include "CarlaThread.hpp"
 #endif
 
-using juce2::ChildProcess;
-using juce2::String;
-using juce2::StringArray;
+using water::ChildProcess;
+using water::String;
+using water::StringArray;
 
 #define CARLA_PLUGIN_DSSI_OSC_CHECK_OSC_TYPES(/* argc, types, */ argcToCompare, typesToCompare)                                 \
     /* check argument count */                                                                                                  \

source/backend/plugin/CarlaPluginFluidSynth.cpp

@@ -22,7 +22,7 @@
 
 #include "CarlaMathUtils.hpp"
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
 #include <fluidsynth.h>
 
@@ -32,8 +32,8 @@
 
 #define FLUID_DEFAULT_POLYPHONY 64
 
-using juce2::String;
-using juce2::StringArray;
+using water::String;
+using water::StringArray;
 
 CARLA_BACKEND_START_NAMESPACE
 

source/backend/plugin/CarlaPluginJack.cpp

@@ -34,11 +34,11 @@
 
 // -------------------------------------------------------------------------------------------------------------------
 
-using juce2::ChildProcess;
-using juce2::File;
-using juce2::String;
-using juce2::StringArray;
-using juce2::Time;
+using water::ChildProcess;
+using water::File;
+using water::String;
+using water::StringArray;
+using water::Time;
 
 CARLA_BACKEND_START_NAMESPACE
 

source/backend/plugin/CarlaPluginLV2.cpp

@@ -37,12 +37,12 @@ extern "C" {
 #include "rtmempool/rtmempool-lv2.h"
 }
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
 #include <string>
 #include <vector>
 
-using juce2::File;
+using water::File;
 
 #define URI_CARLA_ATOM_WORKER "http://kxstudio.sf.net/ns/carla/atomWorker"
 

source/backend/plugin/CarlaPluginLinuxSampler.cpp

@@ -31,7 +31,7 @@
 #include "CarlaBackendUtils.hpp"
 #include "CarlaMathUtils.hpp"
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
 // -----------------------------------------------------------------------
 
@@ -198,9 +198,9 @@ public:
 
 // -----------------------------------------------------------------------
 
-using juce2::File;
-using juce2::SharedResourcePointer;
-using juce2::StringArray;
+using water::File;
+using water::SharedResourcePointer;
+using water::StringArray;
 
 CARLA_BACKEND_START_NAMESPACE
 
@@ -461,7 +461,7 @@ public:
             if (programList.size() == MAX_MIDI_CHANNELS)
             {
                 uint8_t channel = 0;
-                for (juce2::String *it=programList.begin(), *end=programList.end(); it != end; ++it)
+                for (water::String *it=programList.begin(), *end=programList.end(); it != end; ++it)
                 {
                     const int index(it->getIntValue());
 

source/backend/plugin/CarlaPluginNative.cpp

@@ -21,11 +21,11 @@
 #include "CarlaMathUtils.hpp"
 #include "CarlaNative.h"
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
-using juce2::jmax;
-using juce2::String;
-using juce2::StringArray;
+using water::jmax;
+using water::String;
+using water::StringArray;
 
 CARLA_EXTERN_C
 std::size_t carla_getNativePluginCount() noexcept;

source/bridges-plugin/CarlaBridgeLV2.cpp

@@ -27,7 +27,7 @@
 #include "CarlaLv2Utils.hpp"
 #include "CarlaUtils.h"
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
 // ---------------------------------------------------------------------------------------------------------------------
 // -Weffc++ compat ext widget
@@ -108,7 +108,7 @@ public:
 
         setCallback(_engine_callback, this);
 
-        using juce2::File;
+        using water::File;
         const File pluginFile(File::getSpecialLocation(File::currentExecutableFile).withFileExtension("xml"));
 
         if (! loadProject(pluginFile.getFullPathName().toRawUTF8()))
@@ -824,7 +824,7 @@ const LV2_Descriptor* lv2_descriptor(uint32_t index)
 
     if (ret.isEmpty())
     {
-        using namespace juce2;
+        using namespace water;
         const File file(File::getSpecialLocation(File::currentExecutableFile).withFileExtension("ttl"));
         ret = String("file://" + file.getFullPathName()).toRawUTF8();
     }
@@ -852,7 +852,7 @@ const LV2UI_Descriptor* lv2ui_descriptor(uint32_t index)
 
     if (ret.isEmpty())
     {
-        using namespace juce2;
+        using namespace water;
         const File file(File::getSpecialLocation(File::currentExecutableFile).getSiblingFile("ext-ui"));
         ret = String("file://" + file.getFullPathName()).toRawUTF8();
     }

source/bridges-plugin/CarlaBridgePlugin.cpp

@@ -36,16 +36,16 @@
 
 #include "jackbridge/JackBridge.hpp"
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
 using CarlaBackend::CarlaEngine;
 using CarlaBackend::EngineCallbackOpcode;
 using CarlaBackend::EngineCallbackOpcode2Str;
 using CarlaBackend::runMainLoopOnce;
 
-using juce2::CharPointer_UTF8;
-using juce2::File;
-using juce2::String;
+using water::CharPointer_UTF8;
+using water::File;
+using water::String;
 
 // -------------------------------------------------------------------------
 

source/bridges-plugin/Makefile

@@ -43,13 +43,6 @@ LIBS_win64    = $(MODULEDIR)/jackbridge.win64e.a
 endif
 LINK_FLAGS   += $(JACKBRIDGE_LIBS)
 
-LIBS_native  += $(MODULEDIR)/juce_audio_graph.a
-LIBS_posix32 += $(MODULEDIR)/juce_audio_graph.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_audio_graph.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_audio_graph.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_audio_graph.win64.a
-LINK_FLAGS   += $(JUCE_CORE_LIBS)
-
 LIBS_native  += $(MODULEDIR)/lilv.a
 LIBS_posix32 += $(MODULEDIR)/lilv.posix32.a
 LIBS_posix64 += $(MODULEDIR)/lilv.posix64.a
@@ -64,6 +57,13 @@ LIBS_win32   += $(MODULEDIR)/rtmempool.win32.a
 LIBS_win64   += $(MODULEDIR)/rtmempool.win64.a
 LINK_FLAGS   += $(RTMEMPOOL_LIBS)
 
+LIBS_native  += $(MODULEDIR)/water.a
+LIBS_posix32 += $(MODULEDIR)/water.posix32.a
+LIBS_posix64 += $(MODULEDIR)/water.posix64.a
+LIBS_win32   += $(MODULEDIR)/water.win32.a
+LIBS_win64   += $(MODULEDIR)/water.win64.a
+LINK_FLAGS   += $(WATER_LIBS)
+
 ifeq ($(HAVE_LIBLO),true)
 LINK_FLAGS += $(LIBLO_LIBS)
 endif

source/bridges-ui/CarlaBridgeUI-LV2.cpp

@@ -21,14 +21,14 @@
 #include "CarlaMIDI.h"
 #include "LinkedList.hpp"
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
 #include <string>
 #include <vector>
 
 #define URI_CARLA_ATOM_WORKER "http://kxstudio.sf.net/ns/carla/atomWorker"
 
-using juce2::File;
+using water::File;
 
 CARLA_BRIDGE_START_NAMESPACE
 

source/bridges-ui/Makefile

@@ -23,7 +23,7 @@ endif
 # ----------------------------------------------------------------------------------------------------------------------------
 
 BUILD_CXX_FLAGS  += -DBUILD_BRIDGE -DBUILD_BRIDGE_UI -I. -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/utils -isystem $(CWD)/modules
-LINK_FLAGS       += $(JUCE_CORE_LIBS)
+LINK_FLAGS       += $(WATER_LIBS)
 
 ifneq ($(HAIKU),true)
 LINK_FLAGS       += -lpthread
@@ -129,8 +129,8 @@ ui_lv2-windows: $(BINDIR)/$(MODULENAME)-lv2-windows.exe
 # Common libs
 
 LIBS = \
-	$(MODULEDIR)/juce_audio_graph.a \
-	$(MODULEDIR)/lilv.a
+	$(MODULEDIR)/lilv.a \
+	$(MODULEDIR)/water.a
 
 # ----------------------------------------------------------------------------------------------------------------------------
 # Common objects

source/discovery/Makefile

@@ -59,20 +59,20 @@ endif
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-LIBS_native   = $(MODULEDIR)/juce_audio_graph.a
-LIBS_posix32  = $(MODULEDIR)/juce_audio_graph.posix32.a
-LIBS_posix64  = $(MODULEDIR)/juce_audio_graph.posix64.a
-LIBS_win32    = $(MODULEDIR)/juce_audio_graph.win32.a
-LIBS_win64    = $(MODULEDIR)/juce_audio_graph.win64.a
-LINK_FLAGS   += $(JUCE_CORE_LIBS)
-
-LIBS_native  += $(MODULEDIR)/lilv.a
-LIBS_posix32 += $(MODULEDIR)/lilv.posix32.a
-LIBS_posix64 += $(MODULEDIR)/lilv.posix64.a
-LIBS_win32   += $(MODULEDIR)/lilv.win32.a
-LIBS_win64   += $(MODULEDIR)/lilv.win64.a
+LIBS_native   = $(MODULEDIR)/lilv.a
+LIBS_posix32  = $(MODULEDIR)/lilv.posix32.a
+LIBS_posix64  = $(MODULEDIR)/lilv.posix64.a
+LIBS_win32    = $(MODULEDIR)/lilv.win32.a
+LIBS_win64    = $(MODULEDIR)/lilv.win64.a
 LINK_FLAGS   += $(LILV_LIBS)
 
+LIBS_native  += $(MODULEDIR)/water.a
+LIBS_posix32 += $(MODULEDIR)/water.posix32.a
+LIBS_posix64 += $(MODULEDIR)/water.posix64.a
+LIBS_win32   += $(MODULEDIR)/water.win32.a
+LIBS_win64   += $(MODULEDIR)/water.win64.a
+LINK_FLAGS   += $(WATER_LIBS)
+
 ifeq ($(UNIX),true)
 LINK_FLAGS += -ldl
 endif

source/discovery/carla-discovery.cpp

@@ -45,13 +45,13 @@
 
 #include <iostream>
 
-#include "juce_audio_graph/juce_audio_graph.h"
+#include "water/water.h"
 
 #define DISCOVERY_OUT(x, y) std::cout << "\ncarla-discovery::" << x << "::" << y << std::endl;
 
-using juce2::CharPointer_UTF8;
-using juce2::File;
-using juce2::StringArray;
+using water::CharPointer_UTF8;
+using water::File;
+using water::StringArray;
 
 CARLA_BACKEND_USE_NAMESPACE
 
@@ -983,7 +983,7 @@ static void do_lv2_check(const char* const bundle, const bool doInit)
         Lilv::Plugin lilvPlugin(lilv_plugins_get(lilvPlugins, it));
 
         if (const char* const uri = lilvPlugin.get_uri().as_string())
-            URIs.addIfNotAlreadyThere(juce2::String(uri));
+            URIs.addIfNotAlreadyThere(water::String(uri));
     }
 
     if (URIs.size() == 0)
@@ -1435,7 +1435,7 @@ static void do_vst_check(lib_t& libHandle, const bool doInit)
 static void do_fluidsynth_check(const char* const filename, const bool doInit)
 {
 #ifdef HAVE_FLUIDSYNTH
-    const juce2::String jfilename = juce2::String(CharPointer_UTF8(filename));
+    const water::String jfilename = water::String(CharPointer_UTF8(filename));
     const File file(jfilename);
 
     if (! file.existsAsFile())
@@ -1525,7 +1525,7 @@ static void do_fluidsynth_check(const char* const filename, const bool doInit)
 static void do_linuxsampler_check(const char* const filename, const char* const stype, const bool doInit)
 {
 #ifdef HAVE_LINUXSAMPLER
-    const juce2::String jfilename = juce2::String(CharPointer_UTF8(filename));
+    const water::String jfilename = water::String(CharPointer_UTF8(filename));
     const File file(jfilename);
 
     if (! file.existsAsFile())

source/modules/Makefile

@@ -9,10 +9,10 @@
 all:
 
 clean:
-	$(MAKE) clean -C juce_audio_graph
 	$(MAKE) clean -C lilv
 	$(MAKE) clean -C rtaudio
 	$(MAKE) clean -C rtmempool
 	$(MAKE) clean -C rtmidi
+	$(MAKE) clean -C water
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_audio_graph/main.cpp

@@ -1,24 +0,0 @@
-
-#include "juce_audio_graph.h"
-#include <iostream>
-
-using namespace juce2;
-
-int main()
-{
-    String x = "haha";
-    std::cout << x << std::endl;
-
-    Atomic<float> a;
-    CharPointer_UTF8 c("c");
-    HeapBlock<String> hs;
-    MemoryBlock m;
-    Array<CharPointer_UTF8> ar;
-    OwnedArray<String> ows;
-    AudioSampleBuffer as;
-    MidiBuffer mb;
-    MidiMessage ms;
-    AudioProcessorGraph g;
-
-    return 0;
-}

source/modules/juce_audio_graph/Makefile → source/modules/water/Makefile

@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
-# Makefile for juce_audio_graph #
+# Makefile for water #
 # ----------------------------- #
 # Created by falkTX
 #
 
 CWD=../..
-MODULENAME=juce_audio_graph
+MODULENAME=water
 include ../Makefile.mk
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_audio_graph/memory/juce_Atomic.h → source/modules/water/memory/juce_Atomic.h

@@ -142,16 +142,15 @@ public:
     static void memoryBarrier() noexcept;
 
     //==============================================================================
-   #if JUCE_64BIT
-    JUCE_ALIGN (8)
-   #else
-    JUCE_ALIGN (4)
-   #endif
-
     /** The raw value that this class operates on.
         This is exposed publicly in case you need to manipulate it directly
         for performance reasons.
     */
+   #if JUCE_64BIT
+    __attribute__ ((aligned (8)))
+   #else
+    __attribute__ ((aligned (4)))
+   #endif
     volatile Type value;
 
 private:

source/modules/juce_audio_graph/memory/juce_ByteOrder.h → source/modules/water/memory/juce_ByteOrder.h

@@ -178,7 +178,7 @@ inline uint64 ByteOrder::swap (uint64 value) noexcept
    #endif
 }
 
-#if JUCE_LITTLE_ENDIAN
+#ifdef __LITTLE_ENDIAN__
  inline uint16 ByteOrder::swapIfBigEndian (const uint16 v) noexcept                                  { return v; }
  inline uint32 ByteOrder::swapIfBigEndian (const uint32 v) noexcept                                  { return v; }
  inline uint64 ByteOrder::swapIfBigEndian (const uint64 v) noexcept                                  { return v; }

source/modules/juce_audio_graph/memory/juce_Memory.h → source/modules/water/memory/juce_Memory.h

@@ -110,7 +110,7 @@ inline void writeUnaligned (void* dstPtr, Type value) noexcept
 #if (JUCE_COMPILER_SUPPORTS_ARC && defined (__OBJC__)) || DOXYGEN
  #define JUCE_AUTORELEASEPOOL  @autoreleasepool
 #else
- #define JUCE_AUTORELEASEPOOL  const juce2::ScopedAutoReleasePool JUCE_JOIN_MACRO (autoReleasePool_, __LINE__);
+ #define JUCE_AUTORELEASEPOOL  const water::ScopedAutoReleasePool JUCE_JOIN_MACRO (autoReleasePool_, __LINE__);
 #endif
 
 #else