From bf9ba880ded48ed051983d26aa7c23ec918f66c3 Mon Sep 17 00:00:00 2001 From: Patrick Desaulniers Date: Tue, 27 Nov 2018 02:56:12 -0500 Subject: [PATCH 1/5] Fix external UI build (#87) * Fix external UI build * Use default bool parameter in setWindowSize (non-DGL version) --- distrho/DistrhoUI.hpp | 2 ++ distrho/src/DistrhoUI.cpp | 3 +++ distrho/src/DistrhoUIInternal.hpp | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/distrho/DistrhoUI.hpp b/distrho/DistrhoUI.hpp index b5e44e49..e33a4ca4 100644 --- a/distrho/DistrhoUI.hpp +++ b/distrho/DistrhoUI.hpp @@ -67,12 +67,14 @@ public: */ bool isUserResizable() const noexcept; +#ifdef HAVE_DGL /** Set geometry constraints for the UI when resized by the user, and optionally scale UI automatically. @see Window::setGeometryConstraints(uint,uint,bool) @see Window::setScaling(double) */ void setGeometryConstraints(uint minWidth, uint minHeight, bool keepAspectRatio, bool automaticallyScale = false); +#endif /* -------------------------------------------------------------------------------------------------------- * Host state */ diff --git a/distrho/src/DistrhoUI.cpp b/distrho/src/DistrhoUI.cpp index c590ce9b..89162d67 100644 --- a/distrho/src/DistrhoUI.cpp +++ b/distrho/src/DistrhoUI.cpp @@ -62,6 +62,7 @@ bool UI::isUserResizable() const noexcept return pData->userResizable; } +#ifdef HAVE_DGL void UI::setGeometryConstraints(uint minWidth, uint minHeight, bool keepAspectRatio, bool automaticallyScale) { DISTRHO_SAFE_ASSERT_RETURN(minWidth > 0,); @@ -72,7 +73,9 @@ void UI::setGeometryConstraints(uint minWidth, uint minHeight, bool keepAspectRa pData->minHeight = minHeight; getParentWindow().setGeometryConstraints(minWidth, minHeight, keepAspectRatio); + } +#endif /* ------------------------------------------------------------------------------------------------------------ * Host state */ diff --git a/distrho/src/DistrhoUIInternal.hpp b/distrho/src/DistrhoUIInternal.hpp index 06d5d5a5..a7a8ac3b 100644 --- a/distrho/src/DistrhoUIInternal.hpp +++ b/distrho/src/DistrhoUIInternal.hpp @@ -460,7 +460,7 @@ public: return glWindow.handlePluginSpecial(press, key); } #else - void setWindowSize(const uint, const uint, const bool) {} + void setWindowSize(const uint, const uint, const bool = false) {} void setWindowTransientWinId(const uintptr_t) {} bool setWindowVisible(const bool) { return true; } #endif From bbca5beee33c0097089241183ee45f4ffcc05daa Mon Sep 17 00:00:00 2001 From: Patrick Desaulniers Date: Thu, 29 Nov 2018 03:03:21 -0500 Subject: [PATCH 2/5] Fix some parts of BarBeatTick documentation (#86) --- distrho/DistrhoPlugin.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distrho/DistrhoPlugin.hpp b/distrho/DistrhoPlugin.hpp index 2fb9ec6f..527fcbe9 100644 --- a/distrho/DistrhoPlugin.hpp +++ b/distrho/DistrhoPlugin.hpp @@ -546,7 +546,7 @@ struct TimePosition { /** Current tick within beat.@n - Should always be > 0 and <= @a ticksPerBeat.@n + Should always be >= 0 and < @a ticksPerBeat.@n The first tick is tick '0'. */ int32_t tick; @@ -567,7 +567,7 @@ struct TimePosition { float beatType; /** - Number of ticks within a bar.@n + Number of ticks within a beat.@n Usually a moderately large integer with many denominators, such as 1920.0. */ double ticksPerBeat; From a4fe3ac328798e773c9cae2165190962a0680d41 Mon Sep 17 00:00:00 2001 From: Christopher Arndt Date: Sat, 15 Dec 2018 14:27:41 +0100 Subject: [PATCH 3/5] Fix parameter name in ImageSwitch callback method signature (#92) --- dgl/ImageWidgets.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgl/ImageWidgets.hpp b/dgl/ImageWidgets.hpp index e5a21420..0e1e1ddd 100644 --- a/dgl/ImageWidgets.hpp +++ b/dgl/ImageWidgets.hpp @@ -240,7 +240,7 @@ public: { public: virtual ~Callback() {} - virtual void imageSwitchClicked(ImageSwitch* imageButton, bool down) = 0; + virtual void imageSwitchClicked(ImageSwitch* imageSwitch, bool down) = 0; }; explicit ImageSwitch(Window& parent, const Image& imageNormal, const Image& imageDown) noexcept; From afd69ec45d94e7696a78a011a3016a36ec80ce6f Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sun, 16 Dec 2018 21:13:00 +0100 Subject: [PATCH 4/5] Adds 2 software as "made with DPF" + copyright years update (#93) * Adds 2 software as "made with DPF" * Update LICENSE update date --- LICENSE | 2 +- README.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 6ecc24c1..6bd93e18 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ DISTRHO Plugin Framework (DPF) -Copyright (C) 2012-2014 Filipe Coelho +Copyright (C) 2012-2018 Filipe Coelho Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this diff --git a/README.md b/README.md index 6d0dbd50..a3af4218 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,8 @@ List of plugins made with DPF:
- [DISTRHO ndc Plugs](https://github.com/DISTRHO/ndc-Plugs) - [Juice Plugins](https://github.com/DISTRHO/JuicePlugins) (work in progress) - [ZamAudio Suite](https://github.com/zamaudio/zam-plugins) + - [DragonFly-Reverb](https://github.com/michaelwillis/dragonfly-reverb) + - [Wolf-Shaper](https://github.com/pdesaulniers/wolf-shaper) Plugin examples are available in the `example/` folder inside this repo.
From cf980eb2a07555dc8ef9637a57932c8131a8310d Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 27 Dec 2018 09:51:01 +0000 Subject: [PATCH 5/5] Partially reverts a1748a1a9fd1ac6f8b8abaa26cec64f121d13d7e See #90 Signed-off-by: falkTX --- dgl/src/Window.cpp | 2 +- distrho/src/DistrhoPluginLV2export.cpp | 28 ++++++-------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/dgl/src/Window.cpp b/dgl/src/Window.cpp index 89082203..ae46addb 100644 --- a/dgl/src/Window.cpp +++ b/dgl/src/Window.cpp @@ -153,7 +153,7 @@ struct Window::PrivateData { fView(puglInit()), fFirstInit(true), fVisible(parentId != 0), - fResizable(true), + fResizable(parentId == 0), fUsingEmbed(parentId != 0), fWidth(1), fHeight(1), diff --git a/distrho/src/DistrhoPluginLV2export.cpp b/distrho/src/DistrhoPluginLV2export.cpp index a4978e12..9d2c7a7d 100644 --- a/distrho/src/DistrhoPluginLV2export.cpp +++ b/distrho/src/DistrhoPluginLV2export.cpp @@ -139,17 +139,9 @@ void lv2_generate_ttl(const char* const basename) # endif manifestString += "\n"; # if DISTRHO_PLUGIN_HAS_EMBED_UI - /* - if (! pluginUI.isUserResizable()) - { - manifestString += " lv2:optionalFeature ui:noUserResize ,\n"; - manifestString += " ui:resize ,\n"; - } - else - */ - { - manifestString += " lv2:optionalFeature ui:resize ,\n"; - } + // TODO: pluginUI.isUserResizable() + manifestString += " lv2:optionalFeature ui:noUserResize ,\n"; + manifestString += " ui:resize ,\n"; manifestString += " ui:touch ;\n"; manifestString += "\n"; # endif @@ -638,17 +630,9 @@ void lv2_generate_ttl(const char* const basename) # endif uiString += "\n"; # if DISTRHO_PLUGIN_HAS_EMBED_UI - /* - if (! pluginUI.isUserResizable()) - { - uiString += " lv2:optionalFeature ui:noUserResize ,\n"; - uiString += " ui:resize ,\n"; - } - else - */ - { - uiString += " lv2:optionalFeature ui:resize ,\n"; - } + // TODO: pluginUI.isUserResizable() + uiString += " lv2:optionalFeature ui:noUserResize ,\n"; + uiString += " ui:resize ,\n"; uiString += " ui:touch ;\n"; uiString += "\n"; # endif