Skip to content

Commit

Permalink
Update to latest deps
Browse files Browse the repository at this point in the history 
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
@falkTX
falkTX committed May 11, 2024
1 parent ce4c3e2 commit 40d1dd3
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 21 deletions.
3 changes: 2 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ endif # USE_SYSTEM_CARLA_BINS

DGL_EXTRA_ARGS = \
DISTRHO_NAMESPACE=IldaeilDISTRHO \
DGL_NAMESPACE=IldaeilDGL
DGL_NAMESPACE=IldaeilDGL \
USE_FILE_BROWSER=true

# ---------------------------------------------------------------------------------------------------------------------
# DPF bundled plugins
Expand Down
2 changes: 1 addition & 1 deletion carla
Submodule carla updated 1565 files
2 changes: 1 addition & 1 deletion dpf
Submodule dpf updated 48 files
+8 −7 .github/workflows/makefile.yml
+2 −4 CMakeLists.txt
+3 −3 Makefile
+50 −6 Makefile.base.mk
+17 −6 Makefile.plugins.mk
+32 −3 dgl/Base.hpp
+3 −8 dgl/Makefile
+1 −0 dgl/StandaloneWindow.hpp
+2 −2 dgl/Widget.hpp
+6 −6 dgl/Window.hpp
+193 −0 dgl/src/Stub.cpp
+16 −6 dgl/src/Window.cpp
+10 −10 dgl/src/WindowPrivateData.cpp
+2 −2 dgl/src/WindowPrivateData.hpp
+7 −53 distrho/DistrhoUI.hpp
+15 −8 distrho/DistrhoUI_macOS.mm
+1 −1 distrho/DistrhoUtils.hpp
+276 −0 distrho/extra/ChildProcess.hpp
+4 −0 distrho/extra/FileBrowserDialogImpl.cpp
+8 −4 distrho/extra/FileBrowserDialogImpl.hpp
+89 −2 distrho/extra/RingBuffer.hpp
+7 −3 distrho/extra/Sleep.hpp
+127 −0 distrho/extra/Time.hpp
+28 −0 distrho/extra/WebView.hpp
+1,540 −0 distrho/extra/WebViewImpl.cpp
+126 −0 distrho/extra/WebViewImpl.hpp
+3 −1 distrho/src/DistrhoPluginAU.cpp
+3 −3 distrho/src/DistrhoPluginCLAP.cpp
+57 −47 distrho/src/DistrhoPluginChecks.h
+19 −9 distrho/src/DistrhoPluginJACK.cpp
+2 −2 distrho/src/DistrhoPluginLV2.cpp
+3 −3 distrho/src/DistrhoPluginLV2export.cpp
+4 −14 distrho/src/DistrhoPluginVST.hpp
+3 −11 distrho/src/DistrhoPluginVST2.cpp
+52 −90 distrho/src/DistrhoUI.cpp
+2 −47 distrho/src/DistrhoUIInternal.hpp
+10 −106 distrho/src/DistrhoUIPrivateData.hpp
+3 −169 distrho/src/DistrhoUIVST3.cpp
+4 −4 distrho/src/jackbridge/NativeBridge.hpp
+9 −3 examples/EmbedExternalUI/DistrhoPluginInfo.h
+7 −7 examples/EmbedExternalUI/EmbedExternalExamplePlugin.cpp
+25 −418 examples/EmbedExternalUI/EmbedExternalExampleUI.cpp
+3 −0 examples/EmbedExternalUI/Makefile
+1 −0 examples/FileHandling/Makefile
+2 −2 examples/Meters/ExampleUIMeters.cpp
+0 −1 examples/SendNote/DistrhoPluginInfo.h
+3 −1 tests/tests.hpp
+1 −1 utils/generate-ttl.sh
2 changes: 1 addition & 1 deletion dpf-widgets
Submodule dpf-widgets updated 14 files
+3 −0 .editorconfig
+96 −7 README.md
+659 −0 generic/LVGL.cpp
+164 −0 generic/LVGL.hpp
+49 −3 opengl/DearImGui.cpp
+16 −2 opengl/DearImGui.hpp
+2 −2 opengl/DearImGui/imconfig.h
+2 −2 opengl/DearImGuiColorTextEditor/TextEditor.cpp
+ − screenshots/Blendish.png
+0 −1 tests/imgui.cpp
+25 −0 tests/lvgl/CMakeLists.txt
+1,013 −0 tests/lvgl/lv_conf.h
+80 −0 tests/lvgl/lvgl.cpp
+1 −1 tests/opengl.cpp
15 changes: 8 additions & 7 deletions plugins/Common/IldaeilPlugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ static const char* getPathForVST2()
if (winePrefix.isEmpty())
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/VstPlugins";
Expand Down Expand Up @@ -198,7 +198,7 @@ static const char* getPathForVST3()
if (winePrefix.isEmpty())
winePrefix = getHomePath() + "/.wine";

