zynaddsubfx

ZynAddSubFX open source synthesizer
Log | Files | Refs | Submodules | LICENSE

commit 012e48f2be51321d791c2450c725b9895f83e7e5
parent 0de12993319d3ac1034073830d099c5a1330936b
Author: falkTX <falktx@gmail.com>
Date:   Sun, 14 Feb 2016 21:21:04 +0100

Use a winId '1' as a way to detect plugin, but do not embed

Diffstat:
Msrc/Plugin/ZynAddSubFX/ZynAddSubFX-UI.cpp | 2+-
Msrc/UI/guimain.cpp | 11++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI.cpp b/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI.cpp @@ -90,7 +90,7 @@ private: sprintf(urlAsString, "osc.udp://localhost:%i/", url); char winIdAsString[32]; - sprintf(winIdAsString, "%llu", (long long unsigned)winId); + sprintf(winIdAsString, "%llu", (long long unsigned)(winId ? winId : 1)); printf("Now respawning at '%s', using winId '%s'\n", urlAsString, winIdAsString); diff --git a/src/UI/guimain.cpp b/src/UI/guimain.cpp @@ -198,12 +198,17 @@ ui_handle_t GUI::createUi(Fl_Osc_Interface *osc, void *exit) { if (long long winId = atoll(embedId)) { - // running embed as plugin + // running as plugin isPlugin = true; MasterUI::menu_mastermenu[11].hide(); // file -> nio settings - MasterUI::menu_mastermenu[13].hide(); // file -> exit MasterUI::menu_mastermenu[26].deactivate(); // misc -> switch interface mode - fl_embed(ui->masterwindow, winId); + + if (winId != 1) + { + MasterUI::menu_mastermenu[13].hide(); // file -> exit + fl_embed(ui->masterwindow, winId); + } + ui->masterwindow->show(); } }