@devaloop/devalang 0.0.1-alpha.9 → 0.0.1-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.cargo/config.toml +2 -0
- package/.devalang +6 -1
- package/.github/workflows/ci.yml +103 -0
- package/Cargo.toml +81 -48
- package/README.md +137 -154
- package/docs/CHANGELOG.md +428 -1
- package/docs/CONTRIBUTING.md +101 -0
- package/docs/ROADMAP.md +14 -7
- package/docs/TODO.md +16 -15
- package/examples/automation.deva +42 -0
- package/examples/bank.deva +7 -0
- package/examples/bus.deva +10 -0
- package/examples/duration.deva +9 -0
- package/examples/effect.deva +2 -0
- package/examples/events.deva +12 -0
- package/examples/filter.deva +11 -0
- package/examples/function.deva +15 -0
- package/examples/index.deva +57 -12
- package/examples/lfo.deva +9 -0
- package/examples/loop.deva +5 -12
- package/examples/pattern.deva +8 -0
- package/examples/plugin.deva +16 -0
- package/examples/synth.deva +11 -1
- package/examples/synth_types.deva +17 -0
- package/examples/variables.deva +1 -1
- package/out-tsc/bin/index.d.ts +2 -0
- package/out-tsc/bin/index.js +51 -7
- package/out-tsc/core/functions/index.d.ts +42 -0
- package/out-tsc/core/functions/index.js +87 -0
- package/out-tsc/core/index.d.ts +6 -0
- package/out-tsc/core/index.js +22 -0
- package/out-tsc/core/types/index.d.ts +4 -0
- package/out-tsc/core/types/index.js +20 -0
- package/out-tsc/core/types/plugin.d.ts +18 -0
- package/out-tsc/core/types/plugin.js +2 -0
- package/out-tsc/core/types/result.d.ts +27 -0
- package/out-tsc/core/types/result.js +2 -0
- package/out-tsc/core/types/statement.d.ts +106 -0
- package/out-tsc/core/types/statement.js +2 -0
- package/out-tsc/core/types/value.d.ts +43 -0
- package/out-tsc/core/types/value.js +2 -0
- package/out-tsc/index.d.ts +7 -0
- package/out-tsc/index.js +42 -1
- package/out-tsc/pkg/devalang_core.d.ts +15 -0
- package/out-tsc/pkg/devalang_core.js +65 -0
- package/out-tsc/pkg/devalang_core_bg.wasm.d.ts +34 -0
- package/out-tsc/scripts/copy-wasm-dts.d.ts +1 -0
- package/out-tsc/scripts/copy-wasm-dts.js +73 -0
- package/out-tsc/scripts/postinstall.d.ts +1 -0
- package/out-tsc/scripts/postinstall.js +83 -0
- package/out-tsc/scripts/version/bump.d.ts +1 -0
- package/out-tsc/scripts/version/fetch.d.ts +1 -0
- package/out-tsc/scripts/version/index.d.ts +1 -0
- package/out-tsc/scripts/version/sync.d.ts +1 -0
- package/package.json +28 -7
- package/project-version.json +4 -4
- package/rust/cli/bank/api.rs +122 -0
- package/rust/cli/bank/commands.rs +306 -0
- package/rust/cli/bank/mod.rs +29 -0
- package/rust/cli/build/commands.rs +153 -0
- package/rust/cli/build/mod.rs +2 -0
- package/rust/cli/build/process.rs +165 -0
- package/rust/cli/check/mod.rs +208 -0
- package/rust/cli/discover/commands.rs +253 -0
- package/rust/cli/discover/config.rs +111 -0
- package/rust/cli/discover/fs.rs +19 -0
- package/rust/cli/discover/install.rs +103 -0
- package/rust/cli/discover/metadata.rs +48 -0
- package/rust/cli/discover/mod.rs +5 -0
- package/rust/cli/{init.rs → init/commands.rs} +32 -23
- package/rust/cli/init/mod.rs +1 -0
- package/rust/cli/install/addon.rs +118 -0
- package/rust/cli/install/bank.rs +72 -0
- package/rust/cli/install/commands.rs +35 -0
- package/rust/cli/install/mod.rs +4 -0
- package/rust/cli/install/plugin.rs +80 -0
- package/rust/cli/login/commands.rs +124 -0
- package/rust/cli/login/mod.rs +1 -0
- package/rust/cli/mod.rs +9 -202
- package/rust/cli/parser.rs +359 -0
- package/rust/cli/play/commands.rs +375 -0
- package/rust/cli/play/io.rs +17 -0
- package/rust/cli/play/mod.rs +5 -0
- package/rust/cli/play/process.rs +159 -0
- package/rust/cli/play/realtime.rs +91 -0
- package/rust/cli/play/utils.rs +23 -0
- package/rust/cli/telemetry/commands.rs +22 -0
- package/rust/cli/telemetry/event_creator.rs +80 -0
- package/rust/cli/telemetry/mod.rs +3 -0
- package/rust/cli/telemetry/send.rs +51 -0
- package/rust/cli/{template.rs → template/commands.rs} +17 -5
- package/rust/cli/template/mod.rs +1 -0
- package/rust/cli/update/commands.rs +6 -0
- package/rust/cli/update/mod.rs +1 -0
- package/rust/config/driver.rs +112 -0
- package/rust/config/mod.rs +3 -16
- package/rust/config/ops.rs +26 -0
- package/rust/config/settings.rs +101 -0
- package/rust/core/audio/engine/driver.rs +220 -0
- package/rust/core/audio/engine/export.rs +169 -0
- package/rust/core/audio/engine/helpers.rs +178 -0
- package/rust/core/audio/engine/mod.rs +56 -0
- package/rust/core/audio/engine/notes/dsp.rs +85 -0
- package/rust/core/audio/engine/notes/mod.rs +44 -0
- package/rust/core/audio/engine/notes/params.rs +294 -0
- package/rust/core/audio/engine/sample/insert.rs +199 -0
- package/rust/core/audio/engine/sample/mod.rs +40 -0
- package/rust/core/audio/engine/sample/padding.rs +170 -0
- package/rust/core/audio/evaluator/condition.rs +61 -0
- package/rust/core/audio/evaluator/mod.rs +9 -0
- package/rust/core/audio/evaluator/numeric.rs +152 -0
- package/rust/core/audio/evaluator/rhs.rs +16 -0
- package/rust/core/audio/evaluator/string_expr.rs +94 -0
- package/rust/core/audio/interpreter/driver.rs +574 -216
- package/rust/core/audio/interpreter/mod.rs +2 -12
- package/rust/core/audio/interpreter/statements/arrow_call/interprete.rs +175 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/chord.rs +384 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/mod.rs +2 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/note.rs +316 -0
- package/rust/core/audio/interpreter/statements/arrow_call/mod.rs +3 -0
- package/rust/core/audio/interpreter/statements/arrow_call/types/arp.rs +192 -0
- package/rust/core/audio/interpreter/statements/arrow_call/types/mod.rs +24 -0
- package/rust/core/audio/interpreter/statements/arrow_call/types/pad.rs +116 -0
- package/rust/core/audio/interpreter/statements/arrow_call/types/pluck.rs +97 -0
- package/rust/core/audio/interpreter/statements/arrow_call/types/sub.rs +100 -0
- package/rust/core/audio/interpreter/statements/automate.rs +16 -0
- package/rust/core/audio/interpreter/statements/call.rs +295 -0
- package/rust/core/audio/interpreter/{condition.rs → statements/condition.rs} +72 -69
- package/rust/core/audio/interpreter/statements/function.rs +24 -0
- package/rust/core/audio/interpreter/statements/let_.rs +36 -0
- package/rust/core/audio/interpreter/statements/load.rs +17 -0
- package/rust/core/audio/interpreter/statements/loop_.rs +115 -0
- package/rust/core/audio/interpreter/statements/mod.rs +12 -0
- package/rust/core/audio/interpreter/statements/sleep.rs +28 -0
- package/rust/core/audio/interpreter/statements/spawn.rs +253 -0
- package/rust/core/audio/interpreter/statements/tempo.rs +40 -0
- package/rust/core/audio/interpreter/statements/trigger.rs +239 -0
- package/rust/core/audio/loader/mod.rs +1 -1
- package/rust/core/audio/loader/trigger.rs +98 -52
- package/rust/core/audio/mod.rs +2 -2
- package/rust/core/audio/player.rs +28 -12
- package/rust/core/audio/special/easing.rs +189 -0
- package/rust/core/audio/special/env.rs +45 -0
- package/rust/core/audio/special/math.rs +134 -0
- package/rust/core/audio/special/mod.rs +9 -0
- package/rust/core/audio/special/modulator.rs +143 -0
- package/rust/core/builder/mod.rs +129 -80
- package/rust/core/debugger/lexer.rs +4 -4
- package/rust/core/debugger/logs.rs +52 -0
- package/rust/core/debugger/mod.rs +11 -2
- package/rust/core/debugger/preprocessor.rs +4 -4
- package/rust/core/debugger/store.rs +38 -25
- package/rust/core/error/mod.rs +221 -12
- package/rust/core/lexer/driver.rs +59 -0
- package/rust/core/lexer/handler/arrow.rs +62 -11
- package/rust/core/lexer/handler/at.rs +5 -5
- package/rust/core/lexer/handler/brace.rs +11 -11
- package/rust/core/lexer/handler/colon.rs +5 -5
- package/rust/core/lexer/handler/comment.rs +3 -3
- package/rust/core/lexer/handler/dot.rs +6 -6
- package/rust/core/lexer/handler/driver.rs +143 -32
- package/rust/core/lexer/handler/identifier.rs +11 -5
- package/rust/core/lexer/handler/indent.rs +18 -4
- package/rust/core/lexer/handler/mod.rs +6 -5
- package/rust/core/lexer/handler/newline.rs +3 -3
- package/rust/core/lexer/handler/number.rs +5 -5
- package/rust/core/lexer/handler/operator.rs +5 -3
- package/rust/core/lexer/handler/parenthesis.rs +41 -0
- package/rust/core/lexer/handler/slash.rs +21 -0
- package/rust/core/lexer/handler/string.rs +3 -3
- package/rust/core/lexer/mod.rs +1 -49
- package/rust/core/lexer/token.rs +17 -12
- package/rust/core/mod.rs +9 -10
- package/rust/core/parser/driver/block.rs +111 -0
- package/rust/core/parser/driver/cursor.rs +82 -0
- package/rust/core/parser/driver/driver_impl.rs +139 -0
- package/rust/core/parser/driver/mod.rs +6 -0
- package/rust/core/parser/driver/parse_array.rs +120 -0
- package/rust/core/parser/driver/parse_map.rs +223 -0
- package/rust/core/parser/driver/parser.rs +160 -0
- package/rust/core/parser/handler/arrow_call.rs +277 -126
- package/rust/core/parser/handler/at.rs +142 -25
- package/rust/core/parser/handler/bank.rs +83 -20
- package/rust/core/parser/handler/condition.rs +14 -5
- package/rust/core/parser/handler/dot.rs +111 -75
- package/rust/core/parser/handler/identifier/automate.rs +254 -0
- package/rust/core/parser/handler/identifier/call.rs +74 -24
- package/rust/core/parser/handler/identifier/emit.rs +70 -0
- package/rust/core/parser/handler/identifier/function.rs +113 -0
- package/rust/core/parser/handler/identifier/group.rs +28 -14
- package/rust/core/parser/handler/identifier/let_.rs +61 -21
- package/rust/core/parser/handler/identifier/mod.rs +24 -20
- package/rust/core/parser/handler/identifier/on.rs +107 -0
- package/rust/core/parser/handler/identifier/print.rs +49 -0
- package/rust/core/parser/handler/identifier/sleep.rs +77 -14
- package/rust/core/parser/handler/identifier/spawn.rs +81 -31
- package/rust/core/parser/handler/identifier/synth.rs +102 -32
- package/rust/core/parser/handler/loop_.rs +144 -22
- package/rust/core/parser/handler/mod.rs +6 -5
- package/rust/core/parser/handler/pattern.rs +74 -0
- package/rust/core/parser/handler/tempo.rs +67 -9
- package/rust/core/parser/mod.rs +3 -4
- package/rust/core/parser/statement.rs +6 -92
- package/rust/core/plugin/loader.rs +137 -0
- package/rust/core/plugin/mod.rs +2 -0
- package/rust/core/plugin/runner/mod.rs +11 -0
- package/rust/core/plugin/runner/non_wasm.rs +297 -0
- package/rust/core/plugin/runner/wasm32.rs +43 -0
- package/rust/core/preprocessor/loader/inject.rs +278 -0
- package/rust/core/preprocessor/loader/loader_helpers.rs +110 -0
- package/rust/core/preprocessor/loader/mod.rs +235 -0
- package/rust/core/preprocessor/mod.rs +4 -4
- package/rust/core/preprocessor/module.rs +55 -50
- package/rust/core/preprocessor/processor/handlers.rs +107 -0
- package/rust/core/preprocessor/processor/mod.rs +1 -0
- package/rust/core/preprocessor/resolver/bank.rs +14 -12
- package/rust/core/preprocessor/resolver/call.rs +106 -105
- package/rust/core/preprocessor/resolver/condition.rs +13 -10
- package/rust/core/preprocessor/resolver/driver.rs +145 -48
- package/rust/core/preprocessor/resolver/function.rs +69 -0
- package/rust/core/preprocessor/resolver/group.rs +122 -61
- package/rust/core/preprocessor/resolver/let_.rs +13 -12
- package/rust/core/preprocessor/resolver/loop_.rs +240 -13
- package/rust/core/preprocessor/resolver/mod.rs +8 -6
- package/rust/core/preprocessor/resolver/pattern.rs +83 -0
- package/rust/core/preprocessor/resolver/spawn.rs +83 -42
- package/rust/core/preprocessor/resolver/synth.rs +15 -11
- package/rust/core/preprocessor/resolver/tempo.rs +13 -14
- package/rust/core/preprocessor/resolver/trigger.rs +32 -28
- package/rust/core/preprocessor/resolver/value.rs +111 -13
- package/rust/core/store/global.rs +57 -39
- package/rust/core/store/mod.rs +0 -3
- package/rust/lib.rs +323 -117
- package/rust/main.rs +388 -65
- package/rust/types/Cargo.toml +11 -0
- package/rust/types/src/addons.rs +55 -0
- package/rust/types/src/ast.rs +202 -0
- package/rust/types/src/config.rs +84 -0
- package/rust/types/src/lib.rs +15 -0
- package/rust/types/src/plugin.rs +20 -0
- package/rust/types/src/store.rs +139 -0
- package/rust/types/src/telemetry.rs +85 -0
- package/rust/utils/Cargo.toml +26 -0
- package/rust/utils/src/error.rs +186 -0
- package/rust/utils/src/file.rs +94 -0
- package/rust/utils/src/first_usage.rs +97 -0
- package/rust/utils/{mod.rs → src/lib.rs} +6 -3
- package/rust/utils/{logger.rs → src/logger.rs} +94 -17
- package/rust/utils/src/path.rs +129 -0
- package/rust/utils/src/signature.rs +41 -0
- package/rust/utils/{spinner.rs → src/spinner.rs} +7 -8
- package/rust/utils/src/version.rs +27 -0
- package/rust/utils/{watcher.rs → src/watcher.rs} +17 -4
- package/rust/web/api.rs +5 -0
- package/rust/web/cdn.rs +34 -0
- package/rust/web/mod.rs +3 -0
- package/rust/web/sso.rs +5 -0
- package/templates/minimal/README.md +143 -127
- package/templates/welcome/README.md +143 -127
- package/templates/welcome/src/index.deva +56 -8
- package/templates/welcome/src/variables.deva +2 -4
- package/tests/integration.rs +21 -0
- package/tests/rust/cli_check_build.rs +21 -0
- package/tests/rust/cli_help.rs +12 -0
- package/tests/rust/cli_template_list.rs +10 -0
- package/tests/rust/cli_version.rs +11 -0
- package/tests/typescript/index.spec.ts +136 -0
- package/tests/typescript/playhead.spec.ts +36 -0
- package/tests/typescript/render_e2e.spec.ts +77 -0
- package/tsconfig.json +12 -10
- package/typescript/bin/index.ts +19 -5
- package/typescript/core/functions/index.ts +94 -0
- package/typescript/core/index.ts +6 -0
- package/typescript/core/types/index.ts +4 -0
- package/typescript/core/types/plugin.ts +19 -0
- package/typescript/core/types/result.ts +29 -0
- package/typescript/core/types/statement.ts +47 -0
- package/typescript/core/types/value.ts +29 -0
- package/typescript/index.ts +8 -1
- package/typescript/pkg/devalang_core.d.ts +4 -0
- package/typescript/pkg/devalang_core.ts +65 -0
- package/typescript/scripts/copy-wasm-dts.ts +41 -0
- package/typescript/scripts/postinstall.ts +85 -0
- package/typescript/scripts/version/bump.ts +0 -1
- package/typescript/scripts/version/index.ts +0 -1
- package/docs/COMMANDS.md +0 -85
- package/docs/CONFIG.md +0 -30
- package/docs/SYNTAX.md +0 -210
- package/out-tsc/bin/devalang.exe +0 -0
- package/out-tsc/scripts/postbuild.js +0 -11
- package/rust/cli/build.rs +0 -137
- package/rust/cli/check.rs +0 -117
- package/rust/cli/play.rs +0 -193
- package/rust/config/loader.rs +0 -13
- package/rust/core/audio/engine.rs +0 -203
- package/rust/core/audio/evaluator.rs +0 -31
- package/rust/core/audio/interpreter/arrow_call.rs +0 -129
- package/rust/core/audio/interpreter/call.rs +0 -64
- package/rust/core/audio/interpreter/let_.rs +0 -19
- package/rust/core/audio/interpreter/load.rs +0 -18
- package/rust/core/audio/interpreter/loop_.rs +0 -67
- package/rust/core/audio/interpreter/sleep.rs +0 -36
- package/rust/core/audio/interpreter/spawn.rs +0 -66
- package/rust/core/audio/interpreter/tempo.rs +0 -16
- package/rust/core/audio/interpreter/trigger.rs +0 -69
- package/rust/core/audio/renderer.rs +0 -54
- package/rust/core/parser/driver.rs +0 -331
- package/rust/core/preprocessor/loader.rs +0 -193
- package/rust/core/preprocessor/processor.rs +0 -76
- package/rust/core/shared/duration.rs +0 -8
- package/rust/core/shared/mod.rs +0 -2
- package/rust/core/shared/value.rs +0 -18
- package/rust/core/store/export.rs +0 -28
- package/rust/core/store/import.rs +0 -28
- package/rust/core/store/variable.rs +0 -28
- package/rust/core/utils/mod.rs +0 -2
- package/rust/core/utils/path.rs +0 -31
- package/rust/core/utils/validation.rs +0 -37
- package/rust/utils/file.rs +0 -35
- package/rust/utils/signature.rs +0 -17
- package/rust/utils/version.rs +0 -15
- package/typescript/scripts/postbuild.ts +0 -8
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
use crate::core::audio::engine::driver::MidiNoteEvent;
|
|
2
|
+
use std::fs::File;
|
|
3
|
+
|
|
4
|
+
pub fn generate_midi_file_impl(
|
|
5
|
+
midi_events: &Vec<MidiNoteEvent>,
|
|
6
|
+
output_path: &String,
|
|
7
|
+
bpm: Option<f32>,
|
|
8
|
+
tpqn: Option<u16>,
|
|
9
|
+
) -> Result<(), String> {
|
|
10
|
+
use midly::num::{u7, u15, u24};
|
|
11
|
+
use midly::{
|
|
12
|
+
Format, Header, MetaMessage, MidiMessage, Smf, Timing, TrackEvent, TrackEventKind,
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
if midi_events.is_empty() {
|
|
16
|
+
return Ok(());
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
let bpm = bpm.unwrap_or(120.0_f32);
|
|
20
|
+
let tpqn: u16 = tpqn.unwrap_or(480u16);
|
|
21
|
+
let header = Header {
|
|
22
|
+
format: Format::SingleTrack,
|
|
23
|
+
timing: Timing::Metrical(u15::from(tpqn)),
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
#[derive(Clone)]
|
|
27
|
+
struct AbsEvent {
|
|
28
|
+
tick: u64,
|
|
29
|
+
kind: TrackEventKind<'static>,
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
let mut abs_events: Vec<AbsEvent> = Vec::new();
|
|
33
|
+
let microsecs_per_quarter = (60_000_000.0 / bpm) as u32;
|
|
34
|
+
abs_events.push(AbsEvent {
|
|
35
|
+
tick: 0,
|
|
36
|
+
kind: TrackEventKind::Meta(MetaMessage::Tempo(u24::from(microsecs_per_quarter))),
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
for ev in midi_events {
|
|
40
|
+
let start_secs = (ev.start_ms as f32) / 1000.0;
|
|
41
|
+
let dur_secs = (ev.duration_ms as f32) / 1000.0;
|
|
42
|
+
let start_ticks_f = start_secs * (bpm / 60.0) * (tpqn as f32);
|
|
43
|
+
let dur_ticks_f = dur_secs * (bpm / 60.0) * (tpqn as f32);
|
|
44
|
+
let start_tick = start_ticks_f.max(0.0).round() as u64;
|
|
45
|
+
let off_tick = (start_ticks_f + dur_ticks_f).max(start_tick as f32).round() as u64;
|
|
46
|
+
|
|
47
|
+
let key = u7::from(ev.key.min(127));
|
|
48
|
+
let vel = u7::from(ev.vel.min(127));
|
|
49
|
+
|
|
50
|
+
abs_events.push(AbsEvent {
|
|
51
|
+
tick: start_tick,
|
|
52
|
+
kind: TrackEventKind::Midi {
|
|
53
|
+
channel: (ev.channel as u8).into(),
|
|
54
|
+
message: MidiMessage::NoteOn { key, vel },
|
|
55
|
+
},
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
abs_events.push(AbsEvent {
|
|
59
|
+
tick: off_tick,
|
|
60
|
+
kind: TrackEventKind::Midi {
|
|
61
|
+
channel: (ev.channel as u8).into(),
|
|
62
|
+
message: MidiMessage::NoteOff {
|
|
63
|
+
key,
|
|
64
|
+
vel: u7::from(0),
|
|
65
|
+
},
|
|
66
|
+
},
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
let max_tick = abs_events.iter().map(|e| e.tick).max().unwrap_or(0);
|
|
71
|
+
abs_events.push(AbsEvent {
|
|
72
|
+
tick: max_tick + 0,
|
|
73
|
+
kind: TrackEventKind::Meta(MetaMessage::EndOfTrack),
|
|
74
|
+
});
|
|
75
|
+
abs_events.sort_by_key(|e| e.tick);
|
|
76
|
+
|
|
77
|
+
let mut track: Vec<TrackEvent> = Vec::new();
|
|
78
|
+
let mut last_tick: u64 = 0;
|
|
79
|
+
for e in abs_events {
|
|
80
|
+
let delta = (e.tick - last_tick) as u32;
|
|
81
|
+
track.push(TrackEvent {
|
|
82
|
+
delta: delta.into(),
|
|
83
|
+
kind: e.kind,
|
|
84
|
+
});
|
|
85
|
+
last_tick = e.tick;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
let smf = Smf {
|
|
89
|
+
header,
|
|
90
|
+
tracks: vec![track],
|
|
91
|
+
};
|
|
92
|
+
|
|
93
|
+
if let Ok(mut file) = File::create(output_path) {
|
|
94
|
+
if let Err(e) = smf.write_std(&mut file) {
|
|
95
|
+
return Err(format!("Error writing MIDI file: {}", e));
|
|
96
|
+
}
|
|
97
|
+
} else {
|
|
98
|
+
return Err(format!("Cannot create MIDI file at {}", output_path));
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
Ok(())
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
pub fn generate_wav_file_impl(
|
|
105
|
+
buffer: &mut Vec<i16>,
|
|
106
|
+
output_dir: &String,
|
|
107
|
+
audio_format: Option<String>,
|
|
108
|
+
sample_rate: Option<u32>,
|
|
109
|
+
) -> Result<(), String> {
|
|
110
|
+
if buffer.len() % (crate::core::audio::engine::CHANNELS as usize) != 0 {
|
|
111
|
+
buffer.push(0);
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
let sr = sample_rate.unwrap_or(crate::core::audio::engine::SAMPLE_RATE);
|
|
115
|
+
let format_str = audio_format.unwrap_or_else(|| "Wav16".to_string());
|
|
116
|
+
let fmt_low = format_str.to_lowercase();
|
|
117
|
+
|
|
118
|
+
match fmt_low.as_str() {
|
|
119
|
+
"wav16" => {
|
|
120
|
+
let spec = hound::WavSpec {
|
|
121
|
+
channels: crate::core::audio::engine::CHANNELS,
|
|
122
|
+
sample_rate: sr,
|
|
123
|
+
bits_per_sample: 16,
|
|
124
|
+
sample_format: hound::SampleFormat::Int,
|
|
125
|
+
};
|
|
126
|
+
|
|
127
|
+
let mut writer = hound::WavWriter::create(output_dir, spec)
|
|
128
|
+
.map_err(|e| format!("Error creating WAV file: {}", e))?;
|
|
129
|
+
|
|
130
|
+
for sample in buffer.iter() {
|
|
131
|
+
writer
|
|
132
|
+
.write_sample(*sample)
|
|
133
|
+
.map_err(|e| format!("Error writing sample: {:?}", e))?;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
writer
|
|
137
|
+
.finalize()
|
|
138
|
+
.map_err(|e| format!("Error finalizing WAV: {:?}", e))?;
|
|
139
|
+
}
|
|
140
|
+
"wav24" | "wav32" => {
|
|
141
|
+
let bits = if fmt_low.contains("24") { 24 } else { 32 };
|
|
142
|
+
let spec = hound::WavSpec {
|
|
143
|
+
channels: crate::core::audio::engine::CHANNELS,
|
|
144
|
+
sample_rate: sr,
|
|
145
|
+
bits_per_sample: bits,
|
|
146
|
+
sample_format: hound::SampleFormat::Int,
|
|
147
|
+
};
|
|
148
|
+
|
|
149
|
+
let mut writer = hound::WavWriter::create(output_dir, spec)
|
|
150
|
+
.map_err(|e| format!("Error creating WAV file: {}", e))?;
|
|
151
|
+
|
|
152
|
+
for &s in buffer.iter() {
|
|
153
|
+
let v32 = (s as i32) << (bits - 16);
|
|
154
|
+
writer
|
|
155
|
+
.write_sample(v32)
|
|
156
|
+
.map_err(|e| format!("Error writing sample: {:?}", e))?;
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
writer
|
|
160
|
+
.finalize()
|
|
161
|
+
.map_err(|e| format!("Error finalizing WAV: {:?}", e))?;
|
|
162
|
+
}
|
|
163
|
+
_ => {
|
|
164
|
+
return Err(format!("Unsupported audio format: {}", format_str));
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
Ok(())
|
|
169
|
+
}
|
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
use devalang_types::Value;
|
|
2
|
+
use std::collections::HashMap;
|
|
3
|
+
|
|
4
|
+
type OptMap = Option<HashMap<String, Value>>;
|
|
5
|
+
|
|
6
|
+
pub fn env_maps_from_automation(
|
|
7
|
+
automation: &Option<HashMap<String, Value>>,
|
|
8
|
+
) -> (OptMap, OptMap, OptMap) {
|
|
9
|
+
if let Some(auto) = automation {
|
|
10
|
+
let vol = match auto.get("volume") {
|
|
11
|
+
Some(Value::Map(m)) => Some(m.clone()),
|
|
12
|
+
_ => None,
|
|
13
|
+
};
|
|
14
|
+
let pan = match auto.get("pan") {
|
|
15
|
+
Some(Value::Map(m)) => Some(m.clone()),
|
|
16
|
+
_ => None,
|
|
17
|
+
};
|
|
18
|
+
let pit = match auto.get("pitch") {
|
|
19
|
+
Some(Value::Map(m)) => Some(m.clone()),
|
|
20
|
+
_ => None,
|
|
21
|
+
};
|
|
22
|
+
(vol, pan, pit)
|
|
23
|
+
} else {
|
|
24
|
+
(None, None, None)
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/// Convert an Option<HashMap<..>> into a HashMap (empty if None).
|
|
29
|
+
pub fn env_map_to_hash(opt: &Option<HashMap<String, Value>>) -> HashMap<String, Value> {
|
|
30
|
+
match opt {
|
|
31
|
+
Some(m) => m.clone(),
|
|
32
|
+
None => HashMap::new(),
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
pub fn eval_env_map(
|
|
37
|
+
env_opt: &Option<HashMap<String, Value>>,
|
|
38
|
+
progress: f32,
|
|
39
|
+
default_val: f32,
|
|
40
|
+
) -> f32 {
|
|
41
|
+
let env = match env_opt {
|
|
42
|
+
Some(m) => m,
|
|
43
|
+
None => {
|
|
44
|
+
return default_val;
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
let mut points: Vec<(f32, f32)> = Vec::with_capacity(env.len());
|
|
48
|
+
for (k, v) in env.iter() {
|
|
49
|
+
let key = if k.ends_with('%') {
|
|
50
|
+
&k[..k.len() - 1]
|
|
51
|
+
} else {
|
|
52
|
+
&k[..]
|
|
53
|
+
};
|
|
54
|
+
if let Ok(mut p) = key.parse::<f32>() {
|
|
55
|
+
p = (p / 100.0).clamp(0.0, 1.0);
|
|
56
|
+
let val = match v {
|
|
57
|
+
Value::Number(n) => *n,
|
|
58
|
+
Value::String(s) => s.parse::<f32>().unwrap_or(default_val),
|
|
59
|
+
Value::Identifier(s) => s.parse::<f32>().unwrap_or(default_val),
|
|
60
|
+
_ => default_val,
|
|
61
|
+
};
|
|
62
|
+
points.push((p, val));
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
if points.is_empty() {
|
|
66
|
+
return default_val;
|
|
67
|
+
}
|
|
68
|
+
points.sort_by(|a, b| a.0.partial_cmp(&b.0).unwrap());
|
|
69
|
+
let t = progress.clamp(0.0, 1.0);
|
|
70
|
+
if t <= points[0].0 {
|
|
71
|
+
return points[0].1;
|
|
72
|
+
}
|
|
73
|
+
if t >= points[points.len() - 1].0 {
|
|
74
|
+
return points[points.len() - 1].1;
|
|
75
|
+
}
|
|
76
|
+
for w in points.windows(2) {
|
|
77
|
+
let (p0, v0) = w[0];
|
|
78
|
+
let (p1, v1) = w[1];
|
|
79
|
+
if t >= p0 && t <= p1 {
|
|
80
|
+
let ratio = if (p1 - p0).abs() < f32::EPSILON {
|
|
81
|
+
0.0
|
|
82
|
+
} else {
|
|
83
|
+
(t - p0) / (p1 - p0)
|
|
84
|
+
};
|
|
85
|
+
return v0 + (v1 - v0) * ratio;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
default_val
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
pub fn oscillator_sample(waveform: &str, current_freq: f32, t: f32) -> f32 {
|
|
92
|
+
let phase = 2.0 * std::f32::consts::PI * current_freq * t;
|
|
93
|
+
match waveform {
|
|
94
|
+
"sine" => phase.sin(),
|
|
95
|
+
"square" => {
|
|
96
|
+
if phase.sin() >= 0.0 {
|
|
97
|
+
1.0
|
|
98
|
+
} else {
|
|
99
|
+
-1.0
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
"saw" => 2.0 * (current_freq * t - (current_freq * t + 0.5).floor()),
|
|
103
|
+
"triangle" => (2.0 * (2.0 * (current_freq * t).fract() - 1.0)).abs() * 2.0 - 1.0,
|
|
104
|
+
_ => 0.0,
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
pub fn adsr_envelope_value(
|
|
109
|
+
i: usize,
|
|
110
|
+
attack_samples: usize,
|
|
111
|
+
decay_samples: usize,
|
|
112
|
+
sustain_samples: usize,
|
|
113
|
+
release_samples: usize,
|
|
114
|
+
sustain_level: f32,
|
|
115
|
+
) -> f32 {
|
|
116
|
+
let attack_start = 0usize;
|
|
117
|
+
let decay_start = attack_samples;
|
|
118
|
+
let sustain_start = attack_samples + decay_samples;
|
|
119
|
+
let release_start = attack_samples + decay_samples + sustain_samples;
|
|
120
|
+
|
|
121
|
+
if i < attack_start + attack_samples && attack_samples > 0 {
|
|
122
|
+
let k = i - attack_start;
|
|
123
|
+
let denom = if attack_samples > 1 {
|
|
124
|
+
(attack_samples - 1) as f32
|
|
125
|
+
} else {
|
|
126
|
+
1.0
|
|
127
|
+
};
|
|
128
|
+
(k as f32) / denom
|
|
129
|
+
} else if i < decay_start + decay_samples && decay_samples > 0 {
|
|
130
|
+
let k = i - decay_start;
|
|
131
|
+
let denom = if decay_samples > 1 {
|
|
132
|
+
(decay_samples - 1) as f32
|
|
133
|
+
} else {
|
|
134
|
+
1.0
|
|
135
|
+
};
|
|
136
|
+
let ratio = (k as f32) / denom;
|
|
137
|
+
1.0 - (1.0 - sustain_level) * ratio
|
|
138
|
+
} else if i < sustain_start + sustain_samples {
|
|
139
|
+
sustain_level
|
|
140
|
+
} else if release_samples > 0 {
|
|
141
|
+
// release: interpolate from sustain_level down to 0 inclusive
|
|
142
|
+
let k = i.saturating_sub(release_start);
|
|
143
|
+
let denom = if release_samples > 1 {
|
|
144
|
+
(release_samples - 1) as f32
|
|
145
|
+
} else {
|
|
146
|
+
1.0
|
|
147
|
+
};
|
|
148
|
+
let ratio = (k as f32) / denom;
|
|
149
|
+
let val = sustain_level * (1.0 - ratio);
|
|
150
|
+
if val < 0.0 { 0.0 } else { val }
|
|
151
|
+
} else {
|
|
152
|
+
0.0
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
pub fn pan_gains(pan_val: f32) -> (f32, f32) {
|
|
157
|
+
let left_gain = 1.0 - pan_val.max(0.0);
|
|
158
|
+
let right_gain = 1.0 + pan_val.min(0.0);
|
|
159
|
+
(left_gain, right_gain)
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
pub fn mix_stereo_samples_into_buffer(
|
|
163
|
+
engine: &mut super::driver::AudioEngine,
|
|
164
|
+
start_sample: usize,
|
|
165
|
+
channels: usize,
|
|
166
|
+
stereo_samples: &[i16],
|
|
167
|
+
) {
|
|
168
|
+
let offset = start_sample * channels;
|
|
169
|
+
let required_len = offset + stereo_samples.len();
|
|
170
|
+
|
|
171
|
+
if engine.buffer.len() < required_len {
|
|
172
|
+
engine.buffer.resize(required_len, 0);
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
for (i, sample) in stereo_samples.iter().enumerate() {
|
|
176
|
+
engine.buffer[offset + i] = engine.buffer[offset + i].saturating_add(*sample);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
pub mod driver;
|
|
2
|
+
pub mod export;
|
|
3
|
+
pub mod helpers;
|
|
4
|
+
pub mod notes;
|
|
5
|
+
pub mod sample;
|
|
6
|
+
|
|
7
|
+
pub use driver::AudioEngine;
|
|
8
|
+
|
|
9
|
+
pub use driver::CHANNELS;
|
|
10
|
+
pub use driver::MidiNoteEvent;
|
|
11
|
+
pub use driver::SAMPLE_RATE;
|
|
12
|
+
pub use helpers::*;
|
|
13
|
+
|
|
14
|
+
use crate::core::audio::interpreter::driver::run_audio_program;
|
|
15
|
+
use crate::core::parser::statement::Statement;
|
|
16
|
+
use crate::core::store::global::GlobalStore;
|
|
17
|
+
use devalang_types::{FunctionTable, VariableTable};
|
|
18
|
+
use std::collections::HashMap;
|
|
19
|
+
|
|
20
|
+
/// Render audio for a set of parsed modules.
|
|
21
|
+
///
|
|
22
|
+
/// For each entry in `modules` (module path -> statements), create an
|
|
23
|
+
/// AudioEngine, setup empty module-local VariableTable and FunctionTable,
|
|
24
|
+
/// invoke the interpreter driver to schedule audio into the engine, and
|
|
25
|
+
/// return a map of module name -> AudioEngine.
|
|
26
|
+
pub fn render_audio_with_modules(
|
|
27
|
+
modules: HashMap<String, Vec<Statement>>,
|
|
28
|
+
_output_dir: &str,
|
|
29
|
+
global_store: &mut GlobalStore,
|
|
30
|
+
) -> HashMap<String, AudioEngine> {
|
|
31
|
+
let mut result: HashMap<String, AudioEngine> = HashMap::new();
|
|
32
|
+
|
|
33
|
+
for (module_name, statements) in modules.into_iter() {
|
|
34
|
+
// Create engine named after module (used for diagnostics)
|
|
35
|
+
let mut engine = AudioEngine::new(module_name.clone());
|
|
36
|
+
|
|
37
|
+
// Create empty module-local tables; interpreter expects these as starting context
|
|
38
|
+
let module_vars = VariableTable::new();
|
|
39
|
+
let module_funcs = FunctionTable::new();
|
|
40
|
+
|
|
41
|
+
// Run interpreter which will populate the engine.buffer and midi events
|
|
42
|
+
let (_max_end_time, _cursor_time) = run_audio_program(
|
|
43
|
+
&statements,
|
|
44
|
+
&mut engine,
|
|
45
|
+
module_name.clone(),
|
|
46
|
+
module_name.clone(),
|
|
47
|
+
module_vars,
|
|
48
|
+
module_funcs,
|
|
49
|
+
global_store,
|
|
50
|
+
);
|
|
51
|
+
|
|
52
|
+
result.insert(module_name, engine);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
result
|
|
56
|
+
}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
use crate::core::audio::engine::notes::params::NoteSetup;
|
|
2
|
+
use devalang_types::Value;
|
|
3
|
+
use std::collections::HashMap;
|
|
4
|
+
|
|
5
|
+
pub fn render_notes_into_buffer(
|
|
6
|
+
engine: &mut crate::core::audio::engine::AudioEngine,
|
|
7
|
+
_waveform: &str,
|
|
8
|
+
_freq: f32,
|
|
9
|
+
_amp: f32,
|
|
10
|
+
_start_time_ms: f32,
|
|
11
|
+
_duration_ms: f32,
|
|
12
|
+
_synth_params: HashMap<String, Value>,
|
|
13
|
+
_note_params: HashMap<String, Value>,
|
|
14
|
+
_automation: Option<HashMap<String, Value>>,
|
|
15
|
+
setup: NoteSetup,
|
|
16
|
+
) {
|
|
17
|
+
use crate::core::audio::engine::helpers;
|
|
18
|
+
|
|
19
|
+
let sample_rate = setup.sample_rate;
|
|
20
|
+
let channels = setup.channels;
|
|
21
|
+
let total_samples = setup.total_samples;
|
|
22
|
+
let start_sample = setup.start_sample;
|
|
23
|
+
|
|
24
|
+
let mut stereo_samples: Vec<i16> = Vec::with_capacity(total_samples * channels);
|
|
25
|
+
let fade_len = (sample_rate * 0.01) as usize; // 10ms fade
|
|
26
|
+
|
|
27
|
+
for i in 0..total_samples {
|
|
28
|
+
let t = ((start_sample + i) as f32) / sample_rate;
|
|
29
|
+
|
|
30
|
+
// simplified voice/unison and oscillator sampling
|
|
31
|
+
let mut value = helpers::oscillator_sample(_waveform, _freq, t);
|
|
32
|
+
|
|
33
|
+
// apply ADSR envelope
|
|
34
|
+
let envelope = helpers::adsr_envelope_value(
|
|
35
|
+
i,
|
|
36
|
+
setup.attack_samples,
|
|
37
|
+
setup.decay_samples,
|
|
38
|
+
if total_samples > setup.attack_samples + setup.decay_samples + setup.release_samples {
|
|
39
|
+
total_samples - setup.attack_samples - setup.decay_samples - setup.release_samples
|
|
40
|
+
} else {
|
|
41
|
+
0
|
|
42
|
+
},
|
|
43
|
+
setup.release_samples,
|
|
44
|
+
setup.sustain_level,
|
|
45
|
+
);
|
|
46
|
+
|
|
47
|
+
value *= envelope * (i16::MAX as f32) * _amp;
|
|
48
|
+
|
|
49
|
+
if fade_len > 0 && i < fade_len {
|
|
50
|
+
if fade_len == 1 {
|
|
51
|
+
value *= 0.0;
|
|
52
|
+
} else {
|
|
53
|
+
value *= (i as f32) / (fade_len as f32);
|
|
54
|
+
}
|
|
55
|
+
} else if fade_len > 0 && i >= total_samples.saturating_sub(fade_len) {
|
|
56
|
+
if fade_len == 1 {
|
|
57
|
+
value *= 0.0;
|
|
58
|
+
} else {
|
|
59
|
+
value *= ((total_samples - 1 - i) as f32) / ((fade_len - 1) as f32);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
let (left_gain, right_gain) = helpers::pan_gains(0.0);
|
|
64
|
+
let left = (value * left_gain)
|
|
65
|
+
.round()
|
|
66
|
+
.clamp(i16::MIN as f32, i16::MAX as f32) as i16;
|
|
67
|
+
let right = (value * right_gain)
|
|
68
|
+
.round()
|
|
69
|
+
.clamp(i16::MIN as f32, i16::MAX as f32) as i16;
|
|
70
|
+
|
|
71
|
+
// push samples interleaved for channels=2, fallback zeros for other channel counts
|
|
72
|
+
if channels >= 2 {
|
|
73
|
+
stereo_samples.push(left);
|
|
74
|
+
stereo_samples.push(right);
|
|
75
|
+
} else if channels == 1 {
|
|
76
|
+
stereo_samples.push(((left as i32 + right as i32) / 2) as i16);
|
|
77
|
+
} else {
|
|
78
|
+
stereo_samples.push(left);
|
|
79
|
+
stereo_samples.push(right);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
engine.note_count = engine.note_count.saturating_add(1);
|
|
84
|
+
helpers::mix_stereo_samples_into_buffer(engine, start_sample, channels, &stereo_samples);
|
|
85
|
+
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
use devalang_types::Value;
|
|
2
|
+
use std::collections::HashMap;
|
|
3
|
+
|
|
4
|
+
pub mod dsp;
|
|
5
|
+
pub mod params;
|
|
6
|
+
|
|
7
|
+
// Minimal safe facade: parse the setup then call DSP renderer.
|
|
8
|
+
|
|
9
|
+
pub fn insert_note_impl(
|
|
10
|
+
engine: &mut crate::core::audio::engine::AudioEngine,
|
|
11
|
+
waveform: String,
|
|
12
|
+
freq: f32,
|
|
13
|
+
amp: f32,
|
|
14
|
+
start_time_ms: f32,
|
|
15
|
+
duration_ms: f32,
|
|
16
|
+
synth_params: HashMap<String, Value>,
|
|
17
|
+
note_params: HashMap<String, Value>,
|
|
18
|
+
automation: Option<HashMap<String, Value>>,
|
|
19
|
+
) {
|
|
20
|
+
let setup = params::build_note_setup(
|
|
21
|
+
engine,
|
|
22
|
+
&waveform,
|
|
23
|
+
freq,
|
|
24
|
+
amp,
|
|
25
|
+
start_time_ms,
|
|
26
|
+
duration_ms,
|
|
27
|
+
&synth_params,
|
|
28
|
+
¬e_params,
|
|
29
|
+
&automation,
|
|
30
|
+
);
|
|
31
|
+
|
|
32
|
+
dsp::render_notes_into_buffer(
|
|
33
|
+
engine,
|
|
34
|
+
&waveform,
|
|
35
|
+
freq,
|
|
36
|
+
amp,
|
|
37
|
+
start_time_ms,
|
|
38
|
+
duration_ms,
|
|
39
|
+
synth_params,
|
|
40
|
+
note_params,
|
|
41
|
+
automation,
|
|
42
|
+
setup,
|
|
43
|
+
);
|
|
44
|
+
}
|