if (water::File(winePrefix).exists())
if (water::File(winePrefix.toRawUTF8()).exists())
{
path += ":" + winePrefix + "/drive_c/Program Files/Common Files/VST3";
#ifdef CARLA_OS_64BIT
Expand Down Expand Up @@ -236,7 +236,7 @@ static const char* getPathForCLAP()
if (winePrefix.isEmpty())
winePrefix = getHomePath() + "/.wine";

if (water::File(winePrefix).exists())
if (water::File(winePrefix.toRawUTF8()).exists())
{
path += ":" + winePrefix + "/drive_c/Program Files/Common Files/CLAP";
#ifdef CARLA_OS_64BIT
Expand Down Expand Up @@ -264,7 +264,7 @@ static const char* getPathForJSFX()
path = "/jsfx";
#elif defined(CARLA_OS_WIN)
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()
+ "\\REAPER\\InstallData\\Effects";
#else
Expand Down Expand Up @@ -406,15 +406,15 @@ class IldaeilPlugin : public IldaeilBasePlugin
#endif

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;
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, bundlePath);
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, getResourcePath(bundlePath));
}
#ifdef CARLA_OS_MAC
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 += "/Contents/MacOS";
Expand Down Expand Up @@ -649,7 +649,8 @@ class IldaeilPlugin : public IldaeilBasePlugin
{
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);
Expand Down
4 changes: 2 additions & 2 deletions plugins/Common/IldaeilUI.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@ class IldaeilUI : public UI,
if (sha1sum != nullptr)
{
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())
{
Expand Down Expand Up @@ -1183,7 +1183,7 @@ class IldaeilUI : public UI,
return false;

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())
{
Expand Down
3 changes: 2 additions & 1 deletion plugins/FX/DistrhoPluginInfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@
#define DISTRHO_PLUGIN_WANT_TIMEPOS 1
#define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 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_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget
#define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth
#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

Expand Down
3 changes: 2 additions & 1 deletion plugins/MIDI/DistrhoPluginInfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@
#define DISTRHO_PLUGIN_WANT_TIMEPOS 1
#define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 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_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget
#define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth
#define DISTRHO_UI_DEFAULT_HEIGHT kInitialHeight
#define DISTRHO_UI_FILE_BROWSER 1
#define DISTRHO_UI_USER_RESIZABLE 0

#define ILDAEIL_STANDALONE 0

Expand Down
7 changes: 2 additions & 5 deletions plugins/Standalone/DistrhoPluginInfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,11 @@
#define DISTRHO_UI_CUSTOM_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget
#define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth
#define DISTRHO_UI_DEFAULT_HEIGHT kInitialHeight
#define DISTRHO_UI_FILE_BROWSER 1
#define DISTRHO_UI_USER_RESIZABLE 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 kInitialHeight = 480;

Expand Down
3 changes: 2 additions & 1 deletion plugins/Synth/DistrhoPluginInfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@
#define DISTRHO_PLUGIN_WANT_TIMEPOS 1
#define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 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_WIDGET_TYPE DGL_NAMESPACE::ImGuiTopLevelWidget
#define DISTRHO_UI_DEFAULT_WIDTH kInitialWidth
#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

Expand Down

0 comments on commit 40d1dd3

Please sign in to comment.