skyler
/
Lightningbeam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: skyler:cfb8e4462b105b6995bd5b56c1a2517927f4dbe1
Branches Tags
skyler:main
skyler:rust-ui
..
compare: skyler:434b488a4cabb5e54af6a4ea73c73ddda2aa7888
Branches Tags
skyler:rust-ui
skyler:main

No commits in common. "cfb8e4462b105b6995bd5b56c1a2517927f4dbe1" and "434b488a4cabb5e54af6a4ea73c73ddda2aa7888" have entirely different histories.
cfb8e4462b ... 434b488a4c

56 changed files with 313 additions and 6468 deletions
Show Stats Expand all files Collapse all files

367
daw-backend/Cargo.lock generated
View File

@ -2,23 +2,6 @@
# It is not intended for manual editing.
version = 4
[[package]]
name = "adler2"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
[[package]]
name = "aes"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
dependencies = [
"cfg-if",
"cipher",
"cpufeatures",
]
[[package]]
name = "aho-corasick"
version = "1.1.3"
@ -86,12 +69,6 @@ version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "base64ct"
version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
[[package]]
name = "beamdsp"
version = "0.1.0"
@ -129,15 +106,6 @@ version = "2.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
[[package]]
name = "block-buffer"
version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
dependencies = [
"generic-array",
]
[[package]]
name = "block2"
version = "0.6.2"
@ -159,38 +127,12 @@ version = "1.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
[[package]]
name = "byteorder"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
[[package]]
name = "bzip2"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
dependencies = [
"bzip2-sys",
"libc",
]
[[package]]
name = "bzip2-sys"
version = "0.1.13+1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
dependencies = [
"cc",
"pkg-config",
]
[[package]]
name = "cassowary"
version = "0.3.0"
@ -213,8 +155,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
dependencies = [
"find-msvc-tools",
"jobserver",
"libc",
"shlex",
]
@ -239,16 +179,6 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
[[package]]
name = "cipher"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
dependencies = [
"crypto-common",
"inout",
]
[[package]]
name = "clang-sys"
version = "1.8.1"
@ -292,12 +222,6 @@ dependencies = [
"static_assertions",
]
[[package]]
name = "constant_time_eq"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
[[package]]
name = "core-foundation"
version = "0.9.4"
@ -378,24 +302,6 @@ dependencies = [
"windows 0.62.2",
]
[[package]]
name = "cpufeatures"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
dependencies = [
"libc",
]
[[package]]
name = "crc32fast"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
dependencies = [
"cfg-if",
]
[[package]]
name = "crossbeam-deque"
version = "0.8.6"
@ -446,16 +352,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "crypto-common"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
dependencies = [
"generic-array",
"typenum",
]
[[package]]
name = "dasp_envelope"
version = "0.11.0"
@ -601,27 +497,6 @@ dependencies = [
"serde",
"serde_json",
"symphonia",
"zip",
]
[[package]]
name = "deranged"
version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
dependencies = [
"powerfmt",
]
[[package]]
name = "digest"
version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer",
"crypto-common",
"subtle",
]
[[package]]
@ -704,32 +579,12 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
version = "1.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
dependencies = [
"crc32fast",
"miniz_oxide",
]
[[package]]
name = "foldhash"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]]
name = "generic-array"
version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
]
[[package]]
name = "getrandom"
version = "0.2.16"
@ -741,18 +596,6 @@ dependencies = [
"wasi",
]
[[package]]
name = "getrandom"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
"libc",
"r-efi",
"wasip2",
]
[[package]]
name = "glob"
version = "0.3.3"
@ -794,15 +637,6 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
[[package]]
name = "hmac"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [
"digest",
]
[[package]]
name = "hound"
version = "3.5.1"
@ -829,15 +663,6 @@ dependencies = [
"hashbrown 0.16.0",
]
[[package]]
name = "inout"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
dependencies = [
"generic-array",
]
[[package]]
name = "itertools"
version = "0.12.1"
@ -884,16 +709,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]]
name = "jobserver"
version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
dependencies = [
"getrandom 0.3.4",
"libc",
]
[[package]]
name = "js-sys"
version = "0.3.81"
@ -1005,16 +820,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
dependencies = [
"adler2",
"simd-adler32",
]
[[package]]
name = "mio"
version = "0.8.11"
@ -1084,12 +889,6 @@ dependencies = [
"minimal-lexical",
]
[[package]]
name = "num-conv"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
[[package]]
name = "num-derive"
version = "0.4.2"
@ -1260,17 +1059,6 @@ dependencies = [
"windows-link",
]
[[package]]
name = "password-hash"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
dependencies = [
"base64ct",
"rand_core",
"subtle",
]
[[package]]
name = "paste"
version = "1.0.15"
@ -1283,18 +1071,6 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
[[package]]
name = "pbkdf2"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
dependencies = [
"digest",
"hmac",
"password-hash",
"sha2",
]
[[package]]
name = "petgraph"
version = "0.5.1"
@ -1321,12 +1097,6 @@ version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
name = "powerfmt"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
[[package]]
name = "ppv-lite86"
version = "0.2.21"
@ -1363,12 +1133,6 @@ dependencies = [
"proc-macro2",
]
[[package]]
name = "r-efi"
version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
[[package]]
name = "rand"
version = "0.8.5"
@ -1396,7 +1160,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
"getrandom 0.2.16",
"getrandom",
]
[[package]]
@ -1559,28 +1323,6 @@ dependencies = [
"serde_core",
]
[[package]]
name = "sha1"
version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
dependencies = [
"cfg-if",
"cpufeatures",
"digest",
]
[[package]]
name = "sha2"
version = "0.10.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
dependencies = [
"cfg-if",
"cpufeatures",
"digest",
]
[[package]]
name = "shlex"
version = "1.3.0"
@ -1617,12 +1359,6 @@ dependencies = [
"libc",
]
[[package]]
name = "simd-adler32"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
[[package]]
name = "smallvec"
version = "1.15.1"
@ -1667,12 +1403,6 @@ dependencies = [
"syn",
]
[[package]]
name = "subtle"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "symphonia"
version = "0.5.5"
@ -1899,25 +1629,6 @@ dependencies = [
"syn",
]
[[package]]
name = "time"
version = "0.3.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
dependencies = [
"deranged",
"num-conv",
"powerfmt",
"serde_core",
"time-core",
]
[[package]]
name = "time-core"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
[[package]]
name = "toml_datetime"
version = "0.7.3"
@ -1948,12 +1659,6 @@ dependencies = [
"winnow",
]
[[package]]
name = "typenum"
version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
[[package]]
name = "unicode-ident"
version = "1.0.19"
@ -1989,12 +1694,6 @@ version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "version_check"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "walkdir"
version = "2.5.0"
@ -2011,15 +1710,6 @@ version = "0.11.1+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasip2"
version = "1.0.2+wasi-0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
dependencies = [
"wit-bindgen",
]
[[package]]
name = "wasm-bindgen"
version = "0.2.104"
@ -2408,12 +2098,6 @@ dependencies = [
"memchr",
]
[[package]]
name = "wit-bindgen"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
[[package]]
name = "zerocopy"
version = "0.8.27"
@ -2433,52 +2117,3 @@ dependencies = [
"quote",
"syn",
]
[[package]]
name = "zip"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
dependencies = [
"aes",
"byteorder",
"bzip2",
"constant_time_eq",
"crc32fast",
"crossbeam-utils",
"flate2",
"hmac",
"pbkdf2",
"sha1",
"time",
"zstd",
]
[[package]]
name = "zstd"
version = "0.11.2+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
dependencies = [
"zstd-safe",
]
[[package]]
name = "zstd-safe"
version = "5.0.2+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
dependencies = [
"libc",
"zstd-sys",
]
[[package]]
name = "zstd-sys"
version = "2.0.16+zstd.1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
dependencies = [
"cc",
"pkg-config",
]

61
daw-backend/src/audio/clip.rs
View File

