From 994ff05567cd4d0c9f39284969f2003a467c4884 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 5 Dec 2021 16:47:04 +0000 Subject: [PATCH] Stop using VCV name Signed-off-by: falkTX --- README.md | 3 ++- doc/DIFFERENCES.md | 4 ++-- plugins/Core.json | 12 ++++++------ plugins/Fundamental | 2 +- src/override/MenuBar.cpp | 8 ++------ src/override/asset.cpp | 2 +- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 8fbb8ab..e2ec794 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ At the moment the following 3rd-party modules are provided: - Fundamental - Glue the Giant - Grande +- HetrickCV - Impromptu - JW-Modules - MindMeld @@ -132,7 +133,7 @@ While Rack tries to mitigate this as much as possible, crashes due to conflictin On the other side, Cardinal redefines class and function names as needed to avoid as many conflicts as possible. Support for ARM and non-mainstream platforms (for example BSD) has also always been missing from the official Rack since the start. -While we can patch the Rack free version to support these, same can't be done with VCV Rack Pro with it being a closed-source product. +While we can patch the Rack free version to support these, same can't be done with Rack Pro with it being a closed-source product. The online library/store only supports a very specific set of platforms too, so non-supported platforms would need any 3rd-party modules to be manually compiled to make them usable. diff --git a/doc/DIFFERENCES.md b/doc/DIFFERENCES.md index 67f2ecf..a3b6fc8 100644 --- a/doc/DIFFERENCES.md +++ b/doc/DIFFERENCES.md @@ -1,6 +1,6 @@ # RACK PRO VS CARDINAL DIFFERENCES -This document describes the differences between VCV Rack Pro plugin and Cardinal. +This document describes the differences between Rack Pro plugin and Cardinal. It is not possible to know all the internal details of the official plugin due to it not being open-source, so more technical details are best-guesses based on its behaviour. @@ -12,7 +12,7 @@ Online access is also not allowed. Bellow follows a list of features comparing the official plugin to Cardinal. -| Feature | VCV Rack Pro | Cardinal | Additional notes | +| Feature | Rack Pro | Cardinal | Additional notes | |--------------------------------|---------------------------|---------------------------------|------------------| | Open-Source | No | Yes | | | Free (of cost) | No | Yes | | diff --git a/plugins/Core.json b/plugins/Core.json index 4479d9c..ad0c5c1 100644 --- a/plugins/Core.json +++ b/plugins/Core.json @@ -1,16 +1,16 @@ { "slug": "Core", - "name": "VCV Core", - "version": "2.0.0", + "name": "Cardinal Core", + "version": "2.0.1", "license": "GPL-3.0-or-later", - "author": "VCV", - "brand": "VCV", + "author": "Vortico", + "brand": "Vortico", "authorEmail": "support@vcvrack.com", "authorUrl": "https://vcvrack.com/", "manualUrl": "https://vcvrack.com/manual/Core", "sourceUrl": "https://github.com/VCVRack/Rack", "changelogUrl": "https://github.com/VCVRack/Rack/blob/v2/CHANGELOG.md", - "description": "Necessary modules built into VCV Rack", + "description": "Necessary modules built into Cardinal", "modules": [ { "slug": "AudioInterface2", @@ -130,4 +130,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/plugins/Fundamental b/plugins/Fundamental index 08b9a28..a171111 160000 --- a/plugins/Fundamental +++ b/plugins/Fundamental @@ -1 +1 @@ -Subproject commit 08b9a2841f9c84b73c915950afdc695307db8516 +Subproject commit a171111f442edf7e4c0357e9863506775b4bc208 diff --git a/src/override/MenuBar.cpp b/src/override/MenuBar.cpp index fcbff1c..8d5fee2 100644 --- a/src/override/MenuBar.cpp +++ b/src/override/MenuBar.cpp @@ -618,11 +618,7 @@ struct HelpButton : MenuButton { menu->cornerFlags = BND_CORNER_TOP; menu->box.pos = getAbsoluteOffset(math::Vec(0, box.size.y)); - menu->addChild(createMenuItem("Tips", "", [=]() { - APP->scene->addChild(tipWindowCreate()); - })); - - menu->addChild(createMenuItem("VCV User manual", "F1", [=]() { + menu->addChild(createMenuItem("Rack User manual", "F1", [=]() { system::openBrowser("https://vcvrack.com/manual/"); })); @@ -634,7 +630,7 @@ struct HelpButton : MenuButton { menu->addChild(createMenuLabel(APP_EDITION + " " + APP_EDITION_NAME)); - menu->addChild(createMenuLabel("VCVRack " + APP_VERSION + " Compatible")); + menu->addChild(createMenuLabel("Rack " + APP_VERSION + " Compatible")); } }; diff --git a/src/override/asset.cpp b/src/override/asset.cpp index 6ff6457..4a243b3 100644 --- a/src/override/asset.cpp +++ b/src/override/asset.cpp @@ -81,7 +81,7 @@ std::string pluginManifest(const std::string& dirname) { if (bundlePath.empty()) { if (dirname == "Core") - return system::join(systemDir, "Core.json"); + return system::join(systemDir, "..", "..", "plugins", "Core.json"); return system::join(systemDir, "..", "..", "plugins", dirname, "plugin.json"); } return system::join(bundlePath, dirname + ".json");