Browse Source

Fix a few details of mini version, show mini demo patches

Signed-off-by: falkTX <falktx@falktx.com>
tags/23.02
falkTX 2 years ago
parent
commit
30941542d3
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 7 additions and 9 deletions
  1. +2
    -2
      src/CardinalUI.cpp
  2. +4
    -6
      src/override/MenuBar.cpp
  3. +1
    -1
      src/override/Scene.cpp

+ 2
- 2
src/CardinalUI.cpp View File

@@ -347,8 +347,6 @@ public:
rack::contextSet(context);

#if CARDINAL_VARIANT_MINI
DISTRHO_SAFE_ASSERT(remoteUtils::connectToRemote());

// create unique temporary path for this instance
try {
char uidBuf[24];
@@ -403,6 +401,8 @@ public:
context->patch->loadTemplate();
context->scene->rackScroll->reset();

DISTRHO_SAFE_ASSERT(remoteUtils::connectToRemote());

Engine_setRemoteDetails(context->engine, remoteDetails);
#endif



+ 4
- 6
src/override/MenuBar.cpp View File

@@ -101,15 +101,16 @@ struct MenuButton : ui::Button {

struct FileButton : MenuButton {
const bool isStandalone;
#if ! CARDINAL_VARIANT_MINI
std::vector<std::string> demoPatches;
#endif

FileButton(const bool standalone)
: MenuButton(), isStandalone(standalone)
{
#if ! CARDINAL_VARIANT_MINI
#if CARDINAL_VARIANT_MINI
const std::string patchesDir = asset::patchesPath() + DISTRHO_OS_SEP_STR "mini";
#else
const std::string patchesDir = asset::patchesPath() + DISTRHO_OS_SEP_STR "examples";
#endif

if (system::isDirectory(patchesDir))
{
@@ -118,7 +119,6 @@ struct FileButton : MenuButton {
return string::lowercase(a) < string::lowercase(b);
});
}
#endif
}

void onAction(const ActionEvent& e) override {
@@ -211,7 +211,6 @@ struct FileButton : MenuButton {
#endif
#endif

#if ! CARDINAL_VARIANT_MINI
if (!demoPatches.empty())
{
menu->addChild(new ui::MenuSeparator);
@@ -237,7 +236,6 @@ struct FileButton : MenuButton {
}));
}));
}
#endif

#ifndef DISTRHO_OS_WASM
if (isStandalone) {


+ 1
- 1
src/override/Scene.cpp View File

@@ -218,7 +218,7 @@ void Scene::step() {
const std::string& name(APP->history->actions[actionIndex - 1]->name);
static const std::vector<std::string> ignoredNames = {
"move knob",
"move module",
"move modules",
"move switch",
};
if (std::find(ignoredNames.cbegin(), ignoredNames.cend(), name) == ignoredNames.cend()) {


Loading…
Cancel
Save