From a1b55eff07f68fa92bb09878bdc4a153d898ea06 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Fri, 24 Oct 2025 14:03:13 +0200
Subject: [PATCH] Remove mpv test plugin, cleanup

Signed-off-by: falkTX <falktx@falktx.com>
---
 plugins/Cardinal/plugin.json |  9 ---------
 plugins/Makefile             | 10 ++--------
 plugins/plugins.cpp          | 11 +++--------
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/plugins/Cardinal/plugin.json b/plugins/Cardinal/plugin.json
index 4086063..1765211 100644
--- a/plugins/Cardinal/plugin.json
+++ b/plugins/Cardinal/plugin.json
@@ -192,15 +192,6 @@
         "Utility"
       ]
     },
-    {
-      "slug": "MPV",
-      "name": "MPV",
-      "description": "An embed video player inside Cardinal",
-      "manualUrl": "https://github.com/DISTRHO/Cardinal/blob/main/docs/CARDINAL-MODULES.md#mpv",
-      "tags": [
-        "Visual"
-      ]
-    },
     {
       "slug": "SassyScope",
       "name": "Sassy Scope",
diff --git a/plugins/Makefile b/plugins/Makefile
index 7931034..3560229 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -255,18 +255,12 @@ PLUGIN_FILES += Cardinal/src/glBars.cpp
 endif
 endif
 
-ifneq ($(STATIC_BUILD),true)
+ifneq ($(MOD_BUILD),true)
 PLUGIN_FILES += Cardinal/src/AudioFile.cpp
 ifneq ($(WASM),true)
 PLUGIN_FILES += Cardinal/src/Carla.cpp
 PLUGIN_FILES += Cardinal/src/Ildaeil.cpp
 endif
-ifneq ($(HEADLESS),true)
-ifeq ($(HAVE_X11),true)
-PLUGIN_FILES += Cardinal/src/EmbedWidget.cpp
-PLUGIN_FILES += Cardinal/src/MPV.cpp
-endif
-endif
 endif
 
 ifneq ($(HEADLESS),true)
@@ -810,7 +804,7 @@ IHTSYN_CUSTOM_PER_FILE += mv_statevariable
 
 PLUGIN_FILES += $(filter-out JW-Modules/src/JWModules.cpp JW-Modules/src/Str1ker.cpp,$(wildcard JW-Modules/src/*.cpp))
 
-ifneq ($(STATIC_BUILD),true)
+ifneq ($(MOD_BUILD),true)
 PLUGIN_FILES += JW-Modules/src/Str1ker.cpp
 PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/ip/*.cpp)
 PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/osc/*.cpp)
diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
index d5d1de8..bde0d12 100644
--- a/plugins/plugins.cpp
+++ b/plugins/plugins.cpp
@@ -1157,12 +1157,12 @@ static void initStatic__Cardinal()
        #else
         spl.removeModule("glBars");
        #endif
-       #ifndef STATIC_BUILD
+       #ifndef __MOD_DEVICES__
         p->addModel(modelAudioFile);
        #else
         spl.removeModule("AudioFile");
        #endif
-       #if !(defined(DISTRHO_OS_WASM) || defined(STATIC_BUILD))
+       #if !(defined(DISTRHO_OS_WASM) || defined(__MOD_DEVICES__))
         p->addModel(modelCarla);
         p->addModel(modelIldaeil);
        #else
@@ -1174,11 +1174,6 @@ static void initStatic__Cardinal()
        #else
         spl.removeModule("SassyScope");
        #endif
-       #if defined(HAVE_X11) && !defined(HEADLESS) && !defined(STATIC_BUILD)
-        p->addModel(modelMPV);
-       #else
-        spl.removeModule("MPV");
-       #endif
        #ifdef HAVE_FFTW3F
         p->addModel(modelAudioToCVPitch);
        #else
@@ -2599,7 +2594,7 @@ static void initStatic__JW()
         p->addModel(modelCoolBreeze);
         p->addModel(modelPete);
         p->addModel(modelTimer);
-       #ifndef STATIC_BUILD
+       #ifndef __MOD_DEVICES__
         p->addModel(modelStr1ker);
        #else
         spl.removeModule("Str1ker");