@devaloop/devalang 0.0.1-beta.1 → 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/.devalang +9 -10
- package/Cargo.toml +5 -4
- package/README.md +7 -5
- package/docs/CHANGELOG.md +42 -0
- package/docs/ROADMAP.md +5 -1
- package/docs/TODO.md +3 -14
- package/examples/bus.deva +10 -0
- package/examples/effect.deva +2 -0
- package/examples/filter.deva +11 -0
- package/examples/lfo.deva +9 -0
- package/examples/synth.deva +11 -1
- package/examples/synth_types.deva +17 -0
- package/out-tsc/core/functions/index.d.ts +5 -0
- package/out-tsc/core/functions/index.js +11 -0
- package/out-tsc/pkg/devalang_core.d.ts +2 -0
- package/out-tsc/pkg/devalang_core.js +17 -2
- package/out-tsc/pkg/devalang_core_bg.wasm.d.ts +8 -7
- package/package.json +1 -1
- package/project-version.json +3 -3
- package/rust/cli/bank/api.rs +122 -122
- package/rust/cli/bank/commands.rs +33 -2
- package/rust/cli/bank/mod.rs +29 -29
- package/rust/cli/build/commands.rs +53 -3
- package/rust/cli/build/mod.rs +2 -2
- package/rust/cli/build/process.rs +26 -7
- package/rust/cli/check/mod.rs +2 -2
- package/rust/cli/discover/commands.rs +253 -253
- package/rust/cli/discover/config.rs +111 -111
- package/rust/cli/discover/fs.rs +19 -19
- package/rust/cli/discover/install.rs +103 -103
- package/rust/cli/discover/metadata.rs +48 -48
- package/rust/cli/discover/mod.rs +5 -5
- package/rust/cli/install/addon.rs +118 -118
- package/rust/cli/install/bank.rs +22 -3
- package/rust/cli/install/commands.rs +35 -35
- package/rust/cli/install/mod.rs +4 -4
- package/rust/cli/install/plugin.rs +80 -61
- package/rust/cli/login/commands.rs +124 -124
- package/rust/cli/mod.rs +12 -12
- package/rust/cli/parser.rs +46 -1
- package/rust/cli/play/commands.rs +71 -20
- package/rust/cli/play/mod.rs +5 -5
- package/rust/cli/play/process.rs +14 -5
- package/rust/cli/play/realtime.rs +91 -91
- package/rust/cli/telemetry/commands.rs +22 -22
- package/rust/cli/telemetry/event_creator.rs +80 -80
- package/rust/cli/telemetry/mod.rs +3 -3
- package/rust/cli/telemetry/send.rs +51 -51
- package/rust/cli/template/commands.rs +69 -69
- package/rust/config/driver.rs +112 -103
- package/rust/config/mod.rs +3 -3
- package/rust/config/ops.rs +26 -26
- package/rust/config/settings.rs +101 -101
- 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 -170
- package/rust/core/audio/engine/mod.rs +51 -2
- 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.rs → evaluator/numeric.rs} +1 -159
- 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 +55 -23
- package/rust/core/audio/interpreter/mod.rs +1 -13
- 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/{automate.rs → statements/automate.rs} +16 -18
- package/rust/core/audio/interpreter/{call.rs → statements/call.rs} +5 -4
- package/rust/core/audio/interpreter/{condition.rs → statements/condition.rs} +2 -1
- package/rust/core/audio/interpreter/{function.rs → statements/function.rs} +2 -4
- package/rust/core/audio/interpreter/{let_.rs → statements/let_.rs} +2 -4
- package/rust/core/audio/interpreter/{load.rs → statements/load.rs} +2 -4
- package/rust/core/audio/interpreter/{loop_.rs → statements/loop_.rs} +2 -1
- package/rust/core/audio/interpreter/statements/mod.rs +12 -0
- package/rust/core/audio/interpreter/{sleep.rs → statements/sleep.rs} +28 -28
- package/rust/core/audio/interpreter/{spawn.rs → statements/spawn.rs} +3 -2
- package/rust/core/audio/interpreter/{tempo.rs → statements/tempo.rs} +40 -40
- package/rust/core/audio/interpreter/{trigger.rs → statements/trigger.rs} +1 -1
- package/rust/core/audio/loader/trigger.rs +2 -1
- package/rust/core/audio/mod.rs +6 -7
- package/rust/core/audio/player.rs +70 -70
- package/rust/core/audio/special/easing.rs +189 -189
- package/rust/core/audio/special/env.rs +45 -45
- package/rust/core/audio/special/math.rs +134 -134
- package/rust/core/audio/special/mod.rs +9 -9
- package/rust/core/audio/special/modulator.rs +143 -143
- package/rust/core/builder/mod.rs +45 -2
- package/rust/core/debugger/lexer.rs +27 -27
- package/rust/core/debugger/{module.rs → logs.rs} +3 -6
- package/rust/core/debugger/mod.rs +30 -30
- package/rust/core/debugger/preprocessor.rs +27 -27
- package/rust/core/debugger/store.rs +2 -4
- package/rust/core/error/mod.rs +269 -269
- package/rust/core/lexer/driver.rs +59 -61
- package/rust/core/lexer/handler/arrow.rs +82 -82
- package/rust/core/lexer/handler/at.rs +21 -21
- package/rust/core/lexer/handler/brace.rs +41 -41
- package/rust/core/lexer/handler/colon.rs +21 -21
- package/rust/core/lexer/handler/comment.rs +30 -30
- package/rust/core/lexer/handler/dot.rs +21 -21
- package/rust/core/lexer/handler/driver.rs +337 -337
- package/rust/core/lexer/handler/identifier.rs +47 -47
- package/rust/core/lexer/handler/indent.rs +66 -66
- package/rust/core/lexer/handler/mod.rs +15 -15
- package/rust/core/lexer/handler/newline.rs +23 -23
- package/rust/core/lexer/handler/number.rs +31 -31
- package/rust/core/lexer/handler/operator.rs +46 -46
- package/rust/core/lexer/handler/parenthesis.rs +41 -41
- package/rust/core/lexer/handler/slash.rs +21 -21
- package/rust/core/lexer/handler/string.rs +63 -63
- package/rust/core/lexer/mod.rs +3 -3
- package/rust/core/mod.rs +0 -1
- 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 +28 -4
- package/rust/core/parser/handler/at.rs +279 -279
- package/rust/core/parser/handler/bank.rs +104 -104
- package/rust/core/parser/handler/condition.rs +83 -83
- package/rust/core/parser/handler/dot.rs +148 -148
- package/rust/core/parser/handler/identifier/automate.rs +254 -254
- package/rust/core/parser/handler/identifier/call.rs +91 -91
- package/rust/core/parser/handler/identifier/emit.rs +70 -70
- package/rust/core/parser/handler/identifier/function.rs +113 -113
- package/rust/core/parser/handler/identifier/group.rs +89 -89
- package/rust/core/parser/handler/identifier/let_.rs +173 -173
- package/rust/core/parser/handler/identifier/mod.rs +55 -55
- package/rust/core/parser/handler/identifier/on.rs +107 -107
- package/rust/core/parser/handler/identifier/print.rs +49 -49
- package/rust/core/parser/handler/identifier/sleep.rs +96 -43
- package/rust/core/parser/handler/identifier/spawn.rs +91 -91
- package/rust/core/parser/handler/identifier/synth.rs +135 -135
- package/rust/core/parser/handler/loop_.rs +194 -194
- package/rust/core/parser/handler/mod.rs +9 -9
- package/rust/core/parser/handler/pattern.rs +1 -1
- package/rust/core/parser/handler/tempo.rs +105 -57
- package/rust/core/parser/statement.rs +10 -11
- package/rust/core/plugin/loader.rs +1 -1
- package/rust/core/plugin/mod.rs +2 -2
- package/rust/core/plugin/runner/mod.rs +11 -0
- package/rust/core/plugin/{runner.rs → runner/non_wasm.rs} +297 -347
- 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/module.rs +2 -7
- package/rust/core/preprocessor/{processor.rs → processor/handlers.rs} +6 -13
- package/rust/core/preprocessor/processor/mod.rs +1 -0
- package/rust/core/preprocessor/resolver/bank.rs +49 -49
- package/rust/core/preprocessor/resolver/call.rs +124 -124
- package/rust/core/preprocessor/resolver/condition.rs +95 -95
- package/rust/core/preprocessor/resolver/driver.rs +324 -324
- package/rust/core/preprocessor/resolver/function.rs +2 -2
- package/rust/core/preprocessor/resolver/group.rs +46 -18
- package/rust/core/preprocessor/resolver/let_.rs +32 -32
- package/rust/core/preprocessor/resolver/loop_.rs +318 -318
- package/rust/core/preprocessor/resolver/mod.rs +16 -16
- package/rust/core/preprocessor/resolver/pattern.rs +83 -83
- package/rust/core/preprocessor/resolver/spawn.rs +99 -99
- package/rust/core/preprocessor/resolver/synth.rs +54 -54
- package/rust/core/preprocessor/resolver/tempo.rs +48 -48
- package/rust/core/preprocessor/resolver/trigger.rs +116 -116
- package/rust/core/preprocessor/resolver/value.rs +176 -176
- package/rust/core/store/global.rs +2 -6
- package/rust/core/store/mod.rs +1 -5
- package/rust/lib.rs +18 -3
- package/rust/main.rs +27 -3
- package/rust/types/Cargo.toml +1 -1
- package/rust/types/src/addons.rs +55 -55
- package/rust/types/src/config.rs +84 -74
- package/rust/types/src/lib.rs +15 -12
- package/rust/types/src/plugin.rs +20 -0
- package/rust/types/src/store.rs +139 -0
- package/rust/types/src/telemetry.rs +85 -85
- package/rust/utils/Cargo.toml +2 -2
- package/rust/utils/src/file.rs +94 -94
- package/rust/utils/src/first_usage.rs +97 -97
- package/rust/utils/src/lib.rs +9 -9
- package/rust/utils/src/logger.rs +200 -200
- package/rust/utils/src/path.rs +129 -88
- package/rust/utils/src/signature.rs +41 -41
- package/rust/utils/src/spinner.rs +20 -20
- package/rust/utils/src/version.rs +27 -27
- package/rust/utils/src/watcher.rs +46 -46
- package/rust/web/api.rs +5 -5
- package/rust/web/cdn.rs +34 -34
- package/rust/web/mod.rs +3 -3
- package/tests/integration.rs +21 -21
- package/typescript/core/functions/index.ts +11 -0
- package/typescript/pkg/devalang_core.ts +20 -4
- package/rust/core/audio/engine/sample.rs +0 -366
- package/rust/core/audio/engine/synth.rs +0 -325
- package/rust/core/audio/interpreter/arrow_call.rs +0 -311
- package/rust/core/audio/renderer.rs +0 -54
- package/rust/core/parser/driver.rs +0 -584
- package/rust/core/preprocessor/loader.rs +0 -637
- package/rust/core/store/export.rs +0 -28
- package/rust/core/store/function.rs +0 -40
- package/rust/core/store/import.rs +0 -28
- package/rust/core/store/variable.rs +0 -51
- package/rust/core/utils/mod.rs +0 -1
- package/rust/core/utils/path.rs +0 -37
|
@@ -0,0 +1,220 @@
|
|
|
1
|
+
use devalang_types::Value;
|
|
2
|
+
use std::collections::HashMap;
|
|
3
|
+
|
|
4
|
+
// Minimal representation of a MIDI note event for export purposes.
|
|
5
|
+
#[derive(Debug, Clone, PartialEq)]
|
|
6
|
+
pub struct MidiNoteEvent {
|
|
7
|
+
/// MIDI key number 0-127
|
|
8
|
+
pub key: u8,
|
|
9
|
+
/// velocity 0-127
|
|
10
|
+
pub vel: u8,
|
|
11
|
+
/// start time in milliseconds (absolute)
|
|
12
|
+
pub start_ms: u32,
|
|
13
|
+
/// duration in milliseconds
|
|
14
|
+
pub duration_ms: u32,
|
|
15
|
+
/// MIDI channel (0-15)
|
|
16
|
+
pub channel: u8,
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
// Sample rate and channel constants used throughout the engine.
|
|
20
|
+
pub const SAMPLE_RATE: u32 = 44100;
|
|
21
|
+
pub const CHANNELS: u16 = 2;
|
|
22
|
+
|
|
23
|
+
/// AudioEngine holds the generated interleaved stereo buffer and
|
|
24
|
+
/// provides simple utilities to mix/merge buffers and export WAV files.
|
|
25
|
+
///
|
|
26
|
+
/// Notes:
|
|
27
|
+
/// - Buffer is interleaved stereo (L,R,L,R...).
|
|
28
|
+
/// - Methods are synchronous and operate on in-memory buffers.
|
|
29
|
+
///
|
|
30
|
+
#[derive(Debug, Clone, PartialEq)]
|
|
31
|
+
pub struct AudioEngine {
|
|
32
|
+
/// Master volume multiplier (not automatically applied by helpers).
|
|
33
|
+
pub volume: f32,
|
|
34
|
+
/// Interleaved i16 PCM buffer.
|
|
35
|
+
pub buffer: Vec<i16>,
|
|
36
|
+
/// Collected MIDI note events for export (non-audio representation).
|
|
37
|
+
pub midi_events: Vec<MidiNoteEvent>,
|
|
38
|
+
/// Logical module name used for error traces/diagnostics.
|
|
39
|
+
pub module_name: String,
|
|
40
|
+
/// Simple diagnostic counter for inserted notes.
|
|
41
|
+
pub note_count: usize,
|
|
42
|
+
/// Sample rate (can be overridden per-engine)
|
|
43
|
+
pub sample_rate: u32,
|
|
44
|
+
/// Number of channels (interleaved). Defaults to 2.
|
|
45
|
+
pub channels: u16,
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
impl AudioEngine {
|
|
49
|
+
pub fn new(module_name: String) -> Self {
|
|
50
|
+
AudioEngine {
|
|
51
|
+
volume: 1.0,
|
|
52
|
+
buffer: vec![],
|
|
53
|
+
midi_events: Vec::new(),
|
|
54
|
+
module_name,
|
|
55
|
+
note_count: 0,
|
|
56
|
+
sample_rate: SAMPLE_RATE,
|
|
57
|
+
channels: CHANNELS,
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
pub fn get_buffer(&self) -> &[i16] {
|
|
62
|
+
&self.buffer
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
pub fn get_normalized_buffer(&self) -> Vec<f32> {
|
|
66
|
+
self.buffer.iter().map(|&s| (s as f32) / 32768.0).collect()
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
pub fn mix(&mut self, other: &AudioEngine) {
|
|
70
|
+
let max_len = self.buffer.len().max(other.buffer.len());
|
|
71
|
+
self.buffer.resize(max_len, 0);
|
|
72
|
+
|
|
73
|
+
for (i, &sample) in other.buffer.iter().enumerate() {
|
|
74
|
+
self.buffer[i] = self.buffer[i].saturating_add(sample);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
pub fn merge_with(&mut self, other: AudioEngine) {
|
|
79
|
+
// If the other buffer is empty, simply return without warning (common for spawns that produced nothing)
|
|
80
|
+
if other.buffer.is_empty() {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
// If the other buffer is present but contains only zeros, warn and skip merge
|
|
85
|
+
if other.buffer.iter().all(|&s| s == 0) {
|
|
86
|
+
eprintln!("⚠️ Skipping merge: other buffer is silent");
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
if self.buffer.iter().all(|&s| s == 0) {
|
|
91
|
+
self.buffer = other.buffer;
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
self.mix(&other);
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
pub fn set_duration(&mut self, duration_secs: f32) {
|
|
99
|
+
let total_samples =
|
|
100
|
+
(duration_secs * (self.sample_rate as f32) * (self.channels as f32)) as usize;
|
|
101
|
+
|
|
102
|
+
if self.buffer.len() < total_samples {
|
|
103
|
+
self.buffer.resize(total_samples, 0);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
pub fn generate_midi_file(
|
|
108
|
+
&mut self,
|
|
109
|
+
output_path: &String,
|
|
110
|
+
bpm: Option<f32>,
|
|
111
|
+
tpqn: Option<u16>,
|
|
112
|
+
) -> Result<(), String> {
|
|
113
|
+
crate::core::audio::engine::export::generate_midi_file_impl(
|
|
114
|
+
&self.midi_events,
|
|
115
|
+
output_path,
|
|
116
|
+
bpm,
|
|
117
|
+
tpqn,
|
|
118
|
+
)
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
pub fn generate_wav_file(
|
|
122
|
+
&mut self,
|
|
123
|
+
output_dir: &String,
|
|
124
|
+
audio_format: Option<String>,
|
|
125
|
+
sample_rate: Option<u32>,
|
|
126
|
+
) -> Result<(), String> {
|
|
127
|
+
crate::core::audio::engine::export::generate_wav_file_impl(
|
|
128
|
+
&mut self.buffer,
|
|
129
|
+
output_dir,
|
|
130
|
+
audio_format,
|
|
131
|
+
sample_rate,
|
|
132
|
+
)
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
pub fn insert_note(
|
|
136
|
+
&mut self,
|
|
137
|
+
waveform: String,
|
|
138
|
+
freq: f32,
|
|
139
|
+
amp: f32,
|
|
140
|
+
start_time_ms: f32,
|
|
141
|
+
duration_ms: f32,
|
|
142
|
+
synth_params: HashMap<String, Value>,
|
|
143
|
+
note_params: HashMap<String, Value>,
|
|
144
|
+
automation: Option<HashMap<String, Value>>,
|
|
145
|
+
) {
|
|
146
|
+
// Delegated implementation lives in notes.rs
|
|
147
|
+
crate::core::audio::engine::notes::insert_note_impl(
|
|
148
|
+
self,
|
|
149
|
+
waveform,
|
|
150
|
+
freq,
|
|
151
|
+
amp,
|
|
152
|
+
start_time_ms,
|
|
153
|
+
duration_ms,
|
|
154
|
+
synth_params,
|
|
155
|
+
note_params,
|
|
156
|
+
automation,
|
|
157
|
+
);
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
// helper extraction functions left in this struct for now
|
|
161
|
+
pub(crate) fn extract_f32(&self, map: &HashMap<String, Value>, key: &str) -> Option<f32> {
|
|
162
|
+
match map.get(key) {
|
|
163
|
+
Some(Value::Number(n)) => Some(*n),
|
|
164
|
+
Some(Value::String(s)) => s.parse::<f32>().ok(),
|
|
165
|
+
Some(Value::Boolean(b)) => Some(if *b { 1.0 } else { 0.0 }),
|
|
166
|
+
_ => None,
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
pub(crate) fn extract_boolean(&self, map: &HashMap<String, Value>, key: &str) -> Option<bool> {
|
|
171
|
+
match map.get(key) {
|
|
172
|
+
Some(Value::Boolean(b)) => Some(*b),
|
|
173
|
+
Some(Value::Number(n)) => Some(*n != 0.0),
|
|
174
|
+
Some(Value::Identifier(s)) => {
|
|
175
|
+
if s == "true" {
|
|
176
|
+
Some(true)
|
|
177
|
+
} else if s == "false" {
|
|
178
|
+
Some(false)
|
|
179
|
+
} else {
|
|
180
|
+
None
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
Some(Value::String(s)) => {
|
|
184
|
+
if s == "true" {
|
|
185
|
+
Some(true)
|
|
186
|
+
} else if s == "false" {
|
|
187
|
+
Some(false)
|
|
188
|
+
} else {
|
|
189
|
+
None
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
_ => None,
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
// Parse simple musical fraction strings like "1/16" into seconds using bpm
|
|
198
|
+
pub fn parse_fraction_to_seconds(s: &str, bpm: f32) -> Option<f32> {
|
|
199
|
+
let trimmed = s.trim();
|
|
200
|
+
if let Some((num, den)) = trimmed.split_once('/') {
|
|
201
|
+
if let (Ok(n), Ok(d)) = (num.parse::<f32>(), den.parse::<f32>()) {
|
|
202
|
+
if d != 0.0 {
|
|
203
|
+
let beats = n / d; // e.g. 1/16 -> 0.0625 beats
|
|
204
|
+
let secs_per_beat = 60.0 / bpm.max(1.0);
|
|
205
|
+
return Some(beats * secs_per_beat);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
None
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
// Convert a devalang_types::Duration to seconds using bpm when relevant.
|
|
213
|
+
pub fn duration_to_seconds(d: &devalang_types::Duration, bpm: f32) -> Option<f32> {
|
|
214
|
+
use devalang_types::Duration as D;
|
|
215
|
+
match d {
|
|
216
|
+
D::Number(s) => Some(*s),
|
|
217
|
+
D::Beat(frac) | D::Identifier(frac) => parse_fraction_to_seconds(frac, bpm),
|
|
218
|
+
_ => None,
|
|
219
|
+
}
|
|
220
|
+
}
|
|
@@ -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
|
+
}
|