@ -15,7 +15,6 @@ pub type ClipId = AudioClipInstanceId;
/// ## Timing Model
/// - `internal_start` / `internal_end`: Define the region of the source audio to play (trimming)
/// - `external_start` / `external_duration`: Define where the clip appears on the timeline and how long
/// - `*_beats` / `*_frames`: Derived representations for Measures/Frames mode display
///
/// ## Looping
/// If `external_duration` is greater than `internal_end - internal_start`,
@ -27,21 +26,13 @@ pub struct AudioClipInstance {
/// Start position within the audio content (seconds)
pub internal_start: f64,
#[serde(default)] pub internal_start_beats: f64,
#[serde(default)] pub internal_start_frames: f64,
/// End position within the audio content (seconds)
pub internal_end: f64,
#[serde(default)] pub internal_end_beats: f64,
#[serde(default)] pub internal_end_frames: f64,
/// Start position on the timeline (seconds)
pub external_start: f64,
#[serde(default)] pub external_start_beats: f64,
#[serde(default)] pub external_start_frames: f64,
/// Duration on the timeline (seconds) - can be longer than internal duration for looping
pub external_duration: f64,
#[serde(default)] pub external_duration_beats: f64,
#[serde(default)] pub external_duration_frames: f64,
/// Clip-level gain
pub gain: f32,
@ -71,17 +62,9 @@ impl AudioClipInstance {
id,
audio_pool_index,
internal_start,
internal_start_beats: 0.0,
internal_start_frames: 0.0,
internal_end,
internal_end_beats: 0.0,
internal_end_frames: 0.0,
external_start,
external_start_beats: 0.0,
external_start_frames: 0.0,
external_duration,
external_duration_beats: 0.0,
external_duration_frames: 0.0,
gain: 1.0,
read_ahead: None,
}
@ -100,17 +83,9 @@ impl AudioClipInstance {
id,
audio_pool_index,
internal_start: offset,
internal_start_beats: 0.0,
internal_start_frames: 0.0,
internal_end: offset + duration,
internal_end_beats: 0.0,
internal_end_frames: 0.0,
external_start: start_time,
external_start_beats: 0.0,
external_start_frames: 0.0,
external_duration: duration,
external_duration_beats: 0.0,
external_duration_frames: 0.0,
gain: 1.0,
read_ahead: None,
}
@ -172,40 +147,4 @@ impl AudioClipInstance {
pub fn set_gain(&mut self, gain: f32) {
self.gain = gain.max(0.0);
}
/// Populate beats/frames from the current seconds values.
pub fn sync_from_seconds(&mut self, bpm: f64, fps: f64) {
self.external_start_beats = self.external_start * bpm / 60.0;
self.external_start_frames = self.external_start * fps;
self.external_duration_beats = self.external_duration * bpm / 60.0;
self.external_duration_frames = self.external_duration * fps;
self.internal_start_beats = self.internal_start * bpm / 60.0;
self.internal_start_frames = self.internal_start * fps;
self.internal_end_beats = self.internal_end * bpm / 60.0;
self.internal_end_frames = self.internal_end * fps;
}
/// BPM changed; recompute seconds/frames from the stored beats values.
pub fn apply_beats(&mut self, bpm: f64, fps: f64) {
self.external_start = self.external_start_beats * 60.0 / bpm;
self.external_start_frames = self.external_start * fps;
self.external_duration = self.external_duration_beats * 60.0 / bpm;
self.external_duration_frames = self.external_duration * fps;
self.internal_start = self.internal_start_beats * 60.0 / bpm;
self.internal_start_frames = self.internal_start * fps;
self.internal_end = self.internal_end_beats * 60.0 / bpm;
self.internal_end_frames = self.internal_end * fps;
}
/// FPS changed; recompute seconds/beats from the stored frames values.
pub fn apply_frames(&mut self, fps: f64, bpm: f64) {
self.external_start = self.external_start_frames / fps;
self.external_start_beats = self.external_start * bpm / 60.0;
self.external_duration = self.external_duration_frames / fps;
self.external_duration_beats = self.external_duration * bpm / 60.0;
self.internal_start = self.internal_start_frames / fps;
self.internal_start_beats = self.internal_start * bpm / 60.0;
self.internal_end = self.internal_end_frames / fps;
self.internal_end_beats = self.internal_end * bpm / 60.0;
}
}

81
daw-backend/src/audio/engine.rs
View File

@ -108,11 +108,6 @@ pub struct Engine {
timing_worst_render_us: u64,
timing_sum_total_us: u64,
timing_overrun_count: u64,
// Current tempo/framerate — kept in sync with SetTempo/ApplyBpmChange so that
// newly-created clip instances can be immediately synced via sync_from_seconds.
current_bpm: f64,
current_fps: f64,
}
impl Engine {
@ -189,8 +184,6 @@ impl Engine {
timing_worst_render_us: 0,
timing_sum_total_us: 0,
timing_overrun_count: 0,
current_bpm: 120.0,
current_fps: 30.0,
}
}
@ -735,19 +728,16 @@ impl Engine {
}
Command::MoveClip(track_id, clip_id, new_start_time) => {
// Moving just changes external_start, external_duration stays the same
let bpm = self.current_bpm;
let fps = self.current_fps;
match self.project.get_track_mut(track_id) {
Some(crate::audio::track::TrackNode::Audio(track)) => {
if let Some(clip) = track.clips.iter_mut().find(|c| c.id == clip_id) {
clip.external_start = new_start_time;
clip.sync_from_seconds(bpm, fps);
}
}
Some(crate::audio::track::TrackNode::Midi(track)) => {
if let Some(instance) = track.clip_instances.iter_mut().find(|c| c.id == clip_id) {
// Note: clip_id here is the pool clip ID, not instance ID
if let Some(instance) = track.clip_instances.iter_mut().find(|c| c.clip_id == clip_id) {
instance.external_start = new_start_time;
instance.sync_from_seconds(bpm, fps);
}
}
_ => {}
@ -757,15 +747,13 @@ impl Engine {
Command::TrimClip(track_id, clip_id, new_internal_start, new_internal_end) => {
// Trim changes which portion of the source content is used
// Also updates external_duration to match internal duration (no looping after trim)
let bpm = self.current_bpm;
let fps = self.current_fps;
match self.project.get_track_mut(track_id) {
Some(crate::audio::track::TrackNode::Audio(track)) => {
if let Some(clip) = track.clips.iter_mut().find(|c| c.id == clip_id) {
clip.internal_start = new_internal_start;
clip.internal_end = new_internal_end;
// By default, trimming sets external_duration to match internal duration
clip.external_duration = new_internal_end - new_internal_start;
clip.sync_from_seconds(bpm, fps);
}
}
Some(crate::audio::track::TrackNode::Midi(track)) => {
@ -773,8 +761,8 @@ impl Engine {
if let Some(instance) = track.clip_instances.iter_mut().find(|c| c.clip_id == clip_id) {
instance.internal_start = new_internal_start;
instance.internal_end = new_internal_end;
// By default, trimming sets external_duration to match internal duration
instance.external_duration = new_internal_end - new_internal_start;
instance.sync_from_seconds(bpm, fps);
}
}
_ => {}
@ -783,20 +771,16 @@ impl Engine {
}
Command::ExtendClip(track_id, clip_id, new_external_duration) => {
// Extend changes the external duration (enables looping if > internal duration)
let bpm = self.current_bpm;
let fps = self.current_fps;
match self.project.get_track_mut(track_id) {
Some(crate::audio::track::TrackNode::Audio(track)) => {
if let Some(clip) = track.clips.iter_mut().find(|c| c.id == clip_id) {
clip.external_duration = new_external_duration;
clip.sync_from_seconds(bpm, fps);
}
}
Some(crate::audio::track::TrackNode::Midi(track)) => {
// Note: clip_id here is the pool clip ID, not instance ID
if let Some(instance) = track.clip_instances.iter_mut().find(|c| c.clip_id == clip_id) {
instance.external_duration = new_external_duration;
instance.sync_from_seconds(bpm, fps);
}
}
_ => {}
@ -915,14 +899,13 @@ impl Engine {
}
Command::AddAudioClip(track_id, clip_id, pool_index, start_time, duration, offset) => {
// Create a new clip instance with the pre-assigned clip_id
let mut clip = AudioClipInstance::from_legacy(
let clip = AudioClipInstance::from_legacy(
clip_id,
pool_index,
start_time,
duration,
offset,
);
clip.sync_from_seconds(self.current_bpm, self.current_fps);
// Add clip to track
if let Some(crate::audio::track::TrackNode::Audio(track)) = self.project.get_track_mut(track_id) {
@ -950,8 +933,7 @@ impl Engine {
// Create an instance for this clip on the track
let instance_id = self.project.next_midi_clip_instance_id();
let mut instance = MidiClipInstance::from_full_clip(instance_id, clip_id, duration, start_time);
instance.sync_from_seconds(self.current_bpm, self.current_fps);
let instance = MidiClipInstance::from_full_clip(instance_id, clip_id, duration, start_time);
if let Some(crate::audio::track::TrackNode::Midi(track)) = self.project.get_track_mut(track_id) {
track.clip_instances.push(instance);
@ -991,15 +973,7 @@ impl Engine {
}
Command::AddLoadedMidiClip(track_id, clip, start_time) => {
// Add a pre-loaded MIDI clip to the track with the given start time
let bpm = self.current_bpm;
let fps = self.current_fps;
if let Ok(instance_id) = self.project.add_midi_clip_at(track_id, clip, start_time) {
if let Some(crate::audio::track::TrackNode::Midi(track)) = self.project.get_track_mut(track_id) {
if let Some(inst) = track.clip_instances.iter_mut().find(|i| i.id == instance_id) {
inst.sync_from_seconds(bpm, fps);
}
}
}
let _ = self.project.add_midi_clip_at(track_id, clip, start_time);
self.refresh_clip_snapshot();
}
Command::UpdateMidiClipNotes(_track_id, clip_id, notes) => {
@ -1303,14 +1277,6 @@ impl Engine {
Command::SetTempo(bpm, time_sig) => {
self.metronome.update_timing(bpm, time_sig);
self.project.set_tempo(bpm, time_sig.0);
self.current_bpm = bpm as f64;
}
Command::ApplyBpmChange(bpm, fps, midi_durations) => {
self.current_bpm = bpm;
self.current_fps = fps;
self.project.apply_bpm_change(bpm, fps, &midi_durations);
self.refresh_clip_snapshot();
}
// Node graph commands
@ -1707,7 +1673,6 @@ impl Engine {
Ok(json) => {
match crate::audio::node_graph::preset::GraphPreset::from_json(&json) {
Ok(preset) => {
let preset_name = preset.metadata.name.clone();
// Extract the directory path from the preset path for resolving relative sample paths
let preset_base_path = std::path::Path::new(&preset_path).parent();
@ -1719,19 +1684,19 @@ impl Engine {
track.instrument_graph = graph;
track.graph_is_default = true;
let _ = self.event_tx.push(AudioEvent::GraphStateChanged(track_id));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id, preset_name));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id));
}
Some(TrackNode::Audio(track)) => {
track.effects_graph = graph;
track.graph_is_default = true;
let _ = self.event_tx.push(AudioEvent::GraphStateChanged(track_id));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id, preset_name));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id));
}
Some(TrackNode::Group(track)) => {
track.audio_graph = graph;
track.graph_is_default = true;
let _ = self.event_tx.push(AudioEvent::GraphStateChanged(track_id));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id, preset_name));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id));
}
_ => {}
}
@ -1764,7 +1729,6 @@ impl Engine {
Command::GraphLoadLbins(track_id, path) => {
match crate::audio::node_graph::lbins::load_lbins(&path) {
Ok((preset, assets)) => {
let preset_name = preset.metadata.name.clone();
match AudioGraph::from_preset(&preset, self.sample_rate, 8192, None, Some(&assets)) {
Ok(graph) => {
match self.project.get_track_mut(track_id) {
@ -1772,19 +1736,19 @@ impl Engine {
track.instrument_graph = graph;
track.graph_is_default = true;
let _ = self.event_tx.push(AudioEvent::GraphStateChanged(track_id));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id, preset_name));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id));
}
Some(TrackNode::Audio(track)) => {
track.effects_graph = graph;
track.graph_is_default = true;
let _ = self.event_tx.push(AudioEvent::GraphStateChanged(track_id));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id, preset_name));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id));
}
Some(TrackNode::Group(track)) => {
track.audio_graph = graph;
track.graph_is_default = true;
let _ = self.event_tx.push(AudioEvent::GraphStateChanged(track_id));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id, preset_name));
let _ = self.event_tx.push(AudioEvent::GraphPresetLoaded(track_id));
}
_ => {}
}
@ -2750,18 +2714,8 @@ impl Engine {
}
Query::AddMidiClipSync(track_id, clip, start_time) => {
// Add MIDI clip to track and return the instance ID
let bpm = self.current_bpm;
let fps = self.current_fps;
let result = match self.project.add_midi_clip_at(track_id, clip, start_time) {
Ok(instance_id) => {
// Sync beats/frames on the newly created instance
if let Some(crate::audio::track::TrackNode::Midi(track)) = self.project.get_track_mut(track_id) {
if let Some(inst) = track.clip_instances.iter_mut().find(|i| i.id == instance_id) {
inst.sync_from_seconds(bpm, fps);
}
}
QueryResponse::MidiClipInstanceAdded(Ok(instance_id))
}
Ok(instance_id) => QueryResponse::MidiClipInstanceAdded(Ok(instance_id)),
Err(e) => QueryResponse::MidiClipInstanceAdded(Err(e.to_string())),
};
self.refresh_clip_snapshot();
@ -2772,7 +2726,6 @@ impl Engine {
// Assign instance ID
let instance_id = self.project.next_midi_clip_instance_id();
instance.id = instance_id;
instance.sync_from_seconds(self.current_bpm, self.current_fps);
let result = match self.project.add_midi_clip_instance(track_id, instance) {
Ok(_) => QueryResponse::MidiClipInstanceAdded(Ok(instance_id)),
@ -3687,12 +3640,6 @@ impl EngineController {
let _ = self.command_tx.push(Command::SetTempo(bpm, time_signature));
}
/// After a BPM change: update MIDI clip durations and sync all clip beats/frames.
/// Call this after move_clip() has been called for all affected clips.
pub fn apply_bpm_change(&mut self, bpm: f64, fps: f64, midi_durations: Vec<(crate::audio::MidiClipId, f64)>) {
let _ = self.command_tx.push(Command::ApplyBpmChange(bpm, fps, midi_durations));
}
// Node graph operations
/// Add a node to a track's instrument graph

91
daw-backend/src/audio/midi.rs
View File

@ -3,12 +3,6 @@
pub struct MidiEvent {
/// Time position within the clip in seconds (sample-rate independent)
pub timestamp: f64,
/// Time position in beats (quarter-note beats from clip start); derived from timestamp
#[serde(default)]
pub timestamp_beats: f64,
/// Time position in frames; derived from timestamp
#[serde(default)]
pub timestamp_frames: f64,
/// MIDI status byte (includes channel)
pub status: u8,
/// First data byte (note number, CC number, etc.)
@ -22,8 +16,6 @@ impl MidiEvent {
pub fn new(timestamp: f64, status: u8, data1: u8, data2: u8) -> Self {
Self {
timestamp,
timestamp_beats: 0.0,
timestamp_frames: 0.0,
status,
data1,
data2,
@ -34,8 +26,6 @@ impl MidiEvent {
pub fn note_on(timestamp: f64, channel: u8, note: u8, velocity: u8) -> Self {
Self {
timestamp,
timestamp_beats: 0.0,
timestamp_frames: 0.0,
status: 0x90 | (channel & 0x0F),
data1: note,
data2: velocity,
@ -46,32 +36,12 @@ impl MidiEvent {
pub fn note_off(timestamp: f64, channel: u8, note: u8, velocity: u8) -> Self {
Self {
timestamp,
timestamp_beats: 0.0,
timestamp_frames: 0.0,
status: 0x80 | (channel & 0x0F),
data1: note,
data2: velocity,
}
}
/// Sync beats and frames from seconds (call after constructing or when seconds is canonical)
pub fn sync_from_seconds(&mut self, bpm: f64, fps: f64) {
self.timestamp_beats = self.timestamp * bpm / 60.0;
self.timestamp_frames = self.timestamp * fps;
}
/// Recompute seconds and frames from beats (call when BPM changes in Measures mode)
pub fn apply_beats(&mut self, bpm: f64, fps: f64) {
self.timestamp = self.timestamp_beats * 60.0 / bpm;
self.timestamp_frames = self.timestamp * fps;
}
/// Recompute seconds and beats from frames (call when FPS changes in Frames mode)
pub fn apply_frames(&mut self, fps: f64, bpm: f64) {
self.timestamp = self.timestamp_frames / fps;
self.timestamp_beats = self.timestamp * bpm / 60.0;
}
/// Check if this is a note on event (with non-zero velocity)
pub fn is_note_on(&self) -> bool {
(self.status & 0xF0) == 0x90 && self.data2 > 0
@ -158,7 +128,6 @@ impl MidiClip {
/// ## Timing Model
/// - `internal_start` / `internal_end`: Define the region of the source clip to play (trimming)
/// - `external_start` / `external_duration`: Define where the instance appears on the timeline and how long
/// - `*_beats` / `*_frames`: Derived representations for Measures/Frames mode display
///
/// ## Looping
/// If `external_duration` is greater than `internal_end - internal_start`,
@ -170,21 +139,13 @@ pub struct MidiClipInstance {
/// Start position within the clip content (seconds)
pub internal_start: f64,
#[serde(default)] pub internal_start_beats: f64,
#[serde(default)] pub internal_start_frames: f64,
/// End position within the clip content (seconds)
pub internal_end: f64,
#[serde(default)] pub internal_end_beats: f64,
#[serde(default)] pub internal_end_frames: f64,
/// Start position on the timeline (seconds)
pub external_start: f64,
#[serde(default)] pub external_start_beats: f64,
#[serde(default)] pub external_start_frames: f64,
/// Duration on the timeline (seconds) - can be longer than internal duration for looping
pub external_duration: f64,
#[serde(default)] pub external_duration_beats: f64,
#[serde(default)] pub external_duration_frames: f64,
}
impl MidiClipInstance {
@ -201,17 +162,9 @@ impl MidiClipInstance {
id,
clip_id,
internal_start,
internal_start_beats: 0.0,
internal_start_frames: 0.0,
internal_end,
internal_end_beats: 0.0,
internal_end_frames: 0.0,
external_start,
external_start_beats: 0.0,
external_start_frames: 0.0,
external_duration,
external_duration_beats: 0.0,
external_duration_frames: 0.0,
}
}
@ -226,17 +179,9 @@ impl MidiClipInstance {
id,
clip_id,
internal_start: 0.0,
internal_start_beats: 0.0,
internal_start_frames: 0.0,
internal_end: clip_duration,
internal_end_beats: 0.0,
internal_end_frames: 0.0,
external_start,
external_start_beats: 0.0,
external_start_frames: 0.0,
external_duration: clip_duration,
external_duration_beats: 0.0,
external_duration_frames: 0.0,
}
}
@ -270,42 +215,6 @@ impl MidiClipInstance {
self.external_start < range_end && self.external_end() > range_start
}
/// Populate beats/frames from the current seconds values.
pub fn sync_from_seconds(&mut self, bpm: f64, fps: f64) {
self.external_start_beats = self.external_start * bpm / 60.0;
self.external_start_frames = self.external_start * fps;
self.external_duration_beats = self.external_duration * bpm / 60.0;
self.external_duration_frames = self.external_duration * fps;
self.internal_start_beats = self.internal_start * bpm / 60.0;
self.internal_start_frames = self.internal_start * fps;
self.internal_end_beats = self.internal_end * bpm / 60.0;
self.internal_end_frames = self.internal_end * fps;
}
/// BPM changed; recompute seconds/frames from the stored beats values.
pub fn apply_beats(&mut self, bpm: f64, fps: f64) {
self.external_start = self.external_start_beats * 60.0 / bpm;
self.external_start_frames = self.external_start * fps;
self.external_duration = self.external_duration_beats * 60.0 / bpm;
self.external_duration_frames = self.external_duration * fps;
self.internal_start = self.internal_start_beats * 60.0 / bpm;
self.internal_start_frames = self.internal_start * fps;
self.internal_end = self.internal_end_beats * 60.0 / bpm;
self.internal_end_frames = self.internal_end * fps;
}
/// FPS changed; recompute seconds/beats from the stored frames values.
pub fn apply_frames(&mut self, fps: f64, bpm: f64) {
self.external_start = self.external_start_frames / fps;
self.external_start_beats = self.external_start * bpm / 60.0;
self.external_duration = self.external_duration_frames / fps;
self.external_duration_beats = self.external_duration * bpm / 60.0;
self.internal_start = self.internal_start_frames / fps;
self.internal_start_beats = self.internal_start * bpm / 60.0;
self.internal_end = self.internal_end_frames / fps;
self.internal_end_beats = self.internal_end * bpm / 60.0;
}
/// Get events that should be triggered in a given timeline range
///
/// This handles:

52
daw-backend/src/audio/node_graph/graph.rs
View File

@ -1009,29 +1009,6 @@ impl AudioGraph {
}
}
// For AutomationInput nodes, serialize display name and keyframes
if node.node_type() == "AutomationInput" {
use crate::audio::node_graph::nodes::{AutomationInputNode, InterpolationType};
use crate::audio::node_graph::preset::SerializedKeyframe;
if let Some(auto_node) = node.as_any().downcast_ref::<AutomationInputNode>() {
serialized.automation_display_name = Some(auto_node.display_name().to_string());
serialized.automation_keyframes = auto_node.keyframes().iter().map(|kf| {
SerializedKeyframe {
time: kf.time,
value: kf.value,
interpolation: match kf.interpolation {
InterpolationType::Linear => "linear",
InterpolationType::Bezier => "bezier",
InterpolationType::Step => "step",
InterpolationType::Hold => "hold",
}.to_string(),
ease_out: kf.ease_out,
ease_in: kf.ease_in,
}
}).collect();
}
}
// For AmpSim nodes, serialize the model path
if node.node_type() == "AmpSim" {
use crate::audio::node_graph::nodes::AmpSimNode;
@ -1345,35 +1322,6 @@ impl AudioGraph {
}
}
// Restore AutomationInput display name and keyframes
if serialized_node.node_type == "AutomationInput" {
use crate::audio::node_graph::nodes::{AutomationInputNode, AutomationKeyframe, InterpolationType};
if let Some(graph_node) = graph.graph.node_weight_mut(node_idx) {
if let Some(auto_node) = graph_node.node.as_any_mut().downcast_mut::<AutomationInputNode>() {
if let Some(ref name) = serialized_node.automation_display_name {
auto_node.set_display_name(name.clone());
}
if !serialized_node.automation_keyframes.is_empty() {
auto_node.clear_keyframes();
for kf in &serialized_node.automation_keyframes {
auto_node.add_keyframe(AutomationKeyframe {
time: kf.time,
value: kf.value,
interpolation: match kf.interpolation.as_str() {
"bezier" => InterpolationType::Bezier,
"step" => InterpolationType::Step,
"hold" => InterpolationType::Hold,
_ => InterpolationType::Linear,
},
ease_out: kf.ease_out,
ease_in: kf.ease_in,
});
}
}
}
}
}
// Restore position
graph.set_node_position(node_idx, serialized_node.position.0, serialized_node.position.1);
}

25
daw-backend/src/audio/node_graph/nodes/automation_input.rs
View File

@ -1,4 +1,4 @@
use crate::audio::node_graph::{AudioNode, NodeCategory, NodePort, Parameter, ParameterUnit, SignalType};
use crate::audio::node_graph::{AudioNode, NodeCategory, NodePort, Parameter, SignalType};
use crate::audio::midi::MidiEvent;
use serde::{Deserialize, Serialize};
use std::sync::{Arc, RwLock};
@ -63,17 +63,12 @@ impl AutomationInputNode {
NodePort::new("CV Out", SignalType::CV, 0),
];
let parameters = vec![
Parameter::new(0, "Min", f32::NEG_INFINITY, f32::INFINITY, -1.0, ParameterUnit::Generic),
Parameter::new(1, "Max", f32::NEG_INFINITY, f32::INFINITY, 1.0, ParameterUnit::Generic),
];
Self {
name: name.clone(),
display_name: "Automation".to_string(),
keyframes: vec![AutomationKeyframe::new(0.0, 0.0)],
outputs,
parameters,
parameters: Vec::new(),
playback_time: Arc::new(RwLock::new(0.0)),
value_min: -1.0,
value_max: 1.0,
@ -226,20 +221,12 @@ impl AudioNode for AutomationInputNode {
&self.parameters
}
fn set_parameter(&mut self, id: u32, value: f32) {
match id {
0 => self.value_min = value,
1 => self.value_max = value,
_ => {}
}
fn set_parameter(&mut self, _id: u32, _value: f32) {
// No parameters
}
fn get_parameter(&self, id: u32) -> f32 {
match id {
0 => self.value_min,
1 => self.value_max,
_ => 0.0,
}
fn get_parameter(&self, _id: u32) -> f32 {
0.0
}
fn process(

6
daw-backend/src/audio/node_graph/nodes/pan.rs
View File

@ -113,8 +113,10 @@ impl AudioNode for PanNode {
let frames_to_process = frames.min(output_frames);
for frame in 0..frames_to_process {
// Pan CV input: -1..+1 directly (0 = center), defaults to parameter value when unconnected
let pan = cv_input_or_default(inputs, 1, frame, self.pan).clamp(-1.0, 1.0);
// Pan CV input: when connected, replaces parameter; when unconnected, uses parameter
// CV is in 0-1 range, mapped to -1 to +1 pan range
let cv_raw = cv_input_or_default(inputs, 1, frame, (self.pan + 1.0) * 0.5);
let pan = (cv_raw * 2.0 - 1.0).clamp(-1.0, 1.0);
// Calculate gains using constant-power panning law
let angle = (pan + 1.0) * 0.5 * PI / 2.0;

20
daw-backend/src/audio/node_graph/preset.rs
View File

@ -100,16 +100,6 @@ fn default_version() -> u32 {
1
}
/// Serialized keyframe for AutomationInput nodes
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct SerializedKeyframe {
pub time: f64,
pub value: f32,
pub interpolation: String,
pub ease_out: (f32, f32),
pub ease_in: (f32, f32),
}
/// Serialized node representation
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct SerializedNode {
@ -151,14 +141,6 @@ pub struct SerializedNode {
/// Allows the UI to display actual track names on the node's output ports.
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub port_names: Vec<String>,
/// For AutomationInput nodes: user-visible display name
#[serde(skip_serializing_if = "Option::is_none")]
pub automation_display_name: Option<String>,
/// For AutomationInput nodes: saved keyframes
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub automation_keyframes: Vec<SerializedKeyframe>,
}
/// Serialized group definition (frontend-only visual grouping, stored opaquely by backend)
@ -257,8 +239,6 @@ impl SerializedNode {
nam_model_path: None,
num_ports: None,
port_names: Vec::new(),
automation_display_name: None,
automation_keyframes: Vec::new(),
}
}

40
daw-backend/src/audio/project.rs
View File

@ -216,46 +216,6 @@ impl Project {
self.tracks.iter().map(|(&id, node)| (id, node))
}
/// After a BPM change, update MIDI clip durations then sync all clip beats/frames from seconds.
///
/// `midi_durations` maps each MidiClipId to its new content duration in seconds.
/// Call this after the seconds positions have already been updated (e.g. via MoveClip).
pub fn apply_bpm_change(&mut self, bpm: f64, fps: f64, midi_durations: &[(crate::audio::midi::MidiClipId, f64)]) {
for (_, track) in self.tracks.iter_mut() {
match track {
crate::audio::track::TrackNode::Audio(t) => {
for clip in &mut t.clips {
clip.sync_from_seconds(bpm, fps);
}
}
crate::audio::track::TrackNode::Midi(t) => {
// Update content durations first so internal_end is correct before sync
for instance in &mut t.clip_instances {
if let Some(&new_dur) = midi_durations.iter()
.find(|(id, _)| *id == instance.clip_id)
.map(|(_, d)| d)
{
let old_internal_dur = instance.internal_duration();
instance.internal_end = instance.internal_start + new_dur;
// Scale external_duration by the same ratio (works for both looping and non-looping)
if old_internal_dur > 1e-12 {
instance.external_duration = instance.external_duration * new_dur / old_internal_dur;
}
}
instance.sync_from_seconds(bpm, fps);
}
// Update pool clip durations
for &(clip_id, new_dur) in midi_durations {
if let Some(clip) = self.midi_clip_pool.get_clip_mut(clip_id) {
clip.duration = new_dur;
}
}
}
_ => {}
}
}
}
/// Get oscilloscope data from a node in a track's graph
pub fn get_oscilloscope_data(&self, track_id: TrackId, node_id: u32, sample_count: usize) -> Option<(Vec<f32>, Vec<f32>)> {
if let Some(TrackNode::Midi(track)) = self.tracks.get(&track_id) {

7
daw-backend/src/command/types.rs
View File

@ -144,9 +144,6 @@ pub enum Command {
SetMetronomeEnabled(bool),
/// Set project tempo and time signature (bpm, (numerator, denominator))
SetTempo(f32, (u32, u32)),
/// After a BPM change: update MIDI clip durations and sync all clip beats/frames from seconds.
/// (bpm, fps, midi_durations: Vec<(clip_id, new_duration_seconds)>)
ApplyBpmChange(f64, f64, Vec<(MidiClipId, f64)>),
// Node graph commands
/// Add a node to a track's instrument graph (track_id, node_type, position_x, position_y)
@ -313,8 +310,8 @@ pub enum AudioEvent {
GraphConnectionError(TrackId, String),
/// Graph state changed (for full UI sync)
GraphStateChanged(TrackId),
/// Preset fully loaded (track_id, preset_name) - emitted after all nodes and samples are loaded
GraphPresetLoaded(TrackId, String),
/// Preset fully loaded (track_id) - emitted after all nodes and samples are loaded
GraphPresetLoaded(TrackId),
/// Preset has been saved to file (track_id, preset_path)
GraphPresetSaved(TrackId, String),
/// Script compilation result (track_id, node_id, success, error, ui_declaration, source)

1
lightningbeam-ui/Cargo.lock generated
View File

@ -1697,7 +1697,6 @@ dependencies = [
"serde",
"serde_json",
"symphonia",
"zip",
]
[[package]]

21
lightningbeam-ui/lightningbeam-core/src/action.rs
View File

@ -120,17 +120,6 @@ pub trait Action: Send {
fn midi_events_after_rollback(&self) -> Option<(u32, &[daw_backend::audio::midi::MidiEvent])> {
None
}
/// Return MIDI event data for multiple clips after execute/redo (e.g. BPM change).
/// Each element is (midi_clip_id, events). Default: empty.
fn all_midi_events_after_execute(&self) -> Vec<(u32, Vec<daw_backend::audio::midi::MidiEvent>)> {
Vec::new()
}
/// Return MIDI event data for multiple clips after rollback/undo.
fn all_midi_events_after_rollback(&self) -> Vec<(u32, Vec<daw_backend::audio::midi::MidiEvent>)> {
Vec::new()
}
}
/// Action executor that wraps the document and manages undo/redo
@ -312,16 +301,6 @@ impl ActionExecutor {
self.redo_stack.last().and_then(|a| a.midi_events_after_rollback())
}
/// Get multi-clip MIDI event data from the last undo stack action (after redo).
pub fn last_undo_all_midi_events(&self) -> Vec<(u32, Vec<daw_backend::audio::midi::MidiEvent>)> {
self.undo_stack.last().map(|a| a.all_midi_events_after_execute()).unwrap_or_default()
}
/// Get multi-clip MIDI event data from the last redo stack action (after undo).
pub fn last_redo_all_midi_events(&self) -> Vec<(u32, Vec<daw_backend::audio::midi::MidiEvent>)> {
self.redo_stack.last().map(|a| a.all_midi_events_after_rollback()).unwrap_or_default()
}
/// Get the description of the next action to redo
pub fn redo_description(&self) -> Option<String> {
self.redo_stack.last().map(|a| a.description())

2
lightningbeam-ui/lightningbeam-core/src/actions/add_clip_instance.rs
View File

@ -79,8 +79,6 @@ impl Action for AddClipInstanceAction {
if let Some(valid_start) = adjusted_start {
// Update instance to use the valid position
self.clip_instance.timeline_start = valid_start;
let (bpm, fps) = (document.bpm, document.framerate);
self.clip_instance.sync_from_seconds(bpm, fps);
} else {
// No valid position found - reject the operation
return Err("Cannot add clip: no valid position found on layer (layer is full)".to_string());

361
lightningbeam-ui/lightningbeam-core/src/actions/change_bpm.rs
View File

@ -1,361 +0,0 @@
//! Change BPM action
//!
//! Atomically changes the document BPM and rescales all clip instance positions and
//! MIDI event timestamps so that beat positions are preserved (Measures mode behaviour).
use crate::action::{Action, BackendContext};
use crate::clip::ClipInstance;
use crate::document::Document;
use crate::layer::AnyLayer;
use std::collections::HashMap;
use uuid::Uuid;
/// Snapshot of all timing fields on a `ClipInstance`
#[derive(Clone)]
struct TimingFields {
timeline_start: f64,
timeline_start_beats: f64,
timeline_start_frames: f64,
trim_start: f64,
trim_start_beats: f64,
trim_start_frames: f64,
trim_end: Option<f64>,
trim_end_beats: Option<f64>,
trim_end_frames: Option<f64>,
timeline_duration: Option<f64>,
timeline_duration_beats: Option<f64>,
timeline_duration_frames: Option<f64>,
}
impl TimingFields {
fn from_instance(ci: &ClipInstance) -> Self {
Self {
timeline_start: ci.timeline_start,
timeline_start_beats: ci.timeline_start_beats,
timeline_start_frames: ci.timeline_start_frames,
trim_start: ci.trim_start,
trim_start_beats: ci.trim_start_beats,
trim_start_frames: ci.trim_start_frames,
trim_end: ci.trim_end,
trim_end_beats: ci.trim_end_beats,
trim_end_frames: ci.trim_end_frames,
timeline_duration: ci.timeline_duration,
timeline_duration_beats: ci.timeline_duration_beats,
timeline_duration_frames: ci.timeline_duration_frames,
}
}
fn apply_to(&self, ci: &mut ClipInstance) {
ci.timeline_start = self.timeline_start;
ci.timeline_start_beats = self.timeline_start_beats;
ci.timeline_start_frames = self.timeline_start_frames;
ci.trim_start = self.trim_start;
ci.trim_start_beats = self.trim_start_beats;
ci.trim_start_frames = self.trim_start_frames;
ci.trim_end = self.trim_end;
ci.trim_end_beats = self.trim_end_beats;
ci.trim_end_frames = self.trim_end_frames;
ci.timeline_duration = self.timeline_duration;
ci.timeline_duration_beats = self.timeline_duration_beats;
ci.timeline_duration_frames = self.timeline_duration_frames;
}
}
#[derive(Clone)]
struct ClipTimingSnapshot {
layer_id: Uuid,
instance_id: Uuid,
old_fields: TimingFields,
new_fields: TimingFields,
}
#[derive(Clone)]
struct MidiClipSnapshot {
layer_id: Uuid,
midi_clip_id: u32,
clip_id: Uuid,
old_clip_duration: f64,
new_clip_duration: f64,
old_events: Vec<daw_backend::audio::midi::MidiEvent>,
new_events: Vec<daw_backend::audio::midi::MidiEvent>,
}
/// Action that atomically changes BPM and rescales all clip/note positions to preserve beats
pub struct ChangeBpmAction {
old_bpm: f64,
new_bpm: f64,
time_sig: (u32, u32),
clip_snapshots: Vec<ClipTimingSnapshot>,
midi_snapshots: Vec<MidiClipSnapshot>,
}
impl ChangeBpmAction {
/// Build the action, computing new positions for all clip instances and MIDI events.
///
/// `midi_event_cache` maps backend MIDI clip ID → current event list.
pub fn new(
old_bpm: f64,
new_bpm: f64,
document: &Document,
midi_event_cache: &HashMap<u32, Vec<daw_backend::audio::midi::MidiEvent>>,
) -> Self {
let fps = document.framerate;
let time_sig = (
document.time_signature.numerator,
document.time_signature.denominator,
);
let mut clip_snapshots: Vec<ClipTimingSnapshot> = Vec::new();
let mut midi_snapshots: Vec<MidiClipSnapshot> = Vec::new();
// Collect MIDI clip IDs we've already snapshotted (avoid duplicates)
let mut seen_midi_clips: std::collections::HashSet<u32> = std::collections::HashSet::new();
for layer in document.all_layers() {
let layer_id = layer.id();
let clip_instances: &[ClipInstance] = match layer {
AnyLayer::Vector(vl) => &vl.clip_instances,
AnyLayer::Audio(al) => &al.clip_instances,
AnyLayer::Video(vl) => &vl.clip_instances,
AnyLayer::Effect(el) => &el.clip_instances,
AnyLayer::Group(_) | AnyLayer::Raster(_) => continue,
};
for ci in clip_instances {
let old_fields = TimingFields::from_instance(ci);
// Compute new fields: beats are canonical, recompute seconds + frames.
// Guard: if timeline_start_beats was never populated (clips added without
// sync_from_seconds), derive beats from seconds before applying.
let mut new_ci = ci.clone();
if new_ci.timeline_start_beats == 0.0 && new_ci.timeline_start.abs() > 1e-9 {
new_ci.sync_from_seconds(old_bpm, fps);
}
new_ci.apply_beats(new_bpm, fps);
let new_fields = TimingFields::from_instance(&new_ci);
clip_snapshots.push(ClipTimingSnapshot {
layer_id,
instance_id: ci.id,
old_fields,
new_fields,
});
// If this is a MIDI clip on an audio layer, collect MIDI events + rescale duration.
// Always snapshot the clip (even if empty) so clip.duration is rescaled.
if let AnyLayer::Audio(_) = layer {
if let Some(audio_clip) = document.get_audio_clip(&ci.clip_id) {
use crate::clip::AudioClipType;
if let AudioClipType::Midi { midi_clip_id } = &audio_clip.clip_type {
let midi_id = *midi_clip_id;
if !seen_midi_clips.contains(&midi_id) {
seen_midi_clips.insert(midi_id);
let old_clip_duration = audio_clip.duration;
let new_clip_duration = old_clip_duration * old_bpm / new_bpm;
// Use cached events if present; empty vec for clips with no events yet.
let old_events = midi_event_cache.get(&midi_id).cloned().unwrap_or_default();
let new_events: Vec<_> = old_events.iter().map(|ev| {
let mut e = ev.clone();
// Ensure beats are populated before using them as canonical.
// Events created before triple-rep (e.g. from recording)
// have timestamp_beats == 0.0 — sync from seconds first.
if e.timestamp_beats == 0.0 && e.timestamp.abs() > 1e-9 {
e.sync_from_seconds(old_bpm, fps);
}
e.apply_beats(new_bpm, fps);
e
}).collect();
midi_snapshots.push(MidiClipSnapshot {
layer_id,
midi_clip_id: midi_id,
clip_id: ci.clip_id,
old_clip_duration,
new_clip_duration,
old_events,
new_events,
});
}
}
}
}
}
}
Self {
old_bpm,
new_bpm,
time_sig,
clip_snapshots,
midi_snapshots,
}
}
/// Return the new MIDI event lists for each affected clip (for immediate cache update).
pub fn new_midi_events(&self) -> impl Iterator<Item = (u32, &Vec<daw_backend::audio::midi::MidiEvent>)> {
self.midi_snapshots.iter().map(|s| (s.midi_clip_id, &s.new_events))
}
fn apply_clips(document: &mut Document, snapshots: &[ClipTimingSnapshot], use_new: bool) {
for snap in snapshots {
let fields = if use_new { &snap.new_fields } else { &snap.old_fields };
let layer = match document.get_layer_mut(&snap.layer_id) {
Some(l) => l,
None => continue,
};
let clip_instances = match layer {
AnyLayer::Vector(vl) => &mut vl.clip_instances,
AnyLayer::Audio(al) => &mut al.clip_instances,
AnyLayer::Video(vl) => &mut vl.clip_instances,
AnyLayer::Effect(el) => &mut el.clip_instances,
AnyLayer::Group(_) | AnyLayer::Raster(_) => continue,
};
if let Some(ci) = clip_instances.iter_mut().find(|ci| ci.id == snap.instance_id) {
fields.apply_to(ci);
}
}
}
fn apply_midi_durations(document: &mut Document, snapshots: &[MidiClipSnapshot], use_new: bool) {
for snap in snapshots {
if let Some(clip) = document.get_audio_clip_mut(&snap.clip_id) {
clip.duration = if use_new { snap.new_clip_duration } else { snap.old_clip_duration };
}
}
}
}
impl Action for ChangeBpmAction {
fn execute(&mut self, document: &mut Document) -> Result<(), String> {
document.bpm = self.new_bpm;
Self::apply_clips(document, &self.clip_snapshots, true);
Self::apply_midi_durations(document, &self.midi_snapshots, true);
Ok(())
}
fn rollback(&mut self, document: &mut Document) -> Result<(), String> {
document.bpm = self.old_bpm;
Self::apply_clips(document, &self.clip_snapshots, false);
Self::apply_midi_durations(document, &self.midi_snapshots, false);
Ok(())
}
fn description(&self) -> String {
"Change BPM".to_string()
}
fn execute_backend(
&mut self,
backend: &mut BackendContext,
document: &Document,
) -> Result<(), String> {
let controller = match backend.audio_controller.as_mut() {
Some(c) => c,
None => return Ok(()),
};
// Update tempo
controller.set_tempo(self.new_bpm as f32, self.time_sig);
// Update MIDI clip events and positions
for snap in &self.midi_snapshots {
let track_id = match backend.layer_to_track_map.get(&snap.layer_id) {
Some(&id) => id,
None => continue,
};
controller.update_midi_clip_events(track_id, snap.midi_clip_id, snap.new_events.clone());
}
// Move clip instances in the backend
for snap in &self.clip_snapshots {
let track_id = match backend.layer_to_track_map.get(&snap.layer_id) {
Some(&id) => id,
None => continue,
};
let backend_id = backend.clip_instance_to_backend_map.get(&snap.instance_id);
match backend_id {
Some(crate::action::BackendClipInstanceId::Audio(audio_id)) => {
controller.move_clip(track_id, *audio_id, snap.new_fields.timeline_start);
}
Some(crate::action::BackendClipInstanceId::Midi(midi_id)) => {
controller.move_clip(track_id, *midi_id, snap.new_fields.timeline_start);
}
None => {} // Vector/video clips — no backend move needed
}
}
// Sync beat/frame representations and rescale MIDI clip durations in the backend
let fps = document.framerate;
let midi_durations: Vec<(u32, f64)> = self.midi_snapshots.iter()
.map(|s| (s.midi_clip_id, s.new_clip_duration))
.collect();
controller.apply_bpm_change(self.new_bpm, fps, midi_durations);
Ok(())
}
fn rollback_backend(
&mut self,
backend: &mut BackendContext,
document: &Document,
) -> Result<(), String> {
let controller = match backend.audio_controller.as_mut() {
Some(c) => c,
None => return Ok(()),
};
controller.set_tempo(self.old_bpm as f32, self.time_sig);
for snap in &self.midi_snapshots {
let track_id = match backend.layer_to_track_map.get(&snap.layer_id) {
Some(&id) => id,
None => continue,
};
controller.update_midi_clip_events(track_id, snap.midi_clip_id, snap.old_events.clone());
}
for snap in &self.clip_snapshots {
let track_id = match backend.layer_to_track_map.get(&snap.layer_id) {
Some(&id) => id,
None => continue,
};
let backend_id = backend.clip_instance_to_backend_map.get(&snap.instance_id);
match backend_id {
Some(crate::action::BackendClipInstanceId::Audio(audio_id)) => {
controller.move_clip(track_id, *audio_id, snap.old_fields.timeline_start);
}
Some(crate::action::BackendClipInstanceId::Midi(midi_id)) => {
controller.move_clip(track_id, *midi_id, snap.old_fields.timeline_start);
}
None => {}
}
}
// Sync beat/frame representations and restore MIDI clip durations in the backend
let fps = document.framerate;
let midi_durations: Vec<(u32, f64)> = self.midi_snapshots.iter()
.map(|s| (s.midi_clip_id, s.old_clip_duration))
.collect();
controller.apply_bpm_change(self.old_bpm, fps, midi_durations);
Ok(())
}
fn all_midi_events_after_execute(&self) -> Vec<(u32, Vec<daw_backend::audio::midi::MidiEvent>)> {
self.midi_snapshots.iter()
.map(|s| (s.midi_clip_id, s.new_events.clone()))
.collect()
}
fn all_midi_events_after_rollback(&self) -> Vec<(u32, Vec<daw_backend::audio::midi::MidiEvent>)> {
self.midi_snapshots.iter()
.map(|s| (s.midi_clip_id, s.old_events.clone()))
.collect()
}
}

227
lightningbeam-ui/lightningbeam-core/src/actions/change_fps.rs
View File

@ -1,227 +0,0 @@
//! Change FPS action
//!
//! Atomically changes the document framerate and rescales all clip instance positions
//! so that frame positions are preserved (Frames mode behaviour).
use crate::action::{Action, BackendContext};
use crate::clip::ClipInstance;
use crate::document::Document;
use crate::layer::AnyLayer;
use uuid::Uuid;
/// Snapshot of all timing fields on a `ClipInstance`
#[derive(Clone)]
struct TimingFields {
timeline_start: f64,
timeline_start_beats: f64,
timeline_start_frames: f64,
trim_start: f64,
trim_start_beats: f64,
trim_start_frames: f64,
trim_end: Option<f64>,
trim_end_beats: Option<f64>,
trim_end_frames: Option<f64>,
timeline_duration: Option<f64>,
timeline_duration_beats: Option<f64>,
timeline_duration_frames: Option<f64>,
}
impl TimingFields {
fn from_instance(ci: &ClipInstance) -> Self {
Self {
timeline_start: ci.timeline_start,
timeline_start_beats: ci.timeline_start_beats,
timeline_start_frames: ci.timeline_start_frames,
trim_start: ci.trim_start,
trim_start_beats: ci.trim_start_beats,
trim_start_frames: ci.trim_start_frames,
trim_end: ci.trim_end,
trim_end_beats: ci.trim_end_beats,
trim_end_frames: ci.trim_end_frames,
timeline_duration: ci.timeline_duration,
timeline_duration_beats: ci.timeline_duration_beats,
timeline_duration_frames: ci.timeline_duration_frames,
}
}
fn apply_to(&self, ci: &mut ClipInstance) {
ci.timeline_start = self.timeline_start;
ci.timeline_start_beats = self.timeline_start_beats;
ci.timeline_start_frames = self.timeline_start_frames;
ci.trim_start = self.trim_start;
ci.trim_start_beats = self.trim_start_beats;
ci.trim_start_frames = self.trim_start_frames;
ci.trim_end = self.trim_end;
ci.trim_end_beats = self.trim_end_beats;
ci.trim_end_frames = self.trim_end_frames;
ci.timeline_duration = self.timeline_duration;
ci.timeline_duration_beats = self.timeline_duration_beats;
ci.timeline_duration_frames = self.timeline_duration_frames;
}
}
#[derive(Clone)]
struct ClipTimingSnapshot {
layer_id: Uuid,
instance_id: Uuid,
old_fields: TimingFields,
new_fields: TimingFields,
}
/// Action that atomically changes framerate and rescales all clip positions to preserve frames
pub struct ChangeFpsAction {
old_fps: f64,
new_fps: f64,
clip_snapshots: Vec<ClipTimingSnapshot>,
}
impl ChangeFpsAction {
/// Build the action, computing new positions for all clip instances.
pub fn new(old_fps: f64, new_fps: f64, document: &Document) -> Self {
let bpm = document.bpm;
let mut clip_snapshots: Vec<ClipTimingSnapshot> = Vec::new();
for layer in document.all_layers() {
let layer_id = layer.id();
let clip_instances: &[ClipInstance] = match layer {
AnyLayer::Vector(vl) => &vl.clip_instances,
AnyLayer::Audio(al) => &al.clip_instances,
AnyLayer::Video(vl) => &vl.clip_instances,
AnyLayer::Effect(el) => &el.clip_instances,
AnyLayer::Group(_) | AnyLayer::Raster(_) => continue,
};
for ci in clip_instances {
let old_fields = TimingFields::from_instance(ci);
// Compute new fields: frames are canonical, recompute seconds + beats
let mut new_ci = ci.clone();
new_ci.apply_frames(new_fps, bpm);
let new_fields = TimingFields::from_instance(&new_ci);
clip_snapshots.push(ClipTimingSnapshot {
layer_id,
instance_id: ci.id,
old_fields,
new_fields,
});
}
}
Self {
old_fps,
new_fps,
clip_snapshots,
}
}
fn apply_clips(document: &mut Document, snapshots: &[ClipTimingSnapshot], use_new: bool) {
for snap in snapshots {
let fields = if use_new { &snap.new_fields } else { &snap.old_fields };
let layer = match document.get_layer_mut(&snap.layer_id) {
Some(l) => l,
None => continue,
};
let clip_instances = match layer {
AnyLayer::Vector(vl) => &mut vl.clip_instances,
AnyLayer::Audio(al) => &mut al.clip_instances,
AnyLayer::Video(vl) => &mut vl.clip_instances,
AnyLayer::Effect(el) => &mut el.clip_instances,
AnyLayer::Group(_) | AnyLayer::Raster(_) => continue,
};
if let Some(ci) = clip_instances.iter_mut().find(|ci| ci.id == snap.instance_id) {
fields.apply_to(ci);
}
}
}
}
impl Action for ChangeFpsAction {
fn execute(&mut self, document: &mut Document) -> Result<(), String> {
document.framerate = self.new_fps;
Self::apply_clips(document, &self.clip_snapshots, true);
Ok(())
}
fn rollback(&mut self, document: &mut Document) -> Result<(), String> {
document.framerate = self.old_fps;
Self::apply_clips(document, &self.clip_snapshots, false);
Ok(())
}
fn description(&self) -> String {
"Change FPS".to_string()
}
fn execute_backend(
&mut self,
backend: &mut BackendContext,
_document: &Document,
) -> Result<(), String> {
// FPS change does not affect audio timing — only move clips that changed position
let controller = match backend.audio_controller.as_mut() {
Some(c) => c,
None => return Ok(()),
};
for snap in &self.clip_snapshots {
if (snap.new_fields.timeline_start - snap.old_fields.timeline_start).abs() < 1e-9 {
continue; // No movement, skip
}
let track_id = match backend.layer_to_track_map.get(&snap.layer_id) {
Some(&id) => id,
None => continue,
};
let backend_id = backend.clip_instance_to_backend_map.get(&snap.instance_id);
match backend_id {
Some(crate::action::BackendClipInstanceId::Audio(audio_id)) => {
controller.move_clip(track_id, *audio_id, snap.new_fields.timeline_start);
}
Some(crate::action::BackendClipInstanceId::Midi(midi_id)) => {
controller.move_clip(track_id, *midi_id, snap.new_fields.timeline_start);
}
None => {}
}
}
Ok(())
}
fn rollback_backend(
&mut self,
backend: &mut BackendContext,
_document: &Document,
) -> Result<(), String> {
let controller = match backend.audio_controller.as_mut() {
Some(c) => c,
None => return Ok(()),
};
for snap in &self.clip_snapshots {
if (snap.new_fields.timeline_start - snap.old_fields.timeline_start).abs() < 1e-9 {
continue;
}
let track_id = match backend.layer_to_track_map.get(&snap.layer_id) {
Some(&id) => id,
None => continue,
};
let backend_id = backend.clip_instance_to_backend_map.get(&snap.instance_id);
match backend_id {
Some(crate::action::BackendClipInstanceId::Audio(audio_id)) => {
controller.move_clip(track_id, *audio_id, snap.old_fields.timeline_start);
}
Some(crate::action::BackendClipInstanceId::Midi(midi_id)) => {
controller.move_clip(track_id, *midi_id, snap.old_fields.timeline_start);
}
None => {}
}
}
Ok(())
}
}

4
lightningbeam-ui/lightningbeam-core/src/actions/mod.rs
View File

@ -4,8 +4,6 @@
//! through the action system.
pub mod add_clip_instance;
pub mod change_bpm;
pub mod change_fps;
pub mod add_effect;
pub mod add_layer;
pub mod add_shape;
@ -72,5 +70,3 @@ pub use raster_stroke::RasterStrokeAction;
pub use raster_fill::RasterFillAction;
pub use move_layer::MoveLayerAction;
pub use set_fill_paint::SetFillPaintAction;
pub use change_bpm::ChangeBpmAction;
pub use change_fps::ChangeFpsAction;

7
lightningbeam-ui/lightningbeam-core/src/actions/move_clip_instances.rs
View File

@ -119,9 +119,6 @@ impl Action for MoveClipInstancesAction {
// Store adjusted moves for rollback
self.layer_moves = adjusted_moves.clone();
let bpm = document.bpm;
let fps = document.framerate;
// Apply all adjusted moves
for (layer_id, moves) in &adjusted_moves {
let layer = document.get_layer_mut(layer_id)
@ -142,7 +139,6 @@ impl Action for MoveClipInstancesAction {
if let Some(clip_instance) = clip_instances.iter_mut().find(|ci| ci.id == *clip_id)
{
clip_instance.timeline_start = *new;
clip_instance.sync_from_seconds(bpm, fps);
}
}
}
@ -151,8 +147,6 @@ impl Action for MoveClipInstancesAction {
}
fn rollback(&mut self, document: &mut Document) -> Result<(), String> {
let bpm = document.bpm;
let fps = document.framerate;
for (layer_id, moves) in &self.layer_moves {
let layer = document.get_layer_mut(layer_id)
.ok_or_else(|| format!("Layer {} not found", layer_id))?;
@ -172,7 +166,6 @@ impl Action for MoveClipInstancesAction {
if let Some(clip_instance) = clip_instances.iter_mut().find(|ci| ci.id == *clip_id)
{
clip_instance.timeline_start = *old;
clip_instance.sync_from_seconds(bpm, fps);
}
}
}

13
lightningbeam-ui/lightningbeam-core/src/actions/set_layer_properties.rs
View File

@ -20,8 +20,6 @@ pub enum LayerProperty {
Visible(bool),
/// Video layer only: toggle live webcam preview
CameraEnabled(bool),
/// Rename the layer; sets has_custom_name = true
Name(String),
}
/// Stored old value for rollback
@ -35,7 +33,6 @@ enum OldValue {
Opacity(f64),
Visible(bool),
CameraEnabled(bool),
Name(String),
}
/// Action that sets a property on one or more layers
@ -104,7 +101,6 @@ impl Action for SetLayerPropertiesAction {
};
OldValue::CameraEnabled(val)
}
LayerProperty::Name(_) => OldValue::Name(layer.name().to_string()),
});
}
@ -122,10 +118,6 @@ impl Action for SetLayerPropertiesAction {
v.camera_enabled = *c;
}
}
LayerProperty::Name(n) => {
layer.set_name(n.clone());
layer.set_has_custom_name(true);
}
}
}
}
@ -151,10 +143,6 @@ impl Action for SetLayerPropertiesAction {
v.camera_enabled = *c;
}
}
OldValue::Name(n) => {
layer.set_name(n.clone());
layer.set_has_custom_name(false);
}
}
}
}
@ -218,7 +206,6 @@ impl Action for SetLayerPropertiesAction {
LayerProperty::InputGain(_) => "input gain",
LayerProperty::Muted(_) => "mute",
LayerProperty::Soloed(_) => "solo",
LayerProperty::Name(_) => "name",
LayerProperty::Locked(_) => "lock",
LayerProperty::Opacity(_) => "opacity",
LayerProperty::Visible(_) => "visibility",

16
lightningbeam-ui/lightningbeam-core/src/actions/split_clip_instance.rs
View File

@ -179,7 +179,6 @@ impl Action for SplitClipInstanceAction {
}
self.new_instance_id = Some(right_instance.id);
right_instance.sync_from_seconds(document.bpm, document.framerate);
// Now modify the original (left) instance and add the new (right) instance
let layer_mut = document
@ -239,21 +238,6 @@ impl Action for SplitClipInstanceAction {
}
}
// Sync derived fields on the left (original) instance
let (bpm, fps) = (document.bpm, document.framerate);
if let Some(layer) = document.get_layer_mut(&self.layer_id) {
let cis: &mut Vec<crate::clip::ClipInstance> = match layer {
AnyLayer::Vector(vl) => &mut vl.clip_instances,
AnyLayer::Audio(al) => &mut al.clip_instances,
AnyLayer::Video(vl) => &mut vl.clip_instances,
AnyLayer::Effect(el) => &mut el.clip_instances,
_ => return { self.executed = true; Ok(()) },
};
if let Some(inst) = cis.iter_mut().find(|ci| ci.id == self.instance_id) {
inst.sync_from_seconds(bpm, fps);
}
}
self.executed = true;
Ok(())
}

7
lightningbeam-ui/lightningbeam-core/src/actions/trim_clip_instances.rs
View File

@ -260,9 +260,6 @@ impl Action for TrimClipInstancesAction {
// Store clamped trims for rollback
self.layer_trims = clamped_trims.clone();
let bpm = document.bpm;
let fps = document.framerate;
// Apply all clamped trims
for (layer_id, trims) in &clamped_trims {
let layer = match document.get_layer_mut(layer_id) {
@ -297,7 +294,6 @@ impl Action for TrimClipInstancesAction {
clip_instance.trim_end = new.trim_value;
}
}
clip_instance.sync_from_seconds(bpm, fps);
}
}
}
@ -305,8 +301,6 @@ impl Action for TrimClipInstancesAction {
}
fn rollback(&mut self, document: &mut Document) -> Result<(), String> {
let bpm = document.bpm;
let fps = document.framerate;
for (layer_id, trims) in &self.layer_trims {
let layer = match document.get_layer_mut(layer_id) {
Some(l) => l,
@ -340,7 +334,6 @@ impl Action for TrimClipInstancesAction {
clip_instance.trim_end = old.trim_value;
}
}
clip_instance.sync_from_seconds(bpm, fps);
}
}
}

88
lightningbeam-ui/lightningbeam-core/src/clip.rs
View File

@ -610,23 +610,11 @@ pub struct ClipInstance {
/// This is the external positioning - where the instance appears on the timeline
/// Default: 0.0 (start at beginning of layer)
pub timeline_start: f64,
/// timeline_start in beats (quarter-note beats); derived from timeline_start
#[serde(default)]
pub timeline_start_beats: f64,
/// timeline_start in frames; derived from timeline_start
#[serde(default)]
pub timeline_start_frames: f64,
/// How long this instance appears on the timeline (in seconds)
/// If timeline_duration > (trim_end - trim_start), the trimmed content will loop
/// Default: None (use trimmed clip duration, no looping)
pub timeline_duration: Option<f64>,
/// timeline_duration in beats; derived from timeline_duration
#[serde(default)]
pub timeline_duration_beats: Option<f64>,
/// timeline_duration in frames; derived from timeline_duration
#[serde(default)]
pub timeline_duration_frames: Option<f64>,
/// Trim start: offset into the clip's internal content (in seconds)
/// Allows trimming the beginning of the clip
@ -635,23 +623,11 @@ pub struct ClipInstance {
/// - For vector: offset into the animation timeline
/// Default: 0.0 (start at beginning of clip)
pub trim_start: f64,
/// trim_start in beats; derived from trim_start
#[serde(default)]
pub trim_start_beats: f64,
/// trim_start in frames; derived from trim_start
#[serde(default)]
pub trim_start_frames: f64,
/// Trim end: offset into the clip's internal content (in seconds)
/// Allows trimming the end of the clip
/// Default: None (use full clip duration)
pub trim_end: Option<f64>,
/// trim_end in beats; derived from trim_end
#[serde(default)]
pub trim_end_beats: Option<f64>,
/// trim_end in frames; derived from trim_end
#[serde(default)]
pub trim_end_frames: Option<f64>,
/// Playback speed multiplier
/// 1.0 = normal speed, 0.5 = half speed, 2.0 = double speed
@ -720,17 +696,9 @@ impl ClipInstance {
opacity: 1.0,
name: None,
timeline_start: 0.0,
timeline_start_beats: 0.0,
timeline_start_frames: 0.0,
timeline_duration: None,
timeline_duration_beats: None,
timeline_duration_frames: None,
trim_start: 0.0,
trim_start_beats: 0.0,
trim_start_frames: 0.0,
trim_end: None,
trim_end_beats: None,
trim_end_frames: None,
playback_speed: 1.0,
gain: 1.0,
loop_before: None,
@ -746,71 +714,15 @@ impl ClipInstance {
opacity: 1.0,
name: None,
timeline_start: 0.0,
timeline_start_beats: 0.0,
timeline_start_frames: 0.0,
timeline_duration: None,
timeline_duration_beats: None,
timeline_duration_frames: None,
trim_start: 0.0,
trim_start_beats: 0.0,
trim_start_frames: 0.0,
trim_end: None,
trim_end_beats: None,
trim_end_frames: None,
playback_speed: 1.0,
gain: 1.0,
loop_before: None,
}
}
/// Sync beats and frames from the seconds fields (call after any seconds-based write).
pub fn sync_from_seconds(&mut self, bpm: f64, fps: f64) {
self.timeline_start_beats = self.timeline_start * bpm / 60.0;
self.timeline_start_frames = self.timeline_start * fps;
self.trim_start_beats = self.trim_start * bpm / 60.0;
self.trim_start_frames = self.trim_start * fps;
self.trim_end_beats = self.trim_end.map(|v| v * bpm / 60.0);
self.trim_end_frames = self.trim_end.map(|v| v * fps);
self.timeline_duration_beats = self.timeline_duration.map(|v| v * bpm / 60.0);
self.timeline_duration_frames = self.timeline_duration.map(|v| v * fps);
}
/// Recompute seconds and frames from beats (call when BPM changes in Measures mode).
pub fn apply_beats(&mut self, bpm: f64, fps: f64) {
self.timeline_start = self.timeline_start_beats * 60.0 / bpm;
self.timeline_start_frames = self.timeline_start * fps;
self.trim_start = self.trim_start_beats * 60.0 / bpm;
self.trim_start_frames = self.trim_start * fps;
if let Some(b) = self.trim_end_beats {
let s = b * 60.0 / bpm;
self.trim_end = Some(s);
self.trim_end_frames = Some(s * fps);
}
if let Some(b) = self.timeline_duration_beats {
let s = b * 60.0 / bpm;
self.timeline_duration = Some(s);
self.timeline_duration_frames = Some(s * fps);
}
}
/// Recompute seconds and beats from frames (call when FPS changes in Frames mode).
pub fn apply_frames(&mut self, fps: f64, bpm: f64) {
self.timeline_start = self.timeline_start_frames / fps;
self.timeline_start_beats = self.timeline_start * bpm / 60.0;
self.trim_start = self.trim_start_frames / fps;
self.trim_start_beats = self.trim_start * bpm / 60.0;
if let Some(f) = self.trim_end_frames {
let s = f / fps;
self.trim_end = Some(s);
self.trim_end_beats = Some(s * bpm / 60.0);
}
if let Some(f) = self.timeline_duration_frames {
let s = f / fps;
self.timeline_duration = Some(s);
self.timeline_duration_beats = Some(s * bpm / 60.0);
}
}
/// Set the transform
pub fn with_transform(mut self, transform: Transform) -> Self {
self.transform = transform;

50
lightningbeam-ui/lightningbeam-core/src/document.rs
View File

@ -619,56 +619,6 @@ impl Document {
layers
}
/// Migrate old documents: compute beats/frames from seconds for any ClipInstance whose
/// derived fields are still zero (i.e., documents saved before triple-representation).
/// Call once after loading a document.
pub fn sync_all_clip_positions(&mut self) {
let bpm = self.bpm;
let fps = self.framerate;
fn sync_list(list: &mut [crate::layer::AnyLayer], bpm: f64, fps: f64) {
for layer in list.iter_mut() {
match layer {
crate::layer::AnyLayer::Vector(vl) => {
for ci in &mut vl.clip_instances {
if ci.timeline_start_beats == 0.0 { ci.sync_from_seconds(bpm, fps); }
}
}
crate::layer::AnyLayer::Audio(al) => {
for ci in &mut al.clip_instances {
if ci.timeline_start_beats == 0.0 { ci.sync_from_seconds(bpm, fps); }
}
}
crate::layer::AnyLayer::Video(vl) => {
for ci in &mut vl.clip_instances {
if ci.timeline_start_beats == 0.0 { ci.sync_from_seconds(bpm, fps); }
}
}
crate::layer::AnyLayer::Effect(el) => {
for ci in &mut el.clip_instances {
if ci.timeline_start_beats == 0.0 { ci.sync_from_seconds(bpm, fps); }
}
}
crate::layer::AnyLayer::Group(g) => {
sync_list(&mut g.children, bpm, fps);
}
crate::layer::AnyLayer::Raster(_) => {}
}
}
}
sync_list(&mut self.root.children, bpm, fps);
for clip in self.vector_clips.values_mut() {
for node in &mut clip.layers.roots {
if let crate::layer::AnyLayer::Vector(vl) = &mut node.data {
for ci in &mut vl.clip_instances {
if ci.timeline_start_beats == 0.0 { ci.sync_from_seconds(bpm, fps); }
}
}
}
}
}
// === CLIP LIBRARY METHODS ===
/// Add a vector clip to the library

2
lightningbeam-ui/lightningbeam-core/src/renderer.rs
View File

@ -1449,7 +1449,7 @@ fn render_vector_graph_cpu(
}
// Image fill — decode to Pixmap and use as a Pattern shader
if let Some(image_asset_id) = fill.image_fill {
if let Some(image_asset_id) = face.image_fill {
if let Some(asset) = document.get_image_asset(&image_asset_id) {
if let Some(img_pixmap) = image_cache.get_or_decode_cpu(asset) {
let pattern = tiny_skia::Pattern::new(

11
lightningbeam-ui/lightningbeam-editor/src/curve_editor.rs
View File

@ -139,17 +139,6 @@ pub fn render_curve_lane(
// ── Background ──────────────────────────────────────────────────────────
painter.rect_filled(rect, 0.0, Color32::from_rgba_premultiplied(20, 20, 25, 230));
// Inset shadow: dark line at top, light line at bottom
painter.line_segment(
[rect.left_top(), rect.right_top()],
Stroke::new(1.0, Color32::from_black_alpha(60)),
);
let bottom_y = rect.max.y - 1.0;
painter.line_segment(
[Pos2::new(rect.min.x, bottom_y), Pos2::new(rect.max.x, bottom_y)],
Stroke::new(1.0, Color32::from_white_alpha(18)),
);
// Zero-line (value = 0, or mid-line if range doesn't include 0)
let zero_norm = normalize(0.0).clamp(0.0, 1.0);
let zero_y = value_to_y(zero_norm, rect);

71
lightningbeam-ui/lightningbeam-editor/src/main.rs
View File

@ -3114,12 +3114,7 @@ impl EditorApp {
};
// Rebuild MIDI cache after undo (backend_context dropped, borrows released)
if undo_succeeded {
let multi = self.action_executor.last_redo_all_midi_events();
if !multi.is_empty() {
for (clip_id, events) in multi {
self.midi_event_cache.insert(clip_id, events);
}
} else if let Some((clip_id, events)) = self.action_executor.last_redo_midi_events()
if let Some((clip_id, events)) = self.action_executor.last_redo_midi_events()
.map(|(id, ev)| (id, ev.to_vec()))
{
self.midi_event_cache.insert(clip_id, events);
@ -3163,12 +3158,7 @@ impl EditorApp {
};
// Rebuild MIDI cache after redo (backend_context dropped, borrows released)
if redo_succeeded {
let multi = self.action_executor.last_undo_all_midi_events();
if !multi.is_empty() {
for (clip_id, events) in multi {
self.midi_event_cache.insert(clip_id, events);
}
} else if let Some((clip_id, events)) = self.action_executor.last_undo_midi_events()
if let Some((clip_id, events)) = self.action_executor.last_undo_midi_events()
.map(|(id, ev)| (id, ev.to_vec()))
{
self.midi_event_cache.insert(clip_id, events);
@ -3834,9 +3824,6 @@ impl EditorApp {
// Rebuild MIDI event cache for all MIDI clips (needed for timeline/piano roll rendering)
let step8_start = std::time::Instant::now();
// Migrate old documents: compute beats/frames derived fields
self.action_executor.document_mut().sync_all_clip_positions();
self.midi_event_cache.clear();
let midi_clip_ids: Vec<u32> = self.action_executor.document()
.audio_clips.values()
@ -3859,19 +3846,6 @@ impl EditorApp {
}
eprintln!("📊 [APPLY] Step 8: Rebuilt MIDI event cache for {} clips in {:.2}ms", midi_fetched, step8_start.elapsed().as_secs_f64() * 1000.0);
// Sync beats/frames derived fields on MIDI events (migration for old documents)
{
let bpm = self.action_executor.document().bpm;
let fps = self.action_executor.document().framerate;
for events in self.midi_event_cache.values_mut() {
for ev in events.iter_mut() {
if ev.timestamp_beats == 0.0 && ev.timestamp.abs() > 1e-9 {
ev.sync_from_seconds(bpm, fps);
}
}
}
}
// Reset playback state
self.playback_time = 0.0;
self.is_playing = false;
@ -4002,16 +3976,10 @@ impl EditorApp {
/// Rebuild a MIDI event cache entry from backend note format.
/// Called after undo/redo to keep the cache consistent with the backend.
fn rebuild_midi_cache_entry(&mut self, clip_id: u32, notes: &[(f64, u8, u8, f64)]) {
let bpm = self.action_executor.document().bpm;
let fps = self.action_executor.document().framerate;
let mut events: Vec<daw_backend::audio::midi::MidiEvent> = Vec::with_capacity(notes.len() * 2);
for &(start_time, note, velocity, duration) in notes {
let mut on = daw_backend::audio::midi::MidiEvent::note_on(start_time, 0, note, velocity);
on.sync_from_seconds(bpm, fps);
events.push(on);
let mut off = daw_backend::audio::midi::MidiEvent::note_off(start_time + duration, 0, note, 0);
off.sync_from_seconds(bpm, fps);
events.push(off);
events.push(daw_backend::audio::midi::MidiEvent::note_on(start_time, 0, note, velocity));
events.push(daw_backend::audio::midi::MidiEvent::note_off(start_time + duration, 0, note, 0));
}
events.sort_by(|a, b| a.timestamp.partial_cmp(&b.timestamp).unwrap());
self.midi_event_cache.insert(clip_id, events);
@ -5210,16 +5178,10 @@ impl eframe::App for EditorApp {
// Update midi_event_cache with notes captured so far
// (inlined to avoid conflicting &mut self borrow)
{
let bpm = self.action_executor.document().bpm;
let fps = self.action_executor.document().framerate;
let mut events: Vec<daw_backend::audio::midi::MidiEvent> = Vec::with_capacity(notes.len() * 2);
for &(start_time, note, velocity, dur) in &notes {
let mut on = daw_backend::audio::midi::MidiEvent::note_on(start_time, 0, note, velocity);
on.sync_from_seconds(bpm, fps);
events.push(on);
let mut off = daw_backend::audio::midi::MidiEvent::note_off(start_time + dur, 0, note, 0);
off.sync_from_seconds(bpm, fps);
events.push(off);
events.push(daw_backend::audio::midi::MidiEvent::note_on(start_time, 0, note, velocity));
events.push(daw_backend::audio::midi::MidiEvent::note_off(start_time + dur, 0, note, 0));
}
events.sort_by(|a, b| a.timestamp.partial_cmp(&b.timestamp).unwrap());
self.midi_event_cache.insert(clip_id, events);
@ -5236,13 +5198,7 @@ impl eframe::App for EditorApp {
match controller.query_midi_clip(track_id, clip_id) {
Ok(midi_clip_data) => {
drop(controller);
let bpm = self.action_executor.document().bpm;
let fps = self.action_executor.document().framerate;
let mut final_events = midi_clip_data.events.clone();
for ev in &mut final_events {
ev.sync_from_seconds(bpm, fps);
}
self.midi_event_cache.insert(clip_id, final_events);
self.midi_event_cache.insert(clip_id, midi_clip_data.events.clone());
// Update document clip with final duration and name
let doc_clip_id = self.action_executor.document()
@ -5311,7 +5267,7 @@ impl eframe::App for EditorApp {
self.waveform_gpu_dirty.insert(pool_index);
ctx.request_repaint();
}
AudioEvent::GraphPresetLoaded(track_id, preset_name) => {
AudioEvent::GraphPresetLoaded(_track_id) => {
// Preset was loaded on the audio thread — bump generation
// so the node graph pane reloads from backend
self.project_generation += 1;
@ -5322,17 +5278,6 @@ impl eframe::App for EditorApp {
std::sync::atomic::Ordering::Relaxed,
|v| if v > 0 { Some(v - 1) } else { Some(0) },
);
// Auto-rename the MIDI layer to match the preset name, unless
// the user has already given it a custom name
if let Some(&layer_uuid) = self.track_to_layer_map.get(&track_id) {
let doc = self.action_executor.document_mut();
if let Some(layer) = doc.get_layer_mut(&layer_uuid) {
use lightningbeam_core::layer::LayerTrait;
if !layer.has_custom_name() {
layer.set_name(preset_name);
}
}
}
ctx.request_repaint();
}
AudioEvent::InputLevel(peak) => {

60
lightningbeam-ui/lightningbeam-editor/src/panes/infopanel.rs
View File

@ -42,8 +42,6 @@ pub struct InfopanelPane {
selected_shape_gradient_stop: Option<usize>,
/// Selected stop index for gradient editor in tool section (gradient tool).
selected_tool_gradient_stop: Option<usize>,
/// FPS value captured when a drag/focus-in starts (for single-undo-action on commit)
fps_drag_start: Option<f64>,
}
impl InfopanelPane {
@ -60,7 +58,6 @@ impl InfopanelPane {
brush_preview_textures: Vec::new(),
selected_shape_gradient_stop: None,
selected_tool_gradient_stop: None,
fps_drag_start: None,
}
}
}
@ -909,20 +906,21 @@ impl InfopanelPane {
}
/// Render document settings section (shown when nothing is focused)
fn render_document_section(&mut self, ui: &mut Ui, path: &NodePath, shared: &mut SharedPaneState) {
fn render_document_section(&self, ui: &mut Ui, path: &NodePath, shared: &mut SharedPaneState) {
egui::CollapsingHeader::new("Document")
.id_salt(("document", path))
.default_open(true)
.show(ui, |ui| {
ui.add_space(4.0);
// Extract all needed values up front, then drop the borrow before closures
// that need mutable access to shared or self.
let (mut width, mut height, mut duration, mut framerate, layer_count, background_color) = {
let document = shared.action_executor.document();
(document.width, document.height, document.duration, document.framerate,
document.root.children.len(), document.background_color)
};
// Get current values for editing
let mut width = document.width;
let mut height = document.height;
let mut duration = document.duration;
let mut framerate = document.framerate;
let layer_count = document.root.children.len();
// Canvas width
ui.horizontal(|ui| {
@ -968,54 +966,24 @@ impl InfopanelPane {
// Framerate
ui.horizontal(|ui| {
ui.label("Framerate:");
let fps_response = ui.add(
if ui
.add(
DragValue::new(&mut framerate)
.speed(1.0)
.range(1.0..=120.0)
.suffix(" fps"),
);
if fps_response.gained_focus() || fps_response.drag_started() {
if self.fps_drag_start.is_none() {
self.fps_drag_start = Some(framerate);
}
}
if fps_response.changed() {
// Live preview: update document directly
shared.action_executor.document_mut().framerate = framerate;
}
if fps_response.drag_stopped() || fps_response.lost_focus() {
if let Some(start_fps) = self.fps_drag_start.take() {
let new_fps = shared.action_executor.document().framerate;
let timeline_mode = shared.action_executor.document().timeline_mode;
if (start_fps - new_fps).abs() > 1e-9
&& timeline_mode == lightningbeam_core::document::TimelineMode::Frames
)
.changed()
{
use lightningbeam_core::actions::ChangeFpsAction;
// Revert live-preview so the action owns it
shared.action_executor.document_mut().framerate = start_fps;
let action = ChangeFpsAction::new(
start_fps,
new_fps,
shared.action_executor.document(),
);
let action = SetDocumentPropertiesAction::set_framerate(framerate);
shared.pending_actions.push(Box::new(action));
} else if (start_fps - new_fps).abs() > 1e-9 {
// Not in Frames mode — use simple property action (no stretching)
shared.action_executor.document_mut().framerate = start_fps;
let action = SetDocumentPropertiesAction::set_framerate(new_fps);
shared.pending_actions.push(Box::new(action));
}
}
}
});
// Background color (with alpha)
ui.horizontal(|ui| {
ui.label("Background:");
let bg = background_color;
let bg = document.background_color;
let mut color = [bg.r, bg.g, bg.b, bg.a];
if ui.color_edit_button_srgba_unmultiplied(&mut color).changed() {
let action = SetDocumentPropertiesAction::set_background_color(

2
lightningbeam-ui/lightningbeam-editor/src/panes/node_graph/graph_data.rs
View File

@ -777,7 +777,7 @@ impl NodeTemplateTrait for NodeTemplate {
NodeTemplate::Pan => {
graph.add_input_param(node_id, "Audio In".into(), DataType::Audio, ValueType::float(0.0), InputParamKind::ConnectionOnly, true);
graph.add_input_param(node_id, "Pan".into(), DataType::CV,
ValueType::float_param(0.0, -1.0, 1.0, "", 0, None), InputParamKind::ConnectionOrConstant, true);
ValueType::float_param(0.0, -1.0, 1.0, "", 0, None), InputParamKind::ConstantOnly, true);
graph.add_output_param(node_id, "Audio Out".into(), DataType::Audio);
}
NodeTemplate::RingModulator => {

222
lightningbeam-ui/lightningbeam-editor/src/panes/piano_roll.rs
View File

@ -34,48 +34,6 @@ enum PitchBendZone {
End, // Last 30%: ramp from 0 → bend
}
#[derive(Clone, Copy, Debug, PartialEq, Default)]
enum SnapValue {
#[default] None,
Whole, Half, Quarter, Eighth, Sixteenth, ThirtySecond,
QuarterTriplet, EighthTriplet, SixteenthTriplet, ThirtySecondTriplet,
EighthSwingLight, SixteenthSwingLight,
EighthSwingHeavy, SixteenthSwingHeavy,
}
impl SnapValue {
fn label(self) -> &'static str {
match self {
Self::None => "None",
Self::Whole => "1/1",
Self::Half => "1/2",
Self::Quarter => "1/4",
Self::Eighth => "1/8",
Self::Sixteenth => "1/16",
Self::ThirtySecond => "1/32",
Self::QuarterTriplet => "1/4T",
Self::EighthTriplet => "1/8T",
Self::SixteenthTriplet => "1/16T",
Self::ThirtySecondTriplet => "1/32T",
Self::EighthSwingLight => "1/8 swing light",
Self::SixteenthSwingLight => "1/16 swing light",
Self::EighthSwingHeavy => "1/8 swing heavy",
Self::SixteenthSwingHeavy => "1/16 swing heavy",
}
}
fn all() -> &'static [SnapValue] {
&[
Self::None, Self::Whole, Self::Half, Self::Quarter,
Self::Eighth, Self::Sixteenth, Self::ThirtySecond,
Self::QuarterTriplet, Self::EighthTriplet,
Self::SixteenthTriplet, Self::ThirtySecondTriplet,
Self::EighthSwingLight, Self::SixteenthSwingLight,
Self::EighthSwingHeavy, Self::SixteenthSwingHeavy,
]
}
}
#[derive(Debug, Clone, Copy, PartialEq)]
enum DragMode {
MoveNotes { start_time_offset: f64, start_note_offset: i32 },
@ -164,11 +122,6 @@ pub struct PianoRollPane {
pitch_bend_range: f32,
// Layer ID for which pitch_bend_range was last queried
pitch_bend_range_layer: Option<uuid::Uuid>,
// Snap / quantize
snap_value: SnapValue,
last_snap_selection: HashSet<usize>,
snap_user_changed: bool, // set in render_header, consumed before handle_input
}
impl PianoRollPane {
@ -202,9 +155,6 @@ impl PianoRollPane {
header_mod: 0.0,
pitch_bend_range: 2.0,
pitch_bend_range_layer: None,
snap_value: SnapValue::None,
last_snap_selection: HashSet::new(),
snap_user_changed: false,
}
}
@ -313,61 +263,6 @@ impl PianoRollPane {
// ── MIDI mode rendering ──────────────────────────────────────────────
} // end impl PianoRollPane (snap helpers follow as free functions)
fn snap_to_value(t: f64, snap: SnapValue, bpm: f64) -> f64 {
let beat = 60.0 / bpm;
match snap {
SnapValue::None => t,
SnapValue::Whole => round_to_grid(t, beat * 4.0),
SnapValue::Half => round_to_grid(t, beat * 2.0),
SnapValue::Quarter => round_to_grid(t, beat),
SnapValue::Eighth => round_to_grid(t, beat * 0.5),
SnapValue::Sixteenth => round_to_grid(t, beat * 0.25),
SnapValue::ThirtySecond => round_to_grid(t, beat * 0.125),
SnapValue::QuarterTriplet => round_to_grid(t, beat * 2.0 / 3.0),
SnapValue::EighthTriplet => round_to_grid(t, beat / 3.0),
SnapValue::SixteenthTriplet => round_to_grid(t, beat / 6.0),
SnapValue::ThirtySecondTriplet => round_to_grid(t, beat / 12.0),
SnapValue::EighthSwingLight => snap_swing(t, beat, 2.0 / 3.0),
SnapValue::SixteenthSwingLight => snap_swing(t, beat * 0.5, 2.0 / 3.0),
SnapValue::EighthSwingHeavy => snap_swing(t, beat, 3.0 / 4.0),
SnapValue::SixteenthSwingHeavy => snap_swing(t, beat * 0.5, 3.0 / 4.0),
}
}
fn round_to_grid(t: f64, interval: f64) -> f64 {
(t / interval).round() * interval
}
fn snap_swing(t: f64, cell: f64, ratio: f64) -> f64 {
let cell_n = (t / cell).floor() as i64;
let cell_start = cell_n as f64 * cell;
let cands = [cell_start, cell_start + ratio * cell, cell_start + cell];
*cands.iter().min_by(|&&a, &&b| (a - t).abs().partial_cmp(&(b - t).abs()).unwrap()).unwrap()
}
fn detect_snap(notes: &[&ResolvedNote], bpm: f64) -> SnapValue {
const EPS: f64 = 0.002;
if notes.is_empty() { return SnapValue::None; }
let order = [
SnapValue::Whole, SnapValue::Half, SnapValue::Quarter,
SnapValue::EighthSwingHeavy, SnapValue::EighthSwingLight, SnapValue::Eighth,
SnapValue::SixteenthSwingHeavy, SnapValue::SixteenthSwingLight,
SnapValue::QuarterTriplet, SnapValue::Sixteenth,
SnapValue::EighthTriplet, SnapValue::ThirtySecond,
SnapValue::SixteenthTriplet, SnapValue::ThirtySecondTriplet,
];
for &sv in &order {
if notes.iter().all(|n| (snap_to_value(n.start_time, sv, bpm) - n.start_time).abs() < EPS) {
return sv;
}
}
SnapValue::None
}
impl PianoRollPane {
fn render_midi_mode(
&mut self,
ui: &mut egui::Ui,
@ -450,18 +345,6 @@ impl PianoRollPane {
}
}
// Apply quantize if the user changed the snap dropdown (must happen before handle_input
// which may clear the selection when the ComboBox click propagates to the grid).
if self.snap_user_changed {
self.snap_user_changed = false;
if self.snap_value != SnapValue::None && !self.selected_note_indices.is_empty() {
if let Some(clip_id) = self.selected_clip_id {
let bpm = shared.action_executor.document().bpm;
self.quantize_selected_notes(clip_id, bpm, shared);
}
}
}
// Handle input before rendering
self.handle_input(ui, grid_rect, keyboard_rect, shared, &clip_data);
@ -770,7 +653,7 @@ impl PianoRollPane {
};
let timestamp = note_start + t * note_duration;
let (lsb, msb) = encode_bend(normalized);
events.push(MidiEvent::new(timestamp, 0xE0 | channel, lsb, msb));
events.push(MidiEvent { timestamp, status: 0xE0 | channel, data1: lsb, data2: msb });
}
events
}
@ -1212,9 +1095,7 @@ impl PianoRollPane {
// Immediate press detection (fires on the actual press frame, before egui's drag threshold).
// This ensures note preview and hit testing use the real press position.
// Skip when any popup (e.g. ComboBox dropdown) is open so clicks there don't pass through.
let pointer_just_pressed = ui.input(|i| i.pointer.button_pressed(egui::PointerButton::Primary))
&& !ui.ctx().is_popup_open();
let pointer_just_pressed = ui.input(|i| i.pointer.button_pressed(egui::PointerButton::Primary));
if pointer_just_pressed {
if let Some(pos) = ui.input(|i| i.pointer.interact_pos()) {
if full_rect.contains(pos) {
@ -1374,11 +1255,7 @@ impl PianoRollPane {
if let Some(selected_clip) = clip_data.iter().find(|c| Some(c.0) == self.selected_clip_id) {
let clip_start = selected_clip.1;
let trim_start = selected_clip.2;
let bpm = shared.action_executor.document().bpm;
let clip_local_time = snap_to_value(
(time - clip_start).max(0.0) + trim_start,
self.snap_value, bpm,
);
let clip_local_time = (time - clip_start).max(0.0) + trim_start;
self.creating_note = Some(TempNote {
note,
start_time: clip_local_time,
@ -1389,18 +1266,11 @@ impl PianoRollPane {
self.preview_note_on(note, DEFAULT_VELOCITY, None, now, shared);
}
} else {
// Start selection rectangle and seek playhead to clicked time
// Start selection rectangle
self.selected_note_indices.clear();
self.update_focus(shared);
self.selection_rect = Some((pos, pos));
self.drag_mode = Some(DragMode::SelectRect);
let bpm = shared.action_executor.document().bpm;
let seek_time = snap_to_value(time.max(0.0), self.snap_value, bpm);
*shared.playback_time = seek_time;
if let Some(ctrl) = shared.audio_controller.as_ref() {
if let Ok(mut c) = ctrl.lock() { c.seek(seek_time); }
}
}
}
@ -1568,20 +1438,15 @@ impl PianoRollPane {
let combined = (existing_norm[i] + zone_norm).clamp(-1.0, 1.0);
let (lsb, msb) = encode_bend(combined);
let ts = note_start + i as f64 / num_steps as f64 * note_duration;
new_events.push(daw_backend::audio::midi::MidiEvent::new(ts, 0xE0 | target_channel, lsb, msb));
new_events.push(daw_backend::audio::midi::MidiEvent { timestamp: ts, status: 0xE0 | target_channel, data1: lsb, data2: msb });
}
// For End zone: reset just after note ends so it doesn't bleed into next note
if zone == PitchBendZone::End {
let (lsb, msb) = encode_bend(0.0);
new_events.push(daw_backend::audio::midi::MidiEvent::new(note_start + note_duration + 0.005, 0xE0 | target_channel, lsb, msb));
new_events.push(daw_backend::audio::midi::MidiEvent { timestamp: note_start + note_duration + 0.005, status: 0xE0 | target_channel, data1: lsb, data2: msb });
}
new_events.sort_by(|a, b| a.timestamp.partial_cmp(&b.timestamp).unwrap_or(std::cmp::Ordering::Equal));
{
let doc = shared.action_executor.document();
let bpm = doc.bpm; let fps = doc.framerate;
for ev in &mut new_events { ev.sync_from_seconds(bpm, fps); }
}
self.push_events_action("Set pitch bend", clip_id, old_events, new_events.clone(), shared);
shared.midi_event_cache.insert(clip_id, new_events);
}
@ -1787,12 +1652,10 @@ impl PianoRollPane {
let resolved = Self::resolve_notes(events);
let old_notes = Self::notes_to_backend_format(&resolved);
let bpm = shared.action_executor.document().bpm;
let mut new_resolved = resolved.clone();
for &idx in &self.selected_note_indices {
if idx < new_resolved.len() {
let raw_time = (new_resolved[idx].start_time + dt).max(0.0);
new_resolved[idx].start_time = snap_to_value(raw_time, self.snap_value, bpm);
new_resolved[idx].start_time = (new_resolved[idx].start_time + dt).max(0.0);
new_resolved[idx].note = (new_resolved[idx].note as i32 + dn).clamp(0, 127) as u8;
}
}
@ -1968,23 +1831,6 @@ impl PianoRollPane {
shared.pending_actions.push(Box::new(action));
}
fn quantize_selected_notes(&mut self, clip_id: u32, bpm: f64, shared: &mut SharedPaneState) {
let events = match shared.midi_event_cache.get(&clip_id) { Some(e) => e, None => return };
let resolved = Self::resolve_notes(events);
let old_notes = Self::notes_to_backend_format(&resolved);
let mut new_resolved = resolved.clone();
for &idx in &self.selected_note_indices {
if idx < new_resolved.len() {
new_resolved[idx].start_time =
snap_to_value(new_resolved[idx].start_time, self.snap_value, bpm).max(0.0);
}
}
let new_notes = Self::notes_to_backend_format(&new_resolved);
Self::update_cache_from_resolved(clip_id, &new_resolved, shared);
self.push_update_action("Quantize notes", clip_id, old_notes, new_notes, shared, &[]);
self.cached_clip_id = None;
}
fn push_events_action(
&self,
description: &str,
@ -2364,17 +2210,15 @@ impl PaneRenderer for PianoRollPane {
!(is_cc1 && at_start)
});
if new_cc1 > 0 {
new_events.push(daw_backend::audio::midi::MidiEvent::new(
sn.start_time, 0xB0 | sn.channel, 1, new_cc1,
));
new_events.push(daw_backend::audio::midi::MidiEvent {
timestamp: sn.start_time,
status: 0xB0 | sn.channel,
data1: 1,
data2: new_cc1,
});
}
}
new_events.sort_by(|a, b| a.timestamp.partial_cmp(&b.timestamp).unwrap_or(std::cmp::Ordering::Equal));
{
let doc = shared.action_executor.document();
let bpm = doc.bpm; let fps = doc.framerate;
for ev in &mut new_events { ev.sync_from_seconds(bpm, fps); }
}
self.push_events_action("Set modulation", clip_id, old_events, new_events.clone(), shared);
shared.midi_event_cache.insert(clip_id, new_events);
}
@ -2412,46 +2256,6 @@ impl PaneRenderer for PianoRollPane {
.max_decimals(1),
);
}
// Snap-to dropdown — only in Measures mode
let doc = shared.action_executor.document();
let is_measures = doc.timeline_mode == lightningbeam_core::document::TimelineMode::Measures;
let bpm = doc.bpm;
drop(doc);
if is_measures {
// Auto-detect grid when selection changes
if self.selected_note_indices != self.last_snap_selection {
if !self.selected_note_indices.is_empty() {
if let Some(clip_id) = self.selected_clip_id {
if let Some(events) = shared.midi_event_cache.get(&clip_id) {
let resolved = Self::resolve_notes(events);
let sel: Vec<&ResolvedNote> = self.selected_note_indices.iter()
.filter_map(|&i| resolved.get(i))
.collect();
self.snap_value = detect_snap(&sel, bpm);
}
}
}
self.last_snap_selection = self.selected_note_indices.clone();
}
ui.separator();
ui.label(egui::RichText::new("Snap to:").color(header_secondary).size(10.0));
let old_snap = self.snap_value;
egui::ComboBox::from_id_salt("piano_roll_snap")
.selected_text(self.snap_value.label())
.width(110.0)
.show_ui(ui, |ui| {
for &sv in SnapValue::all() {
ui.selectable_value(&mut self.snap_value, sv, sv.label());
}
});
if self.snap_value != old_snap {
self.snap_user_changed = true;
}
}
});
true
}

292
lightningbeam-ui/lightningbeam-editor/src/panes/timeline.rs
View File

@ -219,12 +219,6 @@ pub struct TimelinePane {
metronome_icon: Option<egui::TextureHandle>,
/// Count-in pre-roll state: set when count-in is active, cleared when recording fires
pending_recording_start: Option<PendingRecordingStart>,
/// Layer currently being renamed via inline text edit (layer_id, buffer)
renaming_layer: Option<(uuid::Uuid, String)>,
/// BPM value captured when a drag/focus-in starts (for single-undo-action on commit)
bpm_drag_start: Option<f64>,
}
/// Deferred recording start created during count-in pre-roll
@ -508,19 +502,11 @@ fn build_audio_clip_cache(
let mut ci = ClipInstance::new(clip_id);
ci.id = instance_id;
ci.timeline_start = ac.external_start;
ci.timeline_start_beats = ac.external_start_beats;
ci.timeline_start_frames = ac.external_start_frames;
ci.trim_start = ac.internal_start;
ci.trim_start_beats = ac.internal_start_beats;
ci.trim_start_frames = ac.internal_start_frames;
ci.trim_end = Some(ac.internal_end);
ci.trim_end_beats = Some(ac.internal_end_beats);
ci.trim_end_frames = Some(ac.internal_end_frames);
let internal_dur = ac.internal_end - ac.internal_start;
if (ac.external_duration - internal_dur).abs() > 1e-9 {
ci.timeline_duration = Some(ac.external_duration);
ci.timeline_duration_beats = Some(ac.external_duration_beats);
ci.timeline_duration_frames = Some(ac.external_duration_frames);
}
ci.gain = ac.gain;
instances.push(ci);
@ -538,19 +524,11 @@ fn build_audio_clip_cache(
let mut ci = ClipInstance::new(clip_id);
ci.id = instance_id;
ci.timeline_start = mc.external_start;
ci.timeline_start_beats = mc.external_start_beats;
ci.timeline_start_frames = mc.external_start_frames;
ci.trim_start = mc.internal_start;
ci.trim_start_beats = mc.internal_start_beats;
ci.trim_start_frames = mc.internal_start_frames;
ci.trim_end = Some(mc.internal_end);
ci.trim_end_beats = Some(mc.internal_end_beats);
ci.trim_end_frames = Some(mc.internal_end_frames);
let internal_dur = mc.internal_end - mc.internal_start;
if (mc.external_duration - internal_dur).abs() > 1e-9 {
ci.timeline_duration = Some(mc.external_duration);
ci.timeline_duration_beats = Some(mc.external_duration_beats);
ci.timeline_duration_frames = Some(mc.external_duration_frames);
}
instances.push(ci);
}
@ -702,8 +680,6 @@ impl TimelinePane {
automation_topology_generation: u64::MAX,
metronome_icon: None,
pending_recording_start: None,
renaming_layer: None,
bpm_drag_start: None,
}
}
@ -1024,11 +1000,8 @@ impl TimelinePane {
*shared.recording_clips.get(&layer_id).unwrap_or(&0), 0.0);
let doc_clip_id = shared.action_executor.document_mut().add_audio_clip(doc_clip);
let bpm = shared.action_executor.document().bpm;
let fps = shared.action_executor.document().framerate;
let mut clip_instance = ClipInstance::new(doc_clip_id)
let clip_instance = ClipInstance::new(doc_clip_id)
.with_timeline_start(start_time);
clip_instance.sync_from_seconds(bpm, fps);
if let Some(layer) = shared.action_executor.document_mut().get_layer_mut(&layer_id) {
if let lightningbeam_core::layer::AnyLayer::Audio(audio_layer) = layer {
@ -1363,61 +1336,6 @@ impl TimelinePane {
((time - self.viewport_start_time) * self.pixels_per_second as f64) as f32
}
/// Effective display start for a clip instance.
///
/// In Measures mode, uses `timeline_start_beats` as the canonical position so clips stay
/// anchored to their beat position during live BPM drag preview. Falls back to seconds
/// in other modes or when beat data is unavailable.
fn instance_display_start(&self, ci: &lightningbeam_core::clip::ClipInstance, bpm: f64) -> f64 {
if self.time_display_format == lightningbeam_core::document::TimelineMode::Measures
&& (ci.timeline_start_beats.abs() > 1e-12 || ci.timeline_start == 0.0)
{
ci.timeline_start_beats * 60.0 / bpm - ci.loop_before.unwrap_or(0.0)
} else {
ci.effective_start()
}
}
/// In Measures mode, uses beats fields for the clip's on-timeline duration so the width
/// stays correct during live BPM drag preview. Falls back to seconds in other modes.
fn instance_display_duration(&self, ci: &lightningbeam_core::clip::ClipInstance, clip_dur_secs: f64, bpm: f64) -> f64 {
use lightningbeam_core::document::TimelineMode;
if self.time_display_format == TimelineMode::Measures {
// Looping/extended clip: explicit timeline_duration_beats
if let Some(dur_beats) = ci.timeline_duration_beats {
if dur_beats.abs() > 1e-12 {
return dur_beats * 60.0 / bpm;
}
}
// Non-looping: derive from trim range in beats
let ts_beats = ci.trim_start_beats;
if let Some(te_beats) = ci.trim_end_beats {
if te_beats.abs() > 1e-12 || ts_beats.abs() > 1e-12 {
return (te_beats - ts_beats).max(0.0) * 60.0 / bpm;
}
}
}
ci.total_duration(clip_dur_secs)
}
/// In Measures mode, returns the clip content start (trim_start) and duration in
/// beat-derived display seconds, for use when rendering note overlays.
fn content_display_range(&self, ci: &lightningbeam_core::clip::ClipInstance, clip_dur_secs: f64, bpm: f64) -> (f64, f64) {
use lightningbeam_core::document::TimelineMode;
if self.time_display_format == TimelineMode::Measures {
let ts_beats = ci.trim_start_beats;
if let Some(te_beats) = ci.trim_end_beats {
if te_beats.abs() > 1e-12 || ts_beats.abs() > 1e-12 {
let start = ts_beats * 60.0 / bpm;
let dur = (te_beats - ts_beats).max(0.0) * 60.0 / bpm;
return (start, dur);
}
}
}
let trim_end = ci.trim_end.unwrap_or(clip_dur_secs);
(ci.trim_start, (trim_end - ci.trim_start).max(0.0))
}
/// Convert pixel x-coordinate to time (seconds)
fn x_to_time(&self, x: f32) -> f64 {
self.viewport_start_time + (x / self.pixels_per_second) as f64
@ -1694,9 +1612,6 @@ impl TimelinePane {
/// Render mini piano roll visualization for MIDI clips on timeline
/// Shows notes modulo 12 (one octave) matching the JavaScript reference implementation
///
/// `display_bpm`: when `Some(bpm)`, note timestamps are derived from `timestamp_beats`
/// so positions stay beat-anchored during live BPM drag preview.
#[allow(clippy::too_many_arguments)]
fn render_midi_piano_roll(
painter: &egui::Painter,
@ -1711,7 +1626,6 @@ impl TimelinePane {
theme: &crate::theme::Theme,
ctx: &egui::Context,
faded: bool,
display_bpm: Option<f64>,
) {
let clip_height = clip_rect.height();
let note_height = clip_height / 12.0; // 12 semitones per octave
@ -1720,17 +1634,6 @@ impl TimelinePane {
let note_style = theme.style(".timeline-midi-note", ctx);
let note_color = note_style.background_color().unwrap_or(egui::Color32::BLACK);
// In Measures mode during BPM drag, derive display time from beats so notes
// stay anchored to their beat positions.
let event_display_time = |ev: &daw_backend::audio::midi::MidiEvent| -> f64 {
if let Some(bpm) = display_bpm {
if ev.timestamp_beats.abs() > 1e-12 || ev.timestamp == 0.0 {
return ev.timestamp_beats * 60.0 / bpm;
}
}
ev.timestamp
};
// Build a map of active notes (note_number -> note_on_timestamp)
// to calculate durations when we encounter note-offs
let mut active_notes: std::collections::HashMap<u8, f64> = std::collections::HashMap::new();
@ -1739,10 +1642,10 @@ impl TimelinePane {
// First pass: pair note-ons with note-offs to calculate durations
for event in events {
if event.is_note_on() {
let (note_number, timestamp) = (event.data1, event_display_time(event));
let (note_number, timestamp) = (event.data1, event.timestamp);
active_notes.insert(note_number, timestamp);
} else if event.is_note_off() {
let (note_number, timestamp) = (event.data1, event_display_time(event));
let (note_number, timestamp) = (event.data1, event.timestamp);
if let Some(&note_on_time) = active_notes.get(&note_number) {
let duration = timestamp - note_on_time;
@ -2021,51 +1924,14 @@ impl TimelinePane {
name_x_offset = 10.0 + indent + 18.0;
}
// Layer name — double-click to rename inline
let name_pos = header_rect.min + egui::vec2(name_x_offset, 4.0);
let name_rect = egui::Rect::from_min_size(
name_pos,
egui::vec2(header_rect.max.x - name_pos.x - 8.0, 22.0),
);
let is_renaming = self.renaming_layer.as_ref().map_or(false, |(id, _)| *id == layer_id);
if is_renaming {
let buf = &mut self.renaming_layer.as_mut().unwrap().1;
let te = egui::TextEdit::singleline(buf)
.font(egui::FontId::proportional(14.0))
.text_color(text_color)
.frame(false)
.desired_width(name_rect.width());
let te_resp = ui.put(name_rect, te);
te_resp.request_focus();
let done = te_resp.lost_focus()
|| ui.input(|i| i.key_pressed(egui::Key::Enter) || i.key_pressed(egui::Key::Escape));
if done {
let new_name = self.renaming_layer.take().unwrap().1;
let new_name = new_name.trim().to_string();
if !new_name.is_empty() && new_name != layer_name {
pending_actions.push(Box::new(
lightningbeam_core::actions::SetLayerPropertiesAction::new(
layer_id,
lightningbeam_core::actions::LayerProperty::Name(new_name),
)
));
}
self.layer_control_clicked = true;
}
} else {
let name_resp = ui.allocate_rect(name_rect, egui::Sense::click());
// Layer name
ui.painter().text(
name_pos + egui::vec2(0.0, 6.0),
header_rect.min + egui::vec2(name_x_offset, 10.0),
egui::Align2::LEFT_TOP,
&layer_name,
egui::FontId::proportional(14.0),
text_color,
);
if name_resp.double_clicked() {
self.renaming_layer = Some((layer_id, layer_name.clone()));
self.layer_control_clicked = true;
}
}
// Layer type (smaller text below name with colored background)
let type_text_pos = header_rect.min + egui::vec2(name_x_offset, 28.0);
@ -2106,50 +1972,35 @@ impl TimelinePane {
let Some(layer_for_controls) = any_layer_for_controls else { continue; };
// Layer controls: volume slider top-right, buttons below it
// Layer controls (mute, solo, lock, volume)
let controls_top = header_rect.min.y + 4.0;
let controls_right = header_rect.max.x - 8.0;
let button_size = egui::vec2(20.0, 20.0);
let slider_width = 60.0;
// Position controls from right to left
let volume_slider_rect = egui::Rect::from_min_size(
egui::pos2(controls_right - slider_width, header_rect.min.y + 4.0),
egui::pos2(controls_right - slider_width, controls_top),
egui::vec2(slider_width, 20.0),
);
// Buttons sit below the slider, right-aligned to match it
let buttons_top = volume_slider_rect.max.y + 4.0;
let lock_button_rect = egui::Rect::from_min_size(
egui::pos2(controls_right - button_size.x, buttons_top),
egui::pos2(volume_slider_rect.min.x - button_size.x - 4.0, controls_top),
button_size,
);
let solo_button_rect = egui::Rect::from_min_size(
egui::pos2(lock_button_rect.min.x - button_size.x - 4.0, buttons_top),
egui::pos2(lock_button_rect.min.x - button_size.x - 4.0, controls_top),
button_size,
);
let mute_button_rect = egui::Rect::from_min_size(
egui::pos2(solo_button_rect.min.x - button_size.x - 4.0, buttons_top),
egui::pos2(solo_button_rect.min.x - button_size.x - 4.0, controls_top),
button_size,
);
// Get layer ID and current property values from the layer we already have
// Check if there's a Volume automation lane; use it to drive the slider
let volume_auto_info = self.automation_cache.get(&layer_id)
.and_then(|lanes| lanes.iter().find(|l| l.name == "Volume"))
.map(|l| (l.node_id, l.keyframes.clone()));
// Classify the volume automation state
let (volume_auto_node_id, volume_auto_value, volume_is_automated) =
match &volume_auto_info {
None => (None, None, false),
Some((nid, kfs)) if kfs.len() == 1 && (kfs[0].time - 0.0).abs() < 0.001 => {
(Some(*nid), Some(kfs[0].value as f64), false)
}
Some((nid, _)) => (Some(*nid), None, true),
};
let current_volume = volume_auto_value.unwrap_or_else(|| layer_for_controls.volume());
let current_volume = layer_for_controls.volume();
let is_muted = layer_for_controls.muted();
let is_soloed = layer_for_controls.soloed();
let is_locked = layer_for_controls.locked();
@ -2255,9 +2106,7 @@ impl TimelinePane {
}
// Volume slider (nonlinear: 0-70% slider = 0-100% volume, 70-100% slider = 100-200% volume)
// Disabled when the user has edited the Volume automation curve beyond the default single keyframe
let volume_response = ui.scope_builder(egui::UiBuilder::new().max_rect(volume_slider_rect), |ui| {
ui.spacing_mut().slider_width = slider_width;
// Map volume (0.0-2.0) to slider position (0.0-1.0)
let slider_value = if current_volume <= 1.0 {
// 0.0-1.0 volume maps to 0.0-0.7 slider (70%)
@ -2267,11 +2116,11 @@ impl TimelinePane {
0.7 + (current_volume - 1.0) * 0.3
};
let mut temp_slider_value = slider_value as f32;
let mut temp_slider_value = slider_value;
let slider = egui::Slider::new(&mut temp_slider_value, 0.0..=1.0)
.show_value(false);
let response = ui.add_enabled(!volume_is_automated, slider);
let response = ui.add(slider);
(response, temp_slider_value)
}).inner;
@ -2279,7 +2128,7 @@ impl TimelinePane {
if volume_response.0.dragged() || volume_response.0.has_focus() {
self.layer_control_clicked = true;
}
if volume_response.0.changed() && !volume_is_automated {
if volume_response.0.changed() {
self.layer_control_clicked = true;
// Map slider position (0.0-1.0) back to volume (0.0-2.0)
let new_volume = if volume_response.1 <= 0.7 {
@ -2290,37 +2139,19 @@ impl TimelinePane {
1.0 + (volume_response.1 - 0.7) / 0.3
};
if let Some(node_id) = volume_auto_node_id {
// Route through automation: update the t=0 keyframe
self.pending_automation_actions.push(AutomationLaneAction::AddKeyframe {
layer_id,
node_id,
time: 0.0,
value: new_volume,
});
// Optimistic cache update so slider feels immediate
if let Some(lanes) = self.automation_cache.get_mut(&layer_id) {
if let Some(lane) = lanes.iter_mut().find(|l| l.node_id == node_id) {
if let Some(kf) = lane.keyframes.iter_mut().find(|k| k.time < 0.001) {
kf.value = new_volume;
}
}
}
} else {
pending_actions.push(Box::new(
lightningbeam_core::actions::SetLayerPropertiesAction::new(
layer_id,
lightningbeam_core::actions::LayerProperty::Volume(new_volume as f64),
lightningbeam_core::actions::LayerProperty::Volume(new_volume),
)
));
}
}
// Input gain slider for sampled audio layers (below volume slider)
if let lightningbeam_core::layer::AnyLayer::Audio(audio_layer) = layer_for_controls {
if audio_layer.audio_layer_type == lightningbeam_core::layer::AudioLayerType::Sampled {
let gain_slider_rect = egui::Rect::from_min_size(
egui::pos2(controls_right - slider_width, volume_slider_rect.max.y + 4.0),
egui::pos2(controls_right - slider_width, controls_top + 22.0),
egui::vec2(slider_width, 16.0),
);
let current_gain = audio_layer.layer.input_gain;
@ -2350,7 +2181,7 @@ impl TimelinePane {
// Label
let label_rect = egui::Rect::from_min_size(
egui::pos2(gain_slider_rect.min.x - 26.0, volume_slider_rect.max.y + 4.0),
egui::pos2(gain_slider_rect.min.x - 26.0, controls_top + 22.0),
egui::vec2(24.0, 16.0),
);
ui.painter().text(
@ -3213,15 +3044,14 @@ impl TimelinePane {
let clip_duration = effective_clip_duration(document, layer, clip_instance);
if let Some(clip_duration) = clip_duration {
// Calculate effective duration accounting for trimming.
// In Measures mode, uses beats fields so width tracks BPM during live drag.
let mut instance_duration = self.instance_display_duration(clip_instance, clip_duration, document.bpm);
// Calculate effective duration accounting for trimming
let mut instance_duration = clip_instance.total_duration(clip_duration);
// Instance positioned on the layer's timeline using timeline_start.
// In Measures mode, uses timeline_start_beats so clips stay at their beat
// position during live BPM drag preview.
// Instance positioned on the layer's timeline using timeline_start
// The layer itself has start_time, so the absolute timeline position is:
// layer.start_time + instance.timeline_start
let _layer_data = layer.layer();
let mut instance_start = self.instance_display_start(clip_instance, document.bpm);
let mut instance_start = clip_instance.effective_start();
// Apply drag offset preview for selected clips with snapping
let is_selected = selection.contains_clip_instance(&clip_instance.id);
@ -3242,13 +3072,12 @@ impl TimelinePane {
// Content origin: where the first "real" content iteration starts
// Loop iterations tile outward from this point
let mut content_origin = instance_start + clip_instance.loop_before.unwrap_or(0.0);
let mut content_origin = clip_instance.timeline_start;
// Track preview trim values for note/waveform rendering.
// In Measures mode, derive from beats so they track BPM during live drag.
let (base_trim_start, base_clip_duration) = self.content_display_range(clip_instance, clip_duration, document.bpm);
let mut preview_trim_start = base_trim_start;
let mut preview_clip_duration = base_clip_duration;
// Track preview trim values for waveform rendering
let mut preview_trim_start = clip_instance.trim_start;
let preview_trim_end_default = clip_instance.trim_end.unwrap_or(clip_duration);
let mut preview_clip_duration = (preview_trim_end_default - preview_trim_start).max(0.0);
if let Some(drag_type) = self.clip_drag_state {
if is_selected || is_linked_to_dragged {
@ -3503,11 +3332,6 @@ impl TimelinePane {
let iter_duration = iter_end - iter_start;
if iter_duration <= 0.0 { continue; }
let note_bpm = if self.time_display_format == lightningbeam_core::document::TimelineMode::Measures {
Some(document.bpm)
} else {
None
};
Self::render_midi_piano_roll(
&painter,
clip_rect,
@ -3521,15 +3345,9 @@ impl TimelinePane {
theme,
ui.ctx(),
si != 0, // fade non-content iterations
note_bpm,
);
}
} else {
let note_bpm = if self.time_display_format == lightningbeam_core::document::TimelineMode::Measures {
Some(document.bpm)
} else {
None
};
Self::render_midi_piano_roll(
&painter,
clip_rect,
@ -3543,7 +3361,6 @@ impl TimelinePane {
theme,
ui.ctx(),
false,
note_bpm,
);
}
}
@ -5168,21 +4985,7 @@ impl PaneRenderer for TimelinePane {
.range(20.0..=300.0)
.speed(0.5)
.fixed_decimals(1));
// Capture start BPM on drag/focus start
if bpm_response.gained_focus() || bpm_response.drag_started() {
if self.bpm_drag_start.is_none() {
self.bpm_drag_start = Some(bpm);
}
}
if bpm_response.changed() {
// Fallback capture: if gained_focus/drag_started didn't fire (e.g. rapid input),
// capture start BPM on the first change before updating the document.
if self.bpm_drag_start.is_none() {
self.bpm_drag_start = Some(bpm);
}
// Live preview: update document directly so grid reflows immediately
shared.action_executor.document_mut().bpm = bpm_val;
if let Some(controller_arc) = shared.audio_controller {
let mut controller = controller_arc.lock().unwrap();
@ -5190,31 +4993,6 @@ impl PaneRenderer for TimelinePane {
}
}
// On commit, dispatch a single ChangeBpmAction (single undo entry)
if bpm_response.drag_stopped() || bpm_response.lost_focus() {
if let Some(start_bpm) = self.bpm_drag_start.take() {
let new_bpm = shared.action_executor.document().bpm;
if (start_bpm - new_bpm).abs() > 1e-6
&& self.time_display_format == lightningbeam_core::document::TimelineMode::Measures
{
use lightningbeam_core::actions::ChangeBpmAction;
// Revert the live-preview mutation so the action owns it
shared.action_executor.document_mut().bpm = start_bpm;
let action = ChangeBpmAction::new(
start_bpm,
new_bpm,
shared.action_executor.document(),
shared.midi_event_cache,
);
// Immediately update midi_event_cache for rendering
for (clip_id, events) in action.new_midi_events() {
shared.midi_event_cache.insert(clip_id, events.clone());
}
shared.pending_actions.push(Box::new(action));
}
}
}
ui.separator();
// Time signature selector
@ -5383,23 +5161,19 @@ impl PaneRenderer for TimelinePane {
// Optimistic cache update
if let Some(lanes) = self.automation_cache.get_mut(&layer_id) {
if let Some(lane) = lanes.iter_mut().find(|l| l.node_id == node_id) {
// Replace existing keyframe at same time, or insert new one
if let Some(existing) = lane.keyframes.iter_mut().find(|k| (k.time - time).abs() < 0.001) {
existing.value = value;
} else {
lane.keyframes.push(crate::curve_editor::CurvePoint {
let new_kf = crate::curve_editor::CurvePoint {
time,
value,
interpolation: crate::curve_editor::CurveInterpolation::Linear,
ease_out: (0.0, 0.0),
ease_in: (0.0, 0.0),
});
};
lane.keyframes.push(new_kf);
lane.keyframes.sort_by(|a, b| a.time.partial_cmp(&b.time).unwrap_or(std::cmp::Ordering::Equal));
}
}
}
}
}
AutomationLaneAction::MoveKeyframe { layer_id, node_id, old_time, new_time, new_value, interpolation, ease_out, ease_in } => {
if let Some(&track_id) = shared.layer_to_track_map.get(&layer_id) {
controller.automation_remove_keyframe(track_id, node_id, old_time);

165
scripts/add_output_chain.py
View File

@ -1,165 +0,0 @@
#!/usr/bin/env python3
"""
Transform all instrument preset JSON files to add a Compressor → Pan → Gain
output chain, plus Volume and Pan AutomationInput nodes wired via CV.
Only modifies presets that have a MidiInput node (i.e., MIDI instrument presets).
"""
import json
import sys
from pathlib import Path
def transform_preset(data: dict) -> dict | None:
"""Transform a preset. Returns modified dict or None if no change needed."""
nodes = data.get("nodes", [])
connections = data.get("connections", [])
# Only modify presets with a MidiInput node
if not any(n["node_type"] == "MidiInput" for n in nodes):
return None
# Skip if already transformed (has a Compressor node)
if any(n["node_type"] == "Compressor" for n in nodes):
print(" Already transformed, skipping.")
return None
output_node_id = data.get("output_node")
if output_node_id is None:
print(" No output_node, skipping.")
return None
# Find the connection going into the output node
incoming = [c for c in connections if c["to_node"] == output_node_id]
if len(incoming) != 1:
print(f" Expected 1 incoming connection to output_node, found {len(incoming)}, skipping.")
return None
conn = incoming[0]
source_node = conn["from_node"]
source_port = conn["from_port"]
# Get AudioOutput node position — new chain starts where it was
output_node_data = next((n for n in nodes if n["id"] == output_node_id), None)
out_pos = output_node_data.get("position", [700.0, 150.0]) if output_node_data else [700.0, 150.0]
if isinstance(out_pos, list):
ox, oy = float(out_pos[0]), float(out_pos[1])
else:
ox, oy = 700.0, 150.0
step = 230.0 # horizontal spacing between nodes
# Compute new node IDs
max_id = max(n["id"] for n in nodes)
comp_id = max_id + 1 # Compressor
pan_id = max_id + 2 # Pan
gain_id = max_id + 3 # Gain (volume)
vol_id = max_id + 4 # Volume AutomationInput
pan_auto_id = max_id + 5 # Pan AutomationInput
# Move the AudioOutput node to the right of the new chain
if output_node_data is not None:
output_node_data["position"] = [ox + step * 3, oy]
# Remove the existing connection to output
connections = [c for c in connections if not (c["to_node"] == output_node_id and c["from_node"] == source_node)]
# New nodes — Compressor starts where AudioOutput was
new_nodes = [
{
"id": comp_id,
"node_type": "Compressor",
"parameters": {"0": -18.0, "1": 4.0, "2": 5.0, "3": 50.0, "4": 3.0, "5": 3.0},
"position": [ox, oy]
},
{
"id": pan_id,
"node_type": "Pan",
"parameters": {"0": 0.0},
"position": [ox + step, oy]
},
{
"id": gain_id,
"node_type": "Gain",
"parameters": {"0": 1.0},
"position": [ox + step * 2, oy]
},
{
"id": vol_id,
"node_type": "AutomationInput",
"parameters": {"0": 0.0, "1": 2.0},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [0.58, 1.0],
"ease_in": [0.42, 0.0]
}
],
"position": [ox + step, oy + 230.0]
},
{
"id": pan_auto_id,
"node_type": "AutomationInput",
"parameters": {"0": -1.0, "1": 1.0},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [0.58, 1.0],
"ease_in": [0.42, 0.0]
}
],
"position": [ox, oy + 230.0]
},
]
# New connections
new_connections = [
{"from_node": source_node, "from_port": source_port, "to_node": comp_id, "to_port": 0},
{"from_node": comp_id, "from_port": 0, "to_node": pan_id, "to_port": 0},
{"from_node": pan_id, "from_port": 0, "to_node": gain_id, "to_port": 0},
{"from_node": gain_id, "from_port": 0, "to_node": output_node_id, "to_port": 0},
{"from_node": vol_id, "from_port": 0, "to_node": gain_id, "to_port": 1},
{"from_node": pan_auto_id, "from_port": 0, "to_node": pan_id, "to_port": 1},
]
data["nodes"] = nodes + new_nodes
data["connections"] = connections + new_connections
return data
def main():
instruments_dir = Path(__file__).parent.parent / "src" / "assets" / "instruments"
if not instruments_dir.exists():
print(f"Instruments directory not found: {instruments_dir}", file=sys.stderr)
sys.exit(1)
json_files = sorted(instruments_dir.rglob("*.json"))
print(f"Found {len(json_files)} preset files")
modified = 0
for path in json_files:
print(f"Processing: {path.relative_to(instruments_dir)}")
with open(path) as f:
data = json.load(f)
result = transform_preset(data)
if result is not None:
with open(path, "w") as f:
json.dump(result, f, indent=2)
print(f" -> Modified")
modified += 1
else:
print(f" -> Skipped")
print(f"\nDone. Modified {modified}/{len(json_files)} presets.")
if __name__ == "__main__":
main()

124
src/assets/instruments/brass/brass-combined/brass-combined.json
View File

@ -735,104 +735,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -845,38 +751,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/brass/horn-section/horn-section.json
View File

@ -286,104 +286,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -396,38 +302,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/brass/trombone-section/trombone-section.json
View File

@ -213,104 +213,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -323,38 +229,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/brass/trumpet-section/trumpet-section.json
View File

@ -258,104 +258,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -368,38 +274,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/brass/tuba/tuba.json
View File

@ -131,104 +131,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -241,38 +147,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/drums/drum-kit/drum-kit.json
View File

@ -323,104 +323,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -433,38 +339,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/guitar/acoustic-guitar/acoustic-guitar.json
View File

@ -1099,104 +1099,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -1209,38 +1115,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/guitar/bass-guitar/bass-guitar.json
View File

@ -498,104 +498,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -608,38 +514,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

352
src/assets/instruments/guitar/electric-guitar/electric-guitar.json
View File

@ -4,16 +4,9 @@
"description": "Synthesized electric guitar with exponential pluck envelope through a tube amp sim",
"author": "Lightningbeam",
"version": 2,
"tags": [
"guitar",
"electric",
"amp",
"pluck"
]
"tags": ["guitar", "electric", "amp", "pluck"]
},
"midi_targets": [
0
],
"midi_targets": [0],
"output_node": 4,
"nodes": [
{
@ -21,10 +14,7 @@
"node_type": "MidiInput",
"name": "MIDI In",
"parameters": {},
"position": [
100.0,
150.0
]
"position": [100.0, 150.0]
},
{
"id": 1,
@ -33,10 +23,7 @@
"parameters": {
"0": 6.0
},
"position": [
400.0,
150.0
],
"position": [400.0, 150.0],
"template_graph": {
"metadata": {
"name": "Voice Template",
@ -45,9 +32,7 @@
"version": 3,
"tags": []
},
"midi_targets": [
0
],
"midi_targets": [0],
"output_node": 11,
"nodes": [
{
@ -55,20 +40,14 @@
"node_type": "TemplateInput",
"name": "Template Input",
"parameters": {},
"position": [
-200.0,
0.0
]
"position": [-200.0, 0.0]
},
{
"id": 1,
"node_type": "MidiToCV",
"name": "MIDI\u2192CV",
"name": "MIDI→CV",
"parameters": {},
"position": [
100.0,
0.0
]
"position": [100.0, 0.0]
},
{
"id": 2,
@ -77,10 +56,7 @@
"parameters": {
"0": 1.0
},
"position": [
100.0,
350.0
]
"position": [100.0, 350.0]
},
{
"id": 3,
@ -89,10 +65,7 @@
"parameters": {
"0": 1.0
},
"position": [
300.0,
300.0
]
"position": [300.0, 300.0]
},
{
"id": 4,
@ -103,10 +76,7 @@
"1": 0.4,
"2": 3.0
},
"position": [
500.0,
-200.0
]
"position": [500.0, -200.0]
},
{
"id": 5,
@ -117,10 +87,7 @@
"1": 0.18,
"2": 1.0
},
"position": [
500.0,
0.0
]
"position": [500.0, 0.0]
},
{
"id": 6,
@ -131,10 +98,7 @@
"1": 0.35,
"2": 0.0
},
"position": [
500.0,
200.0
]
"position": [500.0, 200.0]
},
{
"id": 7,
@ -145,10 +109,7 @@
"1": 1.0,
"2": 1.0
},
"position": [
800.0,
0.0
]
"position": [800.0, 0.0]
},
{
"id": 8,
@ -161,10 +122,7 @@
"3": 0.3,
"4": 1.0
},
"position": [
500.0,
450.0
]
"position": [500.0, 450.0]
},
{
"id": 9,
@ -173,10 +131,7 @@
"parameters": {
"0": 1.0
},
"position": [
1100.0,
0.0
]
"position": [1100.0, 0.0]
},
{
"id": 10,
@ -185,107 +140,31 @@
"parameters": {
"0": 1.4
},
"position": [
1100.0,
200.0
]
"position": [1100.0, 200.0]
},
{
"id": 11,
"node_type": "TemplateOutput",
"name": "Template Output",
"parameters": {},
"position": [
1400.0,
0.0
]
"position": [1400.0, 0.0]
}
],
"connections": [
{
"from_node": 0,
"from_port": 0,
"to_node": 1,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 2,
"from_port": 0,
"to_node": 3,
"to_port": 1
},
{
"from_node": 3,
"from_port": 0,
"to_node": 6,
"to_port": 0
},
{
"from_node": 1,
"from_port": 1,
"to_node": 8,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 7,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 7,
"to_port": 1
},
{
"from_node": 6,
"from_port": 0,
"to_node": 7,
"to_port": 2
},
{
"from_node": 7,
"from_port": 0,
"to_node": 9,
"to_port": 0
},
{
"from_node": 8,
"from_port": 0,
"to_node": 9,
"to_port": 1
},
{
"from_node": 9,
"from_port": 0,
"to_node": 10,
"to_port": 0
},
{
"from_node": 10,
"from_port": 0,
"to_node": 11,
"to_port": 0
}
{ "from_node": 0, "from_port": 0, "to_node": 1, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 4, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 5, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 3, "to_port": 0 },
{ "from_node": 2, "from_port": 0, "to_node": 3, "to_port": 1 },
{ "from_node": 3, "from_port": 0, "to_node": 6, "to_port": 0 },
{ "from_node": 1, "from_port": 1, "to_node": 8, "to_port": 0 },
{ "from_node": 4, "from_port": 0, "to_node": 7, "to_port": 0 },
{ "from_node": 5, "from_port": 0, "to_node": 7, "to_port": 1 },
{ "from_node": 6, "from_port": 0, "to_node": 7, "to_port": 2 },
{ "from_node": 7, "from_port": 0, "to_node": 9, "to_port": 0 },
{ "from_node": 8, "from_port": 0, "to_node": 9, "to_port": 1 },
{ "from_node": 9, "from_port": 0, "to_node": 10, "to_port": 0 },
{ "from_node": 10, "from_port": 0, "to_node": 11, "to_port": 0 }
]
}
},
@ -294,10 +173,7 @@
"node_type": "AmpSim",
"name": "Tube Amp",
"parameters": {},
"position": [
700.0,
150.0
],
"position": [700.0, 150.0],
"nam_model_path": "bundled:BossSD1"
},
{
@ -309,170 +185,20 @@
"1": 0.4,
"2": 0.5
},
"position": [
1000.0,
150.0
]
"position": [1000.0, 150.0]
},
{
"id": 4,
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1990.0,
150.0
]
},
{
"id": 5,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
1300.0,
150.0
]
},
{
"id": 6,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
1530.0,
150.0
]
},
{
"id": 7,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1760.0,
150.0
]
},
{
"id": 8,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
1530.0,
380.0
]
},
{
"id": 9,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
1300.0,
380.0
]
"position": [1300.0, 150.0]
}
],
"connections": [
{
"from_node": 0,
"from_port": 0,
"to_node": 1,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 2,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 6,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 7,
"to_port": 0
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 8,
"from_port": 0,
"to_node": 7,
"to_port": 1
},
{
"from_node": 9,
"from_port": 0,
"to_node": 6,
"to_port": 1
}
{ "from_node": 0, "from_port": 0, "to_node": 1, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 2, "to_port": 0 },
{ "from_node": 2, "from_port": 0, "to_node": 3, "to_port": 0 },
{ "from_node": 3, "from_port": 0, "to_node": 4, "to_port": 0 }
]
}

406
src/assets/instruments/keyboards/organ.json
View File

@ -4,15 +4,9 @@
"description": "Classic drawbar organ with vibrato and reverb (polyphonic)",
"author": "Lightningbeam",
"version": 1,
"tags": [
"organ",
"keyboard",
"drawbar"
]
"tags": ["organ", "keyboard", "drawbar"]
},
"midi_targets": [
0
],
"midi_targets": [0],
"output_node": 4,
"nodes": [
{
@ -20,10 +14,7 @@
"node_type": "MidiInput",
"name": "MIDI In",
"parameters": {},
"position": [
100.0,
200.0
]
"position": [100.0, 200.0]
},
{
"id": 1,
@ -32,10 +23,7 @@
"parameters": {
"0": 8.0
},
"position": [
400.0,
200.0
],
"position": [400.0, 200.0],
"template_graph": {
"metadata": {
"name": "Voice Template",
@ -44,9 +32,7 @@
"version": 1,
"tags": []
},
"midi_targets": [
0
],
"midi_targets": [0],
"output_node": 15,
"nodes": [
{
@ -54,20 +40,14 @@
"node_type": "TemplateInput",
"name": "Template Input",
"parameters": {},
"position": [
-200.0,
0.0
]
"position": [-200.0, 0.0]
},
{
"id": 1,
"node_type": "MidiToCV",
"name": "MIDI\u2192CV",
"name": "MIDI→CV",
"parameters": {},
"position": [
100.0,
0.0
]
"position": [100.0, 0.0]
},
{
"id": 2,
@ -76,10 +56,7 @@
"parameters": {
"0": -1.0
},
"position": [
250.0,
-300.0
]
"position": [250.0, -300.0]
},
{
"id": 3,
@ -88,10 +65,7 @@
"parameters": {
"0": 1.0
},
"position": [
250.0,
200.0
]
"position": [250.0, 200.0]
},
{
"id": 4,
@ -102,10 +76,7 @@
"1": 0.8,
"2": 0.0
},
"position": [
700.0,
-300.0
]
"position": [700.0, -300.0]
},
{
"id": 5,
@ -116,10 +87,7 @@
"1": 0.65,
"2": 0.0
},
"position": [
700.0,
-100.0
]
"position": [700.0, -100.0]
},
{
"id": 6,
@ -128,10 +96,7 @@
"parameters": {
"0": 0.0
},
"position": [
450.0,
-300.0
]
"position": [450.0, -300.0]
},
{
"id": 7,
@ -140,10 +105,7 @@
"parameters": {
"0": 0.0
},
"position": [
450.0,
200.0
]
"position": [450.0, 200.0]
},
{
"id": 8,
@ -154,10 +116,7 @@
"1": 0.4,
"2": 0.0
},
"position": [
700.0,
100.0
]
"position": [700.0, 100.0]
},
{
"id": 9,
@ -166,10 +125,7 @@
"parameters": {
"0": 1.585
},
"position": [
250.0,
400.0
]
"position": [250.0, 400.0]
},
{
"id": 10,
@ -178,10 +134,7 @@
"parameters": {
"0": 0.0
},
"position": [
450.0,
400.0
]
"position": [450.0, 400.0]
},
{
"id": 11,
@ -192,10 +145,7 @@
"1": 0.3,
"2": 0.0
},
"position": [
700.0,
300.0
]
"position": [700.0, 300.0]
},
{
"id": 12,
@ -207,10 +157,7 @@
"2": 0.9,
"3": 0.08
},
"position": [
700.0,
500.0
]
"position": [700.0, 500.0]
},
{
"id": 13,
@ -222,10 +169,7 @@
"2": 0.6,
"3": 0.4
},
"position": [
1000.0,
0.0
]
"position": [1000.0, 0.0]
},
{
"id": 14,
@ -234,137 +178,36 @@
"parameters": {
"0": 1.0
},
"position": [
1250.0,
0.0
]
"position": [1250.0, 0.0]
},
{
"id": 15,
"node_type": "TemplateOutput",
"name": "Template Output",
"parameters": {},
"position": [
1500.0,
0.0
]
"position": [1500.0, 0.0]
}
],
"connections": [
{
"from_node": 0,
"from_port": 0,
"to_node": 1,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 6,
"to_port": 0
},
{
"from_node": 2,
"from_port": 0,
"to_node": 6,
"to_port": 1
},
{
"from_node": 6,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 7,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 7,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 8,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 10,
"to_port": 0
},
{
"from_node": 9,
"from_port": 0,
"to_node": 10,
"to_port": 1
},
{
"from_node": 10,
"from_port": 0,
"to_node": 11,
"to_port": 0
},
{
"from_node": 1,
"from_port": 1,
"to_node": 12,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 13,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 13,
"to_port": 1
},
{
"from_node": 8,
"from_port": 0,
"to_node": 13,
"to_port": 2
},
{
"from_node": 11,
"from_port": 0,
"to_node": 13,
"to_port": 3
},
{
"from_node": 13,
"from_port": 0,
"to_node": 14,
"to_port": 0
},
{
"from_node": 12,
"from_port": 0,
"to_node": 14,
"to_port": 1
},
{
"from_node": 14,
"from_port": 0,
"to_node": 15,
"to_port": 0
}
{ "from_node": 0, "from_port": 0, "to_node": 1, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 5, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 6, "to_port": 0 },
{ "from_node": 2, "from_port": 0, "to_node": 6, "to_port": 1 },
{ "from_node": 6, "from_port": 0, "to_node": 4, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 7, "to_port": 0 },
{ "from_node": 3, "from_port": 0, "to_node": 7, "to_port": 1 },
{ "from_node": 7, "from_port": 0, "to_node": 8, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 10, "to_port": 0 },
{ "from_node": 9, "from_port": 0, "to_node": 10, "to_port": 1 },
{ "from_node": 10, "from_port": 0, "to_node": 11, "to_port": 0 },
{ "from_node": 1, "from_port": 1, "to_node": 12, "to_port": 0 },
{ "from_node": 4, "from_port": 0, "to_node": 13, "to_port": 0 },
{ "from_node": 5, "from_port": 0, "to_node": 13, "to_port": 1 },
{ "from_node": 8, "from_port": 0, "to_node": 13, "to_port": 2 },
{ "from_node": 11, "from_port": 0, "to_node": 13, "to_port": 3 },
{ "from_node": 13, "from_port": 0, "to_node": 14, "to_port": 0 },
{ "from_node": 12, "from_port": 0, "to_node": 14, "to_port": 1 },
{ "from_node": 14, "from_port": 0, "to_node": 15, "to_port": 0 }
]
}
},
@ -376,10 +219,7 @@
"0": 6.0,
"1": 0.15
},
"position": [
700.0,
200.0
]
"position": [700.0, 200.0]
},
{
"id": 3,
@ -390,170 +230,20 @@
"1": 0.5,
"2": 0.3
},
"position": [
1000.0,
200.0
]
"position": [1000.0, 200.0]
},
{
"id": 4,
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1990.0,
200.0
]
},
{
"id": 5,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
1300.0,
200.0
]
},
{
"id": 6,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
1530.0,
200.0
]
},
{
"id": 7,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1760.0,
200.0
]
},
{
"id": 8,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
1530.0,
430.0
]
},
{
"id": 9,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
1300.0,
430.0
]
"position": [1300.0, 200.0]
}
],
"connections": [
{
"from_node": 0,
"from_port": 0,
"to_node": 1,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 2,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 6,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 7,
"to_port": 0
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 8,
"from_port": 0,
"to_node": 7,
"to_port": 1
},
{
"from_node": 9,
"from_port": 0,
"to_node": 6,
"to_port": 1
}
{ "from_node": 0, "from_port": 0, "to_node": 1, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 2, "to_port": 0 },
{ "from_node": 2, "from_port": 0, "to_node": 3, "to_port": 0 },
{ "from_node": 3, "from_port": 0, "to_node": 4, "to_port": 0 }
]
}

289
src/assets/instruments/keyboards/piano/piano.json
View File

@ -4,15 +4,9 @@
"description": "Acoustic grand piano with multi-octave sampling",
"author": "Lightningbeam",
"version": 1,
"tags": [
"piano",
"keyboard",
"acoustic"
]
"tags": ["piano", "keyboard", "acoustic"]
},
"midi_targets": [
0
],
"midi_targets": [0],
"output_node": 2,
"nodes": [
{
@ -20,10 +14,7 @@
"node_type": "MidiInput",
"name": "MIDI In",
"parameters": {},
"position": [
100.0,
100.0
]
"position": [100.0, 100.0]
},
{
"id": 1,
@ -38,272 +29,34 @@
"sample_data": {
"type": "multi_sampler",
"layers": [
{
"file_path": "samples/C1.mp3",
"key_min": 0,
"key_max": 28,
"root_key": 24,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/A1.mp3",
"key_min": 29,
"key_max": 34,
"root_key": 33,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/C2.mp3",
"key_min": 35,
"key_max": 40,
"root_key": 36,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/A2.mp3",
"key_min": 41,
"key_max": 46,
"root_key": 45,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/C3.mp3",
"key_min": 47,
"key_max": 52,
"root_key": 48,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/A3.mp3",
"key_min": 53,
"key_max": 58,
"root_key": 57,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/C4.mp3",
"key_min": 59,
"key_max": 64,
"root_key": 60,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/A4.mp3",
"key_min": 65,
"key_max": 70,
"root_key": 69,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/C5.mp3",
"key_min": 71,
"key_max": 76,
"root_key": 72,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/A5.mp3",
"key_min": 77,
"key_max": 82,
"root_key": 81,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/C6.mp3",
"key_min": 83,
"key_max": 88,
"root_key": 84,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/A6.mp3",
"key_min": 89,
"key_max": 94,
"root_key": 93,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/C7.mp3",
"key_min": 95,
"key_max": 100,
"root_key": 96,
"velocity_min": 0,
"velocity_max": 127
},
{
"file_path": "samples/A7.mp3",
"key_min": 101,
"key_max": 127,
"root_key": 105,
"velocity_min": 0,
"velocity_max": 127
}
{ "file_path": "samples/C1.mp3", "key_min": 0, "key_max": 28, "root_key": 24, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/A1.mp3", "key_min": 29, "key_max": 34, "root_key": 33, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/C2.mp3", "key_min": 35, "key_max": 40, "root_key": 36, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/A2.mp3", "key_min": 41, "key_max": 46, "root_key": 45, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/C3.mp3", "key_min": 47, "key_max": 52, "root_key": 48, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/A3.mp3", "key_min": 53, "key_max": 58, "root_key": 57, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/C4.mp3", "key_min": 59, "key_max": 64, "root_key": 60, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/A4.mp3", "key_min": 65, "key_max": 70, "root_key": 69, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/C5.mp3", "key_min": 71, "key_max": 76, "root_key": 72, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/A5.mp3", "key_min": 77, "key_max": 82, "root_key": 81, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/C6.mp3", "key_min": 83, "key_max": 88, "root_key": 84, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/A6.mp3", "key_min": 89, "key_max": 94, "root_key": 93, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/C7.mp3", "key_min": 95, "key_max": 100, "root_key": 96, "velocity_min": 0, "velocity_max": 127 },
{ "file_path": "samples/A7.mp3", "key_min": 101, "key_max": 127, "root_key": 105, "velocity_min": 0, "velocity_max": 127 }
]
},
"position": [
350.0,
0.0
]
"position": [350.0, 0.0]
},
{
"id": 2,
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
"position": [700.0, 100.0]
}
],
"connections": [
{
"from_node": 0,
"from_port": 0,
"to_node": 1,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
{ "from_node": 0, "from_port": 0, "to_node": 1, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 2, "to_port": 0 }
]
}

124
src/assets/instruments/orchestral/timpani/timpani.json
View File

@ -162,104 +162,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -272,38 +178,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/strings/bass-section/bass-section.json
View File

@ -160,104 +160,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -270,38 +176,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/strings/cello-section/cello-section.json
View File

@ -159,104 +159,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -269,38 +175,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/strings/harp/harp.json
View File

@ -194,104 +194,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -304,38 +210,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/strings/strings-combined/strings-combined.json
View File

@ -528,104 +528,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -638,38 +544,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/strings/viola-section/viola-section.json
View File

@ -186,104 +186,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -296,38 +202,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/strings/violin-section/violin-section.json
View File

@ -177,104 +177,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -287,38 +193,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

253
src/assets/instruments/synthesizers/bass.json
View File

@ -4,15 +4,9 @@
"description": "Thick sub bass with sawtooth oscillator (polyphonic)",
"author": "Lightningbeam",
"version": 2,
"tags": [
"bass",
"sub",
"synth"
]
"tags": ["bass", "sub", "synth"]
},
"midi_targets": [
0
],
"midi_targets": [0],
"output_node": 2,
"nodes": [
{
@ -20,10 +14,7 @@
"node_type": "MidiInput",
"name": "MIDI In",
"parameters": {},
"position": [
100.0,
150.0
]
"position": [100.0, 150.0]
},
{
"id": 1,
@ -32,10 +23,7 @@
"parameters": {
"0": 8.0
},
"position": [
400.0,
150.0
],
"position": [400.0, 150.0],
"template_graph": {
"metadata": {
"name": "Voice Template",
@ -44,9 +32,7 @@
"version": 1,
"tags": []
},
"midi_targets": [
0
],
"midi_targets": [0],
"output_node": 6,
"nodes": [
{
@ -54,20 +40,14 @@
"node_type": "TemplateInput",
"name": "Template Input",
"parameters": {},
"position": [
-200.0,
0.0
]
"position": [-200.0, 0.0]
},
{
"id": 1,
"node_type": "MidiToCV",
"name": "MIDI\u2192CV",
"name": "MIDI→CV",
"parameters": {},
"position": [
100.0,
0.0
]
"position": [100.0, 0.0]
},
{
"id": 2,
@ -78,10 +58,7 @@
"1": 0.7,
"2": 1.0
},
"position": [
400.0,
-100.0
]
"position": [400.0, -100.0]
},
{
"id": 3,
@ -93,10 +70,7 @@
"2": 0.8,
"3": 0.3
},
"position": [
400.0,
200.0
]
"position": [400.0, 200.0]
},
{
"id": 4,
@ -105,10 +79,7 @@
"parameters": {
"0": 1.0
},
"position": [
700.0,
0.0
]
"position": [700.0, 0.0]
},
{
"id": 5,
@ -119,65 +90,24 @@
"1": 1.5,
"2": 0.0
},
"position": [
900.0,
0.0
]
"position": [900.0, 0.0]
},
{
"id": 6,
"node_type": "TemplateOutput",
"name": "Template Output",
"parameters": {},
"position": [
1100.0,
0.0
]
"position": [1100.0, 0.0]
}
],
"connections": [
{
"from_node": 0,
"from_port": 0,
"to_node": 1,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 1,
"from_port": 1,
"to_node": 3,
"to_port": 0
},
{
"from_node": 2,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 1
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 6,
"to_port": 0
}
{ "from_node": 0, "from_port": 0, "to_node": 1, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 2, "to_port": 0 },
{ "from_node": 1, "from_port": 1, "to_node": 3, "to_port": 0 },
{ "from_node": 2, "from_port": 0, "to_node": 4, "to_port": 0 },
{ "from_node": 3, "from_port": 0, "to_node": 4, "to_port": 1 },
{ "from_node": 4, "from_port": 0, "to_node": 5, "to_port": 0 },
{ "from_node": 5, "from_port": 0, "to_node": 6, "to_port": 0 }
]
}
},
@ -186,148 +116,11 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
150.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
150.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
150.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
150.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
380.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
380.0
]
"position": [700.0, 150.0]
}
],
"connections": [
{
"from_node": 0,
"from_port": 0,
"to_node": 1,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
{ "from_node": 0, "from_port": 0, "to_node": 1, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 2, "to_port": 0 }
]
}

265
src/assets/instruments/synthesizers/lead.json
View File

@ -4,15 +4,9 @@
"description": "Piercing lead synth with filter modulation (polyphonic)",
"author": "Lightningbeam",
"version": 2,
"tags": [
"lead",
"synth",
"solo"
]
"tags": ["lead", "synth", "solo"]
},
"midi_targets": [
0
],
"midi_targets": [0],
"output_node": 2,
"nodes": [
{
@ -20,10 +14,7 @@
"node_type": "MidiInput",
"name": "MIDI In",
"parameters": {},
"position": [
100.0,
150.0
]
"position": [100.0, 150.0]
},
{
"id": 1,
@ -32,10 +23,7 @@
"parameters": {
"0": 8.0
},
"position": [
400.0,
150.0
],
"position": [400.0, 150.0],
"template_graph": {
"metadata": {
"name": "Voice Template",
@ -44,9 +32,7 @@
"version": 1,
"tags": []
},
"midi_targets": [
0
],
"midi_targets": [0],
"output_node": 7,
"nodes": [
{
@ -54,20 +40,14 @@
"node_type": "TemplateInput",
"name": "Template Input",
"parameters": {},
"position": [
-200.0,
0.0
]
"position": [-200.0, 0.0]
},
{
"id": 1,
"node_type": "MidiToCV",
"name": "MIDI\u2192CV",
"name": "MIDI→CV",
"parameters": {},
"position": [
100.0,
0.0
]
"position": [100.0, 0.0]
},
{
"id": 2,
@ -78,10 +58,7 @@
"1": 0.6,
"2": 2.0
},
"position": [
400.0,
-100.0
]
"position": [400.0, -100.0]
},
{
"id": 3,
@ -93,10 +70,7 @@
"2": 0.0,
"3": 0.0
},
"position": [
400.0,
200.0
]
"position": [400.0, 200.0]
},
{
"id": 4,
@ -107,10 +81,7 @@
"1": 2.0,
"2": 0.0
},
"position": [
700.0,
-80.0
]
"position": [700.0, -80.0]
},
{
"id": 5,
@ -122,10 +93,7 @@
"2": 0.6,
"3": 0.2
},
"position": [
700.0,
200.0
]
"position": [700.0, 200.0]
},
{
"id": 6,
@ -134,71 +102,25 @@
"parameters": {
"0": 1.0
},
"position": [
1000.0,
50.0
]
"position": [1000.0, 50.0]
},
{
"id": 7,
"node_type": "TemplateOutput",
"name": "Template Output",
"parameters": {},
"position": [
1200.0,
50.0
]
"position": [1200.0, 50.0]
}
],
"connections": [
{
"from_node": 0,
"from_port": 0,
"to_node": 1,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 1,
"from_port": 1,
"to_node": 5,
"to_port": 0
},
{
"from_node": 2,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 1
},
{
"from_node": 4,
"from_port": 0,
"to_node": 6,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 6,
"to_port": 1
},
{
"from_node": 6,
"from_port": 0,
"to_node": 7,
"to_port": 0
}
{ "from_node": 0, "from_port": 0, "to_node": 1, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 2, "to_port": 0 },
{ "from_node": 1, "from_port": 1, "to_node": 5, "to_port": 0 },
{ "from_node": 2, "from_port": 0, "to_node": 4, "to_port": 0 },
{ "from_node": 3, "from_port": 0, "to_node": 4, "to_port": 1 },
{ "from_node": 4, "from_port": 0, "to_node": 6, "to_port": 0 },
{ "from_node": 5, "from_port": 0, "to_node": 6, "to_port": 1 },
{ "from_node": 6, "from_port": 0, "to_node": 7, "to_port": 0 }
]
}
},
@ -207,148 +129,11 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
150.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
150.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
150.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
150.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
380.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
380.0
]
"position": [700.0, 150.0]
}
],
"connections": [
{
"from_node": 0,
"from_port": 0,
"to_node": 1,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
{ "from_node": 0, "from_port": 0, "to_node": 1, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 2, "to_port": 0 }
]
}

308
src/assets/instruments/synthesizers/pad.json
View File

@ -4,15 +4,9 @@
"description": "Ambient pad with reverb and chorus (polyphonic)",
"author": "Lightningbeam",
"version": 2,
"tags": [
"pad",
"ambient",
"synth"
]
"tags": ["pad", "ambient", "synth"]
},
"midi_targets": [
0
],
"midi_targets": [0],
"output_node": 4,
"nodes": [
{
@ -20,10 +14,7 @@
"node_type": "MidiInput",
"name": "MIDI In",
"parameters": {},
"position": [
100.0,
150.0
]
"position": [100.0, 150.0]
},
{
"id": 1,
@ -32,10 +23,7 @@
"parameters": {
"0": 8.0
},
"position": [
400.0,
150.0
],
"position": [400.0, 150.0],
"template_graph": {
"metadata": {
"name": "Voice Template",
@ -44,9 +32,7 @@
"version": 1,
"tags": []
},
"midi_targets": [
0
],
"midi_targets": [0],
"output_node": 8,
"nodes": [
{
@ -54,20 +40,14 @@
"node_type": "TemplateInput",
"name": "Template Input",
"parameters": {},
"position": [
-200.0,
0.0
]
"position": [-200.0, 0.0]
},
{
"id": 1,
"node_type": "MidiToCV",
"name": "MIDI\u2192CV",
"name": "MIDI→CV",
"parameters": {},
"position": [
100.0,
0.0
]
"position": [100.0, 0.0]
},
{
"id": 2,
@ -78,10 +58,7 @@
"1": 0.4,
"2": 0.0
},
"position": [
400.0,
-100.0
]
"position": [400.0, -100.0]
},
{
"id": 3,
@ -92,10 +69,7 @@
"1": 0.4,
"2": 0.0
},
"position": [
400.0,
200.0
]
"position": [400.0, 200.0]
},
{
"id": 4,
@ -107,10 +81,7 @@
"2": 0.0,
"3": 0.0
},
"position": [
700.0,
50.0
]
"position": [700.0, 50.0]
},
{
"id": 5,
@ -121,10 +92,7 @@
"1": 0.707,
"2": 0.0
},
"position": [
900.0,
-50.0
]
"position": [900.0, -50.0]
},
{
"id": 6,
@ -136,10 +104,7 @@
"2": 0.7,
"3": 1.0
},
"position": [
900.0,
200.0
]
"position": [900.0, 200.0]
},
{
"id": 7,
@ -148,83 +113,27 @@
"parameters": {
"0": 1.0
},
"position": [
1100.0,
50.0
]
"position": [1100.0, 50.0]
},
{
"id": 8,
"node_type": "TemplateOutput",
"name": "Template Output",
"parameters": {},
"position": [
1300.0,
50.0
]
"position": [1300.0, 50.0]
}
],
"connections": [
{
"from_node": 0,
"from_port": 0,
"to_node": 1,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 1,
"from_port": 1,
"to_node": 6,
"to_port": 0
},
{
"from_node": 2,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 1
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 7,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 7,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 8,
"to_port": 0
}
{ "from_node": 0, "from_port": 0, "to_node": 1, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 2, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 3, "to_port": 0 },
{ "from_node": 1, "from_port": 1, "to_node": 6, "to_port": 0 },
{ "from_node": 2, "from_port": 0, "to_node": 4, "to_port": 0 },
{ "from_node": 3, "from_port": 0, "to_node": 4, "to_port": 1 },
{ "from_node": 4, "from_port": 0, "to_node": 5, "to_port": 0 },
{ "from_node": 5, "from_port": 0, "to_node": 7, "to_port": 0 },
{ "from_node": 6, "from_port": 0, "to_node": 7, "to_port": 1 },
{ "from_node": 7, "from_port": 0, "to_node": 8, "to_port": 0 }
]
}
},
@ -237,10 +146,7 @@
"1": 0.6,
"2": 0.4
},
"position": [
700.0,
150.0
]
"position": [700.0, 150.0]
},
{
"id": 3,
@ -251,170 +157,20 @@
"1": 0.5,
"2": 0.5
},
"position": [
1000.0,
150.0
]
"position": [1000.0, 150.0]
},
{
"id": 4,
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1990.0,
150.0
]
},
{
"id": 5,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
1300.0,
150.0
]
},
{
"id": 6,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
1530.0,
150.0
]
},
{
"id": 7,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1760.0,
150.0
]
},
{
"id": 8,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
1530.0,
380.0
]
},
{
"id": 9,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
1300.0,
380.0
]
"position": [1300.0, 150.0]
}
],
"connections": [
{
"from_node": 0,
"from_port": 0,
"to_node": 1,
"to_port": 0
},
{
"from_node": 1,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 2,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 6,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 7,
"to_port": 0
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 8,
"from_port": 0,
"to_node": 7,
"to_port": 1
},
{
"from_node": 9,
"from_port": 0,
"to_node": 6,
"to_port": 1
}
{ "from_node": 0, "from_port": 0, "to_node": 1, "to_port": 0 },
{ "from_node": 1, "from_port": 0, "to_node": 2, "to_port": 0 },
{ "from_node": 2, "from_port": 0, "to_node": 3, "to_port": 0 },
{ "from_node": 3, "from_port": 0, "to_node": 4, "to_port": 0 }
]
}

124
src/assets/instruments/woodwinds/bassoon/bassoon.json
View File

@ -168,104 +168,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -278,38 +184,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/woodwinds/clarinet/clarinet.json
View File

@ -150,104 +150,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -260,38 +166,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/woodwinds/flute/flute.json
View File

@ -141,104 +141,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -251,38 +157,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/woodwinds/oboe/oboe.json
View File

@ -132,104 +132,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -242,38 +148,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}

124
src/assets/instruments/woodwinds/woodwinds-combined/woodwinds-combined.json
View File

@ -438,104 +438,10 @@
"node_type": "AudioOutput",
"name": "Out",
"parameters": {},
"position": [
1390.0,
100.0
]
},
{
"id": 3,
"node_type": "Compressor",
"parameters": {
"0": -18.0,
"1": 4.0,
"2": 5.0,
"3": 50.0,
"4": 3.0,
"5": 3.0
},
"position": [
700.0,
100.0
]
},
{
"id": 4,
"node_type": "Pan",
"parameters": {
"0": 0.0
},
"position": [
930.0,
100.0
]
},
{
"id": 5,
"node_type": "Gain",
"parameters": {
"0": 1.0
},
"position": [
1160.0,
100.0
]
},
{
"id": 6,
"node_type": "AutomationInput",
"parameters": {
"0": 0.0,
"1": 2.0
},
"automation_display_name": "Volume",
"automation_keyframes": [
{
"time": 0.0,
"value": 1.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
930.0,
330.0
]
},
{
"id": 7,
"node_type": "AutomationInput",
"parameters": {
"0": -1.0,
"1": 1.0
},
"automation_display_name": "Pan",
"automation_keyframes": [
{
"time": 0.0,
"value": 0.0,
"interpolation": "linear",
"ease_out": [
0.58,
1.0
],
"ease_in": [
0.42,
0.0
]
}
],
"position": [
700.0,
330.0
]
}
],
"connections": [
@ -548,38 +454,8 @@
{
"from_node": 1,
"from_port": 0,
"to_node": 3,
"to_port": 0
},
{
"from_node": 3,
"from_port": 0,
"to_node": 4,
"to_port": 0
},
{
"from_node": 4,
"from_port": 0,
"to_node": 5,
"to_port": 0
},
{
"from_node": 5,
"from_port": 0,
"to_node": 2,
"to_port": 0
},
{
"from_node": 6,
"from_port": 0,
"to_node": 5,
"to_port": 1
},
{
"from_node": 7,
"from_port": 0,
"to_node": 4,
"to_port": 1
}
]
}