Browse Source

Merge branch 'DISTRHO:main' into update-sonus2

pull/740/head
rl2939 GitHub 1 month ago
parent
commit
4eb553d444
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
12 changed files with 34 additions and 14 deletions
  1. +1
    -1
      .github/ISSUE_TEMPLATE/bug.yaml
  2. +2
    -2
      .github/workflows/build.yml
  3. +1
    -1
      Makefile
  4. +11
    -0
      docs/OSC-REMOTE-CONTROL.md
  5. +1
    -0
      plugins/Cardinal/plugin.json
  6. +1
    -1
      plugins/Sapphire
  7. +1
    -1
      plugins/Venom
  8. +12
    -4
      plugins/plugins.cpp
  9. +1
    -1
      src/CardinalCommon.cpp
  10. +1
    -1
      src/CardinalPlugin.cpp
  11. +1
    -1
      utils/macOS/Info_JACK.plist
  12. +1
    -1
      utils/macOS/Info_Native.plist

+ 1
- 1
.github/ISSUE_TEMPLATE/bug.yaml View File

@@ -5,7 +5,7 @@ body:
id: version
attributes:
label: Version
value: "25.10"
value: "25.12"
validations:
required: true
- type: dropdown


+ 2
- 2
.github/workflows/build.yml View File

@@ -3,7 +3,7 @@ name: build
on: [push, pull_request]

env:
CACHE_VERSION: 12
CACHE_VERSION: 14
CARDINAL_UNDER_WINE: 1
CIBUILD: true
DEBIAN_FRONTEND: noninteractive
@@ -158,7 +158,7 @@ jobs:
*.tar.xz

macos:
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v4
with:


+ 1
- 1
Makefile View File

@@ -15,7 +15,7 @@ include $(ROOT)/Makefile.base.mk
# src/CardinalPlugin.cpp `getVersion`
# utils/macOS/Info_{JACK,Native}.plist
# .github/ISSUE_TEMPLATE/bug.yaml src/CardinalCommon.cpp src/CardinalPlugin.cpp utils/macOS/Info_{JACK,Native}.plist
VERSION = 25.10
VERSION = 25.12

# ---------------------------------------------------------------------------------------------------------------------
# Build targets


+ 11
- 0
docs/OSC-REMOTE-CONTROL.md View File

@@ -23,6 +23,17 @@ If all went well opening the "Engine" menu again should show a checkmark, indica
For the moment there is no error dialog or information in case things go wrong.
If you are unable to connect, make sure your OS network firewall settings allows opening port 2228.

### Automatic startup on headless builds

If you do a headless build there is no UI to click on to enable remote control, so for this reason the headless builds (standalone, not plugins) will have OSC remote control enabled by default.

To change the port for the OSC server use the `CARDINAL_REMOTE_HOST_PORT` environment variable, for example:
```sh
env CARDINAL_REMOTE_HOST_PORT=2228 CardinalNative
```

This can be useful for starting Cardinal where no mouse/keyboard are attached but you want remote control.

## TouchOSC example setup

A TouchOSC compatible file is available [here](https://github.com/DISTRHO/Cardinal/raw/main/patches/touchosc/24-direct-fader-params.tosc).


+ 1
- 0
plugins/Cardinal/plugin.json View File

@@ -171,6 +171,7 @@
"description": "Converts a monophonic audio signal to CV pitch",
"manualUrl": "https://github.com/DISTRHO/Cardinal/blob/main/docs/CARDINAL-MODULES.md#audio-to-cv-pitch",
"tags": [
"Tuner",
"Utility"
]
},


+ 1
- 1
plugins/Sapphire

@@ -1 +1 @@
Subproject commit ef10da4e2578162b2db2f6534857d6504491daf4
Subproject commit 191fbee21a6be7d9c18eacc6f3a1804455d5358d

+ 1
- 1
plugins/Venom

@@ -1 +1 @@
Subproject commit 1dc0e0612b75fcf4849f28cb6e569e3b6f13981a
Subproject commit ba95ede2370d340e0f7143dd897ff7e089bda336

+ 12
- 4
plugins/plugins.cpp View File

@@ -1069,10 +1069,17 @@ struct StaticPluginLoader {
return;
}

// force ABI, we use static plugins so this doesnt matter as long as it builds
json_t* const version = json_string((APP_VERSION_MAJOR + ".0").c_str());
json_object_set(rootJ, "version", version);
json_decref(version);
std::string version;
if (json_t* const versionJ = json_object_get(rootJ, "version"))
version = json_string_value(versionJ);

if (!string::startsWith(version, APP_VERSION_MAJOR + "."))
{
// force ABI, we use static plugins so this doesnt matter as long as it builds
json_t* const versionJ = json_string((APP_VERSION_MAJOR + ".0").c_str());
json_object_set(rootJ, "version", versionJ);
json_decref(versionJ);
}

// Load manifest
p->fromJson(rootJ);
@@ -3526,6 +3533,7 @@ static void initStatic__Venom()
p->addModel(modelVenomMousePad);
p->addModel(modelVenomMultiMerge);
p->addModel(modelVenomMultiSplit);
p->addModel(modelVenomSVF);
p->addModel(modelVenomOscillator);
p->addModel(modelVenomNORS_IQ);
p->addModel(modelVenomNORSIQChord2Scale);


+ 1
- 1
src/CardinalCommon.cpp View File

@@ -99,7 +99,7 @@ void destroyStaticPlugins();
}
}

const std::string CARDINAL_VERSION = "25.10";
const std::string CARDINAL_VERSION = "25.12";

// -----------------------------------------------------------------------------------------------------------



+ 1
- 1
src/CardinalPlugin.cpp View File

@@ -414,7 +414,7 @@ protected:
uint32_t getVersion() const override
{
return d_version(0, 25, 10);
return d_version(0, 25, 12);
}
int64_t getUniqueId() const override


+ 1
- 1
utils/macOS/Info_JACK.plist View File

@@ -11,7 +11,7 @@
<key>CFBundleIdentifier</key>
<string>studio.kx.distrho.cardinal.jack</string>
<key>CFBundleShortVersionString</key>
<string>25.10</string>
<string>25.12</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>NSHumanReadableCopyright</key>


+ 1
- 1
utils/macOS/Info_Native.plist View File

@@ -11,7 +11,7 @@
<key>CFBundleIdentifier</key>
<string>studio.kx.distrho.cardinal.native</string>
<key>CFBundleShortVersionString</key>
<string>25.10</string>
<string>25.12</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>NSHumanReadableCopyright</key>


Loading…
Cancel
Save