Fixup after latest webview changes

Signed-off-by: falkTX <[email protected]>

Author: falkTX

distrho/DistrhoUIMain.cpp

@@ -66,7 +66,7 @@
 # endif
 #endif
 
-#if defined(DPF_USING_LD_LINUX_WEBVIEW) && !DISTRHO_IS_STANDALONE
+#if defined(HAVE_X11) && defined(DISTRHO_OS_LINUX) && DISTRHO_UI_WEB_VIEW && !DISTRHO_IS_STANDALONE
 int main(int argc, char* argv[])
 {
     return DISTRHO_NAMESPACE::dpf_webview_start(argc, argv);

distrho/extra/WebView.hpp

@@ -23,6 +23,10 @@ START_NAMESPACE_DISTRHO
 
 #include "WebViewImpl.hpp"
 
+#if defined(HAVE_X11) && defined(DISTRHO_OS_LINUX)
+int dpf_webview_start(int argc, char* argv[]);
+#endif
+
 END_NAMESPACE_DISTRHO
 
 #endif // DISTRHO_WEB_VIEW_HPP_INCLUDED

distrho/src/DistrhoPluginChecks.h

@@ -286,17 +286,6 @@ static_assert(sizeof(STRINGIFY(DISTRHO_PLUGIN_UNIQUE_ID)) == 5, "The macro DISTR
 # error DISTRHO_UI_IS_STANDALONE must not be defined
 #endif
 
-#ifdef DPF_USING_LD_LINUX_WEBVIEW
-# error DPF_USING_LD_LINUX_WEBVIEW must not be defined
-#endif
-
-// --------------------------------------------------------------------------------------------------------------------
-// Set DPF_USING_LD_LINUX_WEBVIEW for internal use
-
-#if DISTRHO_UI_WEB_VIEW && defined(DISTRHO_OS_LINUX)
-# define DPF_USING_LD_LINUX_WEBVIEW
-#endif
-
 // --------------------------------------------------------------------------------------------------------------------
 
 #endif // DISTRHO_PLUGIN_CHECKS_H_INCLUDED

distrho/src/DistrhoPluginJACK.cpp

@@ -88,10 +88,6 @@ static const writeMidiFunc writeMidiCallback = nullptr;
 static const requestParameterValueChangeFunc requestParameterValueChangeCallback = nullptr;
 #endif
 
-#ifdef DPF_USING_LD_LINUX_WEBVIEW
-int dpf_webview_start(int argc, char* argv[]);
-#endif
-
 // -----------------------------------------------------------------------
 
 static volatile bool gCloseSignalReceived = false;
@@ -1003,9 +999,9 @@ int main(int argc, char* argv[])
     }
    #endif
 
-   #ifdef DPF_USING_LD_LINUX_WEBVIEW
+   #if defined(HAVE_X11) && defined(DISTRHO_OS_LINUX) && DISTRHO_UI_WEB_VIEW
     if (argc >= 2 && std::strcmp(argv[1], "dpf-ld-linux-webview") == 0)
-        return dpf_webview_start(argc, argv);
+        return DISTRHO_NAMESPACE::dpf_webview_start(argc, argv);
    #endif
 
     if (argc == 2 && std::strcmp(argv[1], "selftest") == 0)

distrho/src/DistrhoUIDSSI.cpp

@@ -38,10 +38,6 @@ static constexpr const setSizeFunc setSizeCallback = nullptr;
 // unsupported in DSSI
 static constexpr const fileRequestFunc fileRequestCallback = nullptr;
 
-#ifdef DPF_USING_LD_LINUX_WEBVIEW
-int dpf_webview_start(int argc, char* argv[]);
-#endif
-
 // --------------------------------------------------------------------------------------------------------------------
 
 
@@ -391,9 +387,9 @@ int main(int argc, char* argv[])
 {
     USE_NAMESPACE_DISTRHO
 
-   #ifdef DPF_USING_LD_LINUX_WEBVIEW
+   #if defined(HAVE_X11) && defined(DISTRHO_OS_LINUX) && DISTRHO_UI_WEB_VIEW
     if (argc >= 2 && std::strcmp(argv[1], "dpf-ld-linux-webview") == 0)
-        return dpf_webview_start(argc - 1, argv + 1);
+        return DISTRHO_NAMESPACE::dpf_webview_start(argc, argv);
    #endif
 
     // dummy test mode

distrho/src/DistrhoUIPrivateData.hpp

@@ -61,6 +61,11 @@
 
 START_NAMESPACE_DISTRHO
 
+/* define webview start */
+#if defined(HAVE_X11) && defined(DISTRHO_OS_LINUX) && DISTRHO_UI_WEB_VIEW
+int dpf_webview_start(int argc, char* argv[]);
+#endif
+
 // -----------------------------------------------------------------------
 // Plugin Application, will set class name based on plugin details
 

distrho/src/DistrhoUtils.cpp

@@ -343,11 +343,6 @@ bool requestBufferSizeChange(uint) { return false; }
 bool requestMIDI() { return false; }
 #endif
 
-/* define webview start */
-#ifdef DPF_USING_LD_LINUX_WEBVIEW
-int dpf_webview_start(int argc, char* argv[]);
-#endif
-
 // --------------------------------------------------------------------------------------------------------------------
 
 END_NAMESPACE_DISTRHO