@@ -76,7 +76,8 @@ endif # USE_SYSTEM_CARLA_BINS | |||||
DGL_EXTRA_ARGS = \ | DGL_EXTRA_ARGS = \ | ||||
DISTRHO_NAMESPACE=IldaeilDISTRHO \ | DISTRHO_NAMESPACE=IldaeilDISTRHO \ | ||||
DGL_NAMESPACE=IldaeilDGL | |||||
DGL_NAMESPACE=IldaeilDGL \ | |||||
USE_FILE_BROWSER=true | |||||
# --------------------------------------------------------------------------------------------------------------------- | # --------------------------------------------------------------------------------------------------------------------- | ||||
# DPF bundled plugins | # DPF bundled plugins | ||||
@@ -1 +1 @@ | |||||
Subproject commit f980758afb6f614119c8c228f3c0d993d8144657 | |||||
Subproject commit ad3b7793a44bfd4aceb620c397c6caa5ae9f6098 |
@@ -1 +1 @@ | |||||
Subproject commit 09b7a1dc7c69c8d6cae508dccd1eb22c64784987 | |||||
Subproject commit 472cda840ed527b779faa9db9abbdab6be161002 |
@@ -1 +1 @@ | |||||
Subproject commit 73e9aa67b92430db863d7d7b292b66cd7d2c8190 | |||||
Subproject commit 9660ac656da14ef1850fcc530ad2bf36bb191ad3 |
@@ -152,7 +152,7 @@ static const char* getPathForVST2() | |||||
if (winePrefix.isEmpty()) | if (winePrefix.isEmpty()) | ||||
winePrefix = getHomePath() + "/.wine"; | winePrefix = getHomePath() + "/.wine"; | ||||
if (water::File(winePrefix).exists()) | |||||
if (water::File(winePrefix.toRawUTF8()).exists()) | |||||
{ | { | ||||
path += ":" + winePrefix + "/drive_c/Program Files/Common Files/VST2"; | path += ":" + winePrefix + "/drive_c/Program Files/Common Files/VST2"; | ||||
path += ":" + winePrefix + "/drive_c/Program Files/VstPlugins"; | path += ":" + winePrefix + "/drive_c/Program Files/VstPlugins"; | ||||
@@ -198,7 +198,7 @@ static const char* getPathForVST3() | |||||
if (winePrefix.isEmpty()) | if (winePrefix.isEmpty()) | ||||
winePrefix = getHomePath() + "/.wine"; | winePrefix = getHomePath() + "/.wine"; | ||||
if (water::File(winePrefix).exists()) | |||||
if (water::File(winePrefix.toRawUTF8()).exists()) | |||||
{ | { | ||||
path += ":" + winePrefix + "/drive_c/Program Files/Common Files/VST3"; | path += ":" + winePrefix + "/drive_c/Program Files/Common Files/VST3"; | ||||
#ifdef CARLA_OS_64BIT | #ifdef CARLA_OS_64BIT | ||||
@@ -236,7 +236,7 @@ static const char* getPathForCLAP() | |||||
if (winePrefix.isEmpty()) | if (winePrefix.isEmpty()) | ||||
winePrefix = getHomePath() + "/.wine"; | winePrefix = getHomePath() + "/.wine"; | ||||
if (water::File(winePrefix).exists()) | |||||
if (water::File(winePrefix.toRawUTF8()).exists()) | |||||
{ | { | ||||
path += ":" + winePrefix + "/drive_c/Program Files/Common Files/CLAP"; | path += ":" + winePrefix + "/drive_c/Program Files/Common Files/CLAP"; | ||||
#ifdef CARLA_OS_64BIT | #ifdef CARLA_OS_64BIT | ||||
@@ -264,7 +264,7 @@ static const char* getPathForJSFX() | |||||
path = "/jsfx"; | path = "/jsfx"; | ||||
#elif defined(CARLA_OS_WIN) | #elif defined(CARLA_OS_WIN) | ||||
path = water::File::getSpecialLocation(water::File::winAppData).getFullPathName() + "\\REAPER\\Effects"; | path = water::File::getSpecialLocation(water::File::winAppData).getFullPathName() + "\\REAPER\\Effects"; | ||||
if (! water::File(path).isDirectory()) | |||||
if (! water::File(path.toRawUTF8()).isDirectory()) | |||||
path = water::File::getSpecialLocation(water::File::winProgramFiles).getFullPathName() | path = water::File::getSpecialLocation(water::File::winProgramFiles).getFullPathName() | ||||
+ "\\REAPER\\InstallData\\Effects"; | + "\\REAPER\\InstallData\\Effects"; | ||||
#else | #else | ||||
@@ -406,7 +406,7 @@ public: | |||||
#endif | #endif | ||||
if (bundlePath != nullptr | if (bundlePath != nullptr | ||||
&& water::File(bundlePath + water::String(DISTRHO_OS_SEP_STR "carla-bridge-native" EXT)).existsAsFile()) | |||||
&& water::File(bundlePath + String(DISTRHO_OS_SEP_STR "carla-bridge-native" EXT)).existsAsFile()) | |||||
{ | { | ||||
fBinaryPath = bundlePath; | fBinaryPath = bundlePath; | ||||
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, bundlePath); | carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, bundlePath); | ||||
@@ -414,7 +414,7 @@ public: | |||||
} | } | ||||
#ifdef CARLA_OS_MAC | #ifdef CARLA_OS_MAC | ||||
else if (bundlePath != nullptr | else if (bundlePath != nullptr | ||||
&& water::File(bundlePath + water::String("/Contents/MacOS/carla-bridge-native" EXT)).existsAsFile()) | |||||
&& water::File(bundlePath + String("/Contents/MacOS/carla-bridge-native" EXT)).existsAsFile()) | |||||
{ | { | ||||
fBinaryPath = bundlePath; | fBinaryPath = bundlePath; | ||||
fBinaryPath += "/Contents/MacOS"; | fBinaryPath += "/Contents/MacOS"; | ||||
@@ -649,7 +649,8 @@ protected: | |||||
{ | { | ||||
CarlaEngine* const engine = carla_get_engine_from_handle(fCarlaHostHandle); | CarlaEngine* const engine = carla_get_engine_from_handle(fCarlaHostHandle); | ||||
water::XmlDocument xml(value); | |||||
const water::String wvalue(value); | |||||
water::XmlDocument xml(wvalue); | |||||
{ | { | ||||
const MutexLocker cml(sPluginInfoLoadMutex); | const MutexLocker cml(sPluginInfoLoadMutex); | ||||
@@ -1063,7 +1063,7 @@ protected: | |||||
if (sha1sum != nullptr) | if (sha1sum != nullptr) | ||||
{ | { | ||||
const water::String configDir(ildaeilConfigDir()); | const water::String configDir(ildaeilConfigDir()); | ||||
const water::File cacheFile(configDir + CARLA_OS_SEP_STR "cache" CARLA_OS_SEP_STR + sha1sum); | |||||
const water::File cacheFile((configDir + CARLA_OS_SEP_STR "cache" CARLA_OS_SEP_STR + sha1sum).toRawUTF8()); | |||||
if (cacheFile.create().ok()) | if (cacheFile.create().ok()) | ||||
{ | { | ||||
@@ -1183,7 +1183,7 @@ protected: | |||||
return false; | return false; | ||||
const water::String configDir(ildaeilConfigDir()); | const water::String configDir(ildaeilConfigDir()); | ||||
const water::File cacheFile(configDir + CARLA_OS_SEP_STR "cache" CARLA_OS_SEP_STR + sha1sum); | |||||
const water::File cacheFile((configDir + CARLA_OS_SEP_STR "cache" CARLA_OS_SEP_STR + sha1sum).toRawUTF8()); | |||||
if (cacheFile.existsAsFile()) | if (cacheFile.existsAsFile()) | ||||
{ | { | ||||
@@ -41,11 +41,12 @@ | |||||
#define DISTRHO_PLUGIN_WANT_TIMEPOS 1 | #define DISTRHO_PLUGIN_WANT_TIMEPOS 1 | ||||
#define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1 | #define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1 | ||||
#define DISTRHO_UI_USE_CUSTOM 1 | #define DISTRHO_UI_USE_CUSTOM 1 | ||||
#define DISTRHO_UI_USER_RESIZABLE 0 | |||||
#define DISTRHO_UI_CUSTOM_INCLUDE_PATH "DearImGui.hpp" | #define DISTRHO_UI_CUSTOM_INCLUDE_PATH "DearImGui.hpp" | ||||
#define DISTRHO_UI_CUSTOM_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget | #define DISTRHO_UI_CUSTOM_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget | ||||
#define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth | #define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth | ||||
#define DISTRHO_UI_DEFAULT_HEIGHT kInitialHeight | #define DISTRHO_UI_DEFAULT_HEIGHT kInitialHeight | ||||
#define DISTRHO_UI_FILE_BROWSER 1 | |||||
#define DISTRHO_UI_USER_RESIZABLE 0 | |||||
#define DPF_VST3_DONT_USE_BRAND_ID | #define DPF_VST3_DONT_USE_BRAND_ID | ||||
@@ -38,11 +38,12 @@ | |||||
#define DISTRHO_PLUGIN_WANT_TIMEPOS 1 | #define DISTRHO_PLUGIN_WANT_TIMEPOS 1 | ||||
#define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1 | #define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1 | ||||
#define DISTRHO_UI_USE_CUSTOM 1 | #define DISTRHO_UI_USE_CUSTOM 1 | ||||
#define DISTRHO_UI_USER_RESIZABLE 0 | |||||
#define DISTRHO_UI_CUSTOM_INCLUDE_PATH "DearImGui.hpp" | #define DISTRHO_UI_CUSTOM_INCLUDE_PATH "DearImGui.hpp" | ||||
#define DISTRHO_UI_CUSTOM_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget | #define DISTRHO_UI_CUSTOM_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget | ||||
#define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth | #define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth | ||||
#define DISTRHO_UI_DEFAULT_HEIGHT kInitialHeight | #define DISTRHO_UI_DEFAULT_HEIGHT kInitialHeight | ||||
#define DISTRHO_UI_FILE_BROWSER 1 | |||||
#define DISTRHO_UI_USER_RESIZABLE 0 | |||||
#define ILDAEIL_STANDALONE 0 | #define ILDAEIL_STANDALONE 0 | ||||
@@ -38,14 +38,11 @@ | |||||
#define DISTRHO_UI_CUSTOM_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget | #define DISTRHO_UI_CUSTOM_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget | ||||
#define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth | #define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth | ||||
#define DISTRHO_UI_DEFAULT_HEIGHT kInitialHeight | #define DISTRHO_UI_DEFAULT_HEIGHT kInitialHeight | ||||
#define DISTRHO_UI_FILE_BROWSER 1 | |||||
#define DISTRHO_UI_USER_RESIZABLE 1 | |||||
#define ILDAEIL_STANDALONE 1 | #define ILDAEIL_STANDALONE 1 | ||||
#ifndef __APPLE__ | |||||
// FIXME | |||||
#define DISTRHO_UI_USER_RESIZABLE 1 | |||||
#endif | |||||
static constexpr const uint kInitialWidth = 640; | static constexpr const uint kInitialWidth = 640; | ||||
static constexpr const uint kInitialHeight = 480; | static constexpr const uint kInitialHeight = 480; | ||||
@@ -41,11 +41,12 @@ | |||||
#define DISTRHO_PLUGIN_WANT_TIMEPOS 1 | #define DISTRHO_PLUGIN_WANT_TIMEPOS 1 | ||||
#define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1 | #define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1 | ||||
#define DISTRHO_UI_USE_CUSTOM 1 | #define DISTRHO_UI_USE_CUSTOM 1 | ||||
#define DISTRHO_UI_USER_RESIZABLE 0 | |||||
#define DISTRHO_UI_CUSTOM_INCLUDE_PATH "DearImGui.hpp" | #define DISTRHO_UI_CUSTOM_INCLUDE_PATH "DearImGui.hpp" | ||||
#define DISTRHO_UI_CUSTOM_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget | #define DISTRHO_UI_CUSTOM_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget | ||||
#define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth | #define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth | ||||
#define DISTRHO_UI_DEFAULT_HEIGHT kInitialHeight | #define DISTRHO_UI_DEFAULT_HEIGHT kInitialHeight | ||||
#define DISTRHO_UI_FILE_BROWSER 1 | |||||
#define DISTRHO_UI_USER_RESIZABLE 0 | |||||
#define DPF_VST3_DONT_USE_BRAND_ID | #define DPF_VST3_DONT_USE_BRAND_ID | ||||