Skip to content

use gui selector with new NanoVG option #2351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dromer wants to merge 2 commits into
base: develop
Choose a base branch
from
+19 −7
Draft

use gui selector with new NanoVG option #2351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5179c6
use gui selector with new NanoVG option
dromer Jun 3, 2026
5faa846
remove pdvg after compiling
dromer Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions Source/Heavy/DPFExporter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class DPFExporter final : public ExporterBase {
Value jackEnableValue = Value(var(0));

Value exportTypeValue = Value(var(1));
Value guiTypeValue = Value(var(1));
Value pluginTypeValue = Value(var(1));

Value disableSIMD = Value(var(0));
Expand All @@ -32,7 +33,8 @@ class DPFExporter final : public ExporterBase {
PropertiesArray properties;
properties.add(new PropertiesPanel::EditableComponent<String>("Maker Name (optional)", makerNameValue));
properties.add(new PropertiesPanel::EditableComponent<String>("Project License (optional)", projectLicenseValue));
properties.add(new PropertiesPanel::ComboComponent("Export type", exportTypeValue, { "Binary", "Binary + GUI", "Source code", "Source + GUI code" }));
properties.add(new PropertiesPanel::ComboComponent("Export type", exportTypeValue, { "Binary", "Source code" }));
properties.add(new PropertiesPanel::ComboComponent("Gui type", guiTypeValue, { "None", "ImGui", "NanoVG" }));
properties.add(new PropertiesPanel::ComboComponent("Plugin type", pluginTypeValue, { "Effect", "Instrument", "Custom" }));

midiinProperty = new PropertiesPanel::BoolComponent("Midi Input", midiinEnableValue, { "No", "yes" });
Expand Down Expand Up @@ -88,6 +90,7 @@ class DPFExporter final : public ExporterBase {
state->setProperty("clap_enable_value", getValue<int>(clapEnableValue));
state->setProperty("jack_enable_value", getValue<int>(jackEnableValue));
state->setProperty("export_type_value", getValue<int>(exportTypeValue));
state->setProperty("gui_type_value", getValue<int>(guiTypeValue));
state->setProperty("plugin_type_value", getValue<int>(pluginTypeValue));
state->setProperty("disable_simd", getValue<int>(disableSIMD));
globalState->setProperty("dpf", state);
Expand All @@ -110,6 +113,7 @@ class DPFExporter final : public ExporterBase {
clapEnableValue = state->getProperty("clap_enable_value");
jackEnableValue = state->getProperty("jack_enable_value");
exportTypeValue = state->getProperty("export_type_value");
guiTypeValue = state->getProperty("gui_type_value");
pluginTypeValue = state->getProperty("plugin_type_value");
disableSIMD = state->getProperty("disable_simd");
}
Expand Down Expand Up @@ -149,6 +153,7 @@ class DPFExporter final : public ExporterBase {
auto const projectLicense = getValue<String>(projectLicenseValue);

auto const exportType = getValue<int>(exportTypeValue);
auto const guiType = getValue<int>(guiTypeValue);
auto const midiin = getValue<int>(midiinEnableValue);
auto const midiout = getValue<int>(midioutEnableValue);

Expand Down Expand Up @@ -197,8 +202,11 @@ class DPFExporter final : public ExporterBase {
metaDPF.getDynamicObject()->setProperty("midi_output", midiout);
metaDPF.getDynamicObject()->setProperty("plugin_formats", formats);

if (exportType == 2 || exportType == 4) {
metaDPF.getDynamicObject()->setProperty("enable_ui", true);
if (guiType == 2) {
metaDPF.getDynamicObject()->setProperty("enable_ui", 1);
} else if (guiType == 3) {
metaDPF.getDynamicObject()->setProperty("enable_ui", 2);
args.add("--gui");
}

metaJson->setProperty("dpf", metaDPF);
Expand Down Expand Up @@ -235,12 +243,15 @@ class DPFExporter final : public ExporterBase {
auto const DPF = toolchainDir.getChildFile("lib").getChildFile("dpf");
DPF.copyDirectoryTo(outputFile.getChildFile("dpf"));

if (exportType == 2 || exportType == 4) {
if (guiType == 2) {
auto const DPFGui = toolchainDir.getChildFile("lib").getChildFile("dpf-widgets");
DPFGui.copyDirectoryTo(outputFile.getChildFile("dpf-widgets"));
} else if (guiType == 3) {
auto const DPFGui = toolchainDir.getChildFile("lib").getChildFile("pdvg");
DPFGui.copyDirectoryTo(outputFile.getChildFile("pdvg"));
}

if (exportType == 3 || exportType == 4) {
if (exportType == 2) {
metaJsonFile.copyFileTo(outputFile.getChildFile("meta.json"));
}

Expand All @@ -249,7 +260,7 @@ class DPFExporter final : public ExporterBase {

bool const generationExitCode = getExitCode();
// Check if we need to compile
if (!generationExitCode && (exportType == 1 || exportType == 2)) {
if (!generationExitCode && (exportType == 1)) {
auto const workingDir = File::getCurrentWorkingDirectory();

outputFile.setAsCurrentWorkingDirectory();
Expand Down Expand Up @@ -304,7 +315,7 @@ class DPFExporter final : public ExporterBase {
OSUtils::moveFileTo(outputFile.getChildFile("bin").getChildFile(name + ".clap"), outputFile.getChildFile(name + ".clap"));
if (jack) {
#if JUCE_MAC
if (exportType == 2) {
if (guiType == 2 || guiType == 3){
OSUtils::moveFileTo(outputFile.getChildFile("bin").getChildFile(name + ".app"), outputFile.getChildFile(name + ".app"));
} else {
OSUtils::moveFileTo(outputFile.getChildFile("bin").getChildFile(name), outputFile.getChildFile(name));
Expand All @@ -322,6 +333,7 @@ class DPFExporter final : public ExporterBase {
if (!compilationExitCode) {
outputFile.getChildFile("dpf").deleteRecursively();
outputFile.getChildFile("dpf-widgets").deleteRecursively();
outputFile.getChildFile("pdvg").deleteRecursively();
outputFile.getChildFile("build").deleteRecursively();
outputFile.getChildFile("plugin").deleteRecursively();
outputFile.getChildFile("bin").deleteRecursively();
Expand Down