Skip to content

Commit a1b55ef

Browse files
committed
Remove mpv test plugin, cleanup
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 80454b5 commit a1b55ef

3 files changed

Lines changed: 5 additions & 25 deletions

File tree

plugins/Cardinal/plugin.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,6 @@
192192
"Utility"
193193
]
194194
},
195-
{
196-
"slug": "MPV",
197-
"name": "MPV",
198-
"description": "An embed video player inside Cardinal",
199-
"manualUrl": "https://github.com/DISTRHO/Cardinal/blob/main/docs/CARDINAL-MODULES.md#mpv",
200-
"tags": [
201-
"Visual"
202-
]
203-
},
204195
{
205196
"slug": "SassyScope",
206197
"name": "Sassy Scope",

plugins/Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -255,18 +255,12 @@ PLUGIN_FILES += Cardinal/src/glBars.cpp
255255
endif
256256
endif
257257

258-
ifneq ($(STATIC_BUILD),true)
258+
ifneq ($(MOD_BUILD),true)
259259
PLUGIN_FILES += Cardinal/src/AudioFile.cpp
260260
ifneq ($(WASM),true)
261261
PLUGIN_FILES += Cardinal/src/Carla.cpp
262262
PLUGIN_FILES += Cardinal/src/Ildaeil.cpp
263263
endif
264-
ifneq ($(HEADLESS),true)
265-
ifeq ($(HAVE_X11),true)
266-
PLUGIN_FILES += Cardinal/src/EmbedWidget.cpp
267-
PLUGIN_FILES += Cardinal/src/MPV.cpp
268-
endif
269-
endif
270264
endif
271265

272266
ifneq ($(HEADLESS),true)
@@ -810,7 +804,7 @@ IHTSYN_CUSTOM_PER_FILE += mv_statevariable
810804

811805
PLUGIN_FILES += $(filter-out JW-Modules/src/JWModules.cpp JW-Modules/src/Str1ker.cpp,$(wildcard JW-Modules/src/*.cpp))
812806

813-
ifneq ($(STATIC_BUILD),true)
807+
ifneq ($(MOD_BUILD),true)
814808
PLUGIN_FILES += JW-Modules/src/Str1ker.cpp
815809
PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/ip/*.cpp)
816810
PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/osc/*.cpp)

plugins/plugins.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,12 +1157,12 @@ static void initStatic__Cardinal()
11571157
#else
11581158
spl.removeModule("glBars");
11591159
#endif
1160-
#ifndef STATIC_BUILD
1160+
#ifndef __MOD_DEVICES__
11611161
p->addModel(modelAudioFile);
11621162
#else
11631163
spl.removeModule("AudioFile");
11641164
#endif
1165-
#if !(defined(DISTRHO_OS_WASM) || defined(STATIC_BUILD))
1165+
#if !(defined(DISTRHO_OS_WASM) || defined(__MOD_DEVICES__))
11661166
p->addModel(modelCarla);
11671167
p->addModel(modelIldaeil);
11681168
#else
@@ -1174,11 +1174,6 @@ static void initStatic__Cardinal()
11741174
#else
11751175
spl.removeModule("SassyScope");
11761176
#endif
1177-
#if defined(HAVE_X11) && !defined(HEADLESS) && !defined(STATIC_BUILD)
1178-
p->addModel(modelMPV);
1179-
#else
1180-
spl.removeModule("MPV");
1181-
#endif
11821177
#ifdef HAVE_FFTW3F
11831178
p->addModel(modelAudioToCVPitch);
11841179
#else
@@ -2599,7 +2594,7 @@ static void initStatic__JW()
25992594
p->addModel(modelCoolBreeze);
26002595
p->addModel(modelPete);
26012596
p->addModel(modelTimer);
2602-
#ifndef STATIC_BUILD
2597+
#ifndef __MOD_DEVICES__
26032598
p->addModel(modelStr1ker);
26042599
#else
26052600
spl.removeModule("Str1ker");

0 commit comments

Comments
 (0)