@devaloop/devalang 0.0.1-beta.1 → 0.0.1-beta.3
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 +84 -80
- package/README.md +10 -7
- package/docs/CHANGELOG.md +83 -0
- package/docs/ROADMAP.md +6 -2
- package/docs/TODO.md +3 -14
- package/examples/bus.deva +10 -0
- package/examples/chain.deva +19 -0
- package/examples/effect.deva +2 -0
- package/examples/filter.deva +11 -0
- package/examples/lfo.deva +9 -0
- package/examples/plugin.deva +10 -10
- package/examples/routing.deva +23 -0
- package/examples/synth.deva +11 -1
- package/examples/synth_types.deva +17 -0
- package/out-tsc/bin/project-version.json +6 -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 +1 -0
- package/out-tsc/scripts/version/copy-to-binary.d.ts +1 -0
- package/out-tsc/scripts/version/copy-to-binary.js +79 -0
- package/package.json +23 -10
- package/project-version.json +3 -3
- package/rust/bindings/Cargo.toml +9 -0
- package/rust/bindings/src/lib.rs +86 -0
- package/rust/cli/addon/commands.rs +35 -0
- package/rust/cli/addon/download.rs +234 -0
- package/rust/cli/addon/install.rs +33 -0
- package/rust/cli/addon/list.rs +224 -0
- package/rust/cli/addon/metadata.rs +124 -0
- package/rust/cli/addon/mod.rs +8 -0
- package/rust/cli/addon/remove.rs +271 -0
- package/rust/cli/addon/update.rs +305 -0
- package/rust/cli/{install/addon.rs → addon/utils.rs} +34 -43
- package/rust/cli/build/commands.rs +153 -103
- package/rust/cli/build/mod.rs +2 -2
- package/rust/cli/build/process.rs +165 -146
- package/rust/cli/check/mod.rs +208 -208
- package/rust/cli/discover/commands.rs +53 -31
- package/rust/cli/discover/config.rs +2 -4
- package/rust/cli/discover/install.rs +139 -28
- package/rust/cli/discover/metadata.rs +3 -3
- package/rust/cli/login/commands.rs +124 -124
- package/rust/cli/me/commands.rs +52 -0
- package/rust/cli/me/mod.rs +1 -0
- package/rust/cli/mod.rs +2 -2
- package/rust/cli/parser.rs +76 -70
- package/rust/cli/play/commands.rs +375 -324
- package/rust/cli/play/mod.rs +5 -5
- package/rust/cli/play/process.rs +159 -150
- 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 +237 -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 +56 -7
- package/rust/core/audio/engine/notes/dsp.rs +88 -0
- package/rust/core/audio/engine/notes/mod.rs +53 -0
- package/rust/core/audio/engine/notes/params.rs +294 -0
- package/rust/core/audio/engine/sample/insert.rs +300 -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} +152 -310
- 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 -542
- package/rust/core/audio/interpreter/mod.rs +2 -14
- package/rust/core/audio/interpreter/statements/arrow_call/interprete.rs +179 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/chord.rs +398 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/effects.rs +323 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/mod.rs +3 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/note.rs +371 -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} +2 -4
- package/rust/core/audio/interpreter/{call.rs → statements/call.rs} +36 -5
- package/rust/core/audio/interpreter/{condition.rs → statements/condition.rs} +72 -71
- package/rust/core/audio/interpreter/{function.rs → statements/function.rs} +24 -26
- package/rust/core/audio/interpreter/{let_.rs → statements/let_.rs} +36 -38
- package/rust/core/audio/interpreter/{load.rs → statements/load.rs} +17 -19
- package/rust/core/audio/interpreter/{loop_.rs → statements/loop_.rs} +115 -114
- 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} +54 -4
- package/rust/core/audio/interpreter/{tempo.rs → statements/tempo.rs} +40 -40
- package/rust/core/audio/interpreter/{trigger.rs → statements/trigger.rs} +242 -239
- package/rust/core/audio/loader/trigger.rs +98 -97
- package/rust/core/audio/mod.rs +6 -7
- 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/modulator.rs +143 -143
- package/rust/core/builder/mod.rs +129 -86
- package/rust/core/debugger/{module.rs → logs.rs} +52 -55
- package/rust/core/debugger/mod.rs +30 -30
- package/rust/core/debugger/store.rs +38 -40
- package/rust/core/error/mod.rs +269 -269
- package/rust/core/lexer/driver.rs +2 -4
- 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 +159 -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 +247 -0
- package/rust/core/parser/driver/parser.rs +160 -0
- package/rust/core/parser/handler/arrow_call.rs +90 -15
- 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 +39 -3
- package/rust/core/parser/handler/loop_.rs +194 -194
- package/rust/core/parser/handler/pattern.rs +25 -2
- package/rust/core/parser/handler/tempo.rs +105 -57
- package/rust/core/parser/statement.rs +10 -11
- package/rust/core/plugin/loader.rs +137 -137
- package/rust/core/plugin/runner/mod.rs +11 -0
- package/rust/core/plugin/{runner.rs → runner/non_wasm.rs} +206 -72
- package/rust/core/plugin/runner/wasm32.rs +44 -0
- package/rust/core/preprocessor/loader/inject.rs +313 -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 +55 -60
- package/rust/core/preprocessor/{processor.rs → processor/handlers.rs} +107 -114
- package/rust/core/preprocessor/processor/mod.rs +1 -0
- package/rust/core/preprocessor/resolver/function.rs +69 -69
- package/rust/core/preprocessor/resolver/group.rs +122 -94
- package/rust/core/preprocessor/resolver/pattern.rs +14 -2
- package/rust/core/store/global.rs +57 -61
- package/rust/core/store/mod.rs +1 -5
- package/rust/lib.rs +323 -308
- package/rust/macros/Cargo.toml +14 -0
- package/rust/macros/src/lib.rs +52 -0
- package/rust/main.rs +336 -143
- package/rust/types/Cargo.toml +1 -1
- package/rust/types/src/addons.rs +57 -55
- package/rust/types/src/config.rs +82 -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 +5 -2
- package/rust/utils/src/file.rs +477 -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 +158 -88
- package/rust/utils/src/signature.rs +41 -41
- package/rust/utils/src/spinner.rs +20 -20
- package/rust/utils/src/version.rs +58 -27
- package/rust/utils/src/watcher.rs +46 -46
- package/rust/web/api.rs +5 -5
- package/rust/web/auth.rs +5 -0
- package/rust/web/cdn.rs +34 -34
- package/rust/web/forge.rs +5 -0
- package/rust/web/mod.rs +2 -0
- package/tests/integration.rs +21 -21
- package/typescript/core/functions/index.ts +11 -0
- package/typescript/pkg/devalang_core.ts +20 -4
- package/typescript/scripts/version/copy-to-binary.ts +82 -0
- package/rust/cli/bank/api.rs +0 -122
- package/rust/cli/bank/commands.rs +0 -275
- package/rust/cli/bank/mod.rs +0 -29
- package/rust/cli/install/bank.rs +0 -53
- package/rust/cli/install/commands.rs +0 -35
- package/rust/cli/install/mod.rs +0 -4
- package/rust/cli/install/plugin.rs +0 -61
- 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
|
@@ -1,325 +0,0 @@
|
|
|
1
|
-
use devalang_types::Value;
|
|
2
|
-
use std::collections::HashMap;
|
|
3
|
-
|
|
4
|
-
// Sample rate and channel constants used throughout the engine.
|
|
5
|
-
const SAMPLE_RATE: u32 = 44100;
|
|
6
|
-
const CHANNELS: u16 = 2;
|
|
7
|
-
|
|
8
|
-
/// AudioEngine holds the generated interleaved stereo buffer and
|
|
9
|
-
/// provides simple utilities to mix/merge buffers and export WAV files.
|
|
10
|
-
///
|
|
11
|
-
/// Notes:
|
|
12
|
-
/// - Buffer is interleaved stereo (L,R,L,R...).
|
|
13
|
-
/// - Methods are synchronous and operate on in-memory buffers.
|
|
14
|
-
#[derive(Debug, Clone, PartialEq)]
|
|
15
|
-
pub struct AudioEngine {
|
|
16
|
-
/// Master volume multiplier (not automatically applied by helpers).
|
|
17
|
-
pub volume: f32,
|
|
18
|
-
/// Interleaved i16 PCM buffer.
|
|
19
|
-
pub buffer: Vec<i16>,
|
|
20
|
-
/// Logical module name used for error traces/diagnostics.
|
|
21
|
-
pub module_name: String,
|
|
22
|
-
/// Simple diagnostic counter for inserted notes.
|
|
23
|
-
pub note_count: usize,
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
impl AudioEngine {
|
|
27
|
-
pub fn new(module_name: String) -> Self {
|
|
28
|
-
AudioEngine {
|
|
29
|
-
volume: 1.0,
|
|
30
|
-
buffer: vec![],
|
|
31
|
-
module_name,
|
|
32
|
-
note_count: 0,
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
pub fn get_buffer(&self) -> &[i16] {
|
|
37
|
-
&self.buffer
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
pub fn get_normalized_buffer(&self) -> Vec<f32> {
|
|
41
|
-
self.buffer.iter().map(|&s| (s as f32) / 32768.0).collect()
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
pub fn mix(&mut self, other: &AudioEngine) {
|
|
45
|
-
let max_len = self.buffer.len().max(other.buffer.len());
|
|
46
|
-
self.buffer.resize(max_len, 0);
|
|
47
|
-
|
|
48
|
-
for (i, &sample) in other.buffer.iter().enumerate() {
|
|
49
|
-
self.buffer[i] = self.buffer[i].saturating_add(sample);
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
pub fn merge_with(&mut self, other: AudioEngine) {
|
|
54
|
-
// If the other buffer is empty, simply return without warning (common for spawns that produced nothing)
|
|
55
|
-
if other.buffer.is_empty() {
|
|
56
|
-
return;
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
// If the other buffer is present but contains only zeros, warn and skip merge
|
|
60
|
-
if other.buffer.iter().all(|&s| s == 0) {
|
|
61
|
-
eprintln!("⚠️ Skipping merge: other buffer is silent");
|
|
62
|
-
return;
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
if self.buffer.iter().all(|&s| s == 0) {
|
|
66
|
-
self.buffer = other.buffer;
|
|
67
|
-
return;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
self.mix(&other);
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
pub fn set_duration(&mut self, duration_secs: f32) {
|
|
74
|
-
let total_samples = (duration_secs * (SAMPLE_RATE as f32) * (CHANNELS as f32)) as usize;
|
|
75
|
-
|
|
76
|
-
if self.buffer.len() < total_samples {
|
|
77
|
-
self.buffer.resize(total_samples, 0);
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
pub fn generate_wav_file(&mut self, output_dir: &String) -> Result<(), String> {
|
|
82
|
-
if self.buffer.len() % (CHANNELS as usize) != 0 {
|
|
83
|
-
self.buffer.push(0);
|
|
84
|
-
println!("Completed buffer to respect stereo format.");
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
let spec = hound::WavSpec {
|
|
88
|
-
channels: CHANNELS,
|
|
89
|
-
sample_rate: SAMPLE_RATE,
|
|
90
|
-
bits_per_sample: 16,
|
|
91
|
-
sample_format: hound::SampleFormat::Int,
|
|
92
|
-
};
|
|
93
|
-
|
|
94
|
-
let mut writer = hound::WavWriter::create(output_dir, spec)
|
|
95
|
-
.map_err(|e| format!("Error creating WAV file: {}", e))?;
|
|
96
|
-
|
|
97
|
-
for sample in &self.buffer {
|
|
98
|
-
writer
|
|
99
|
-
.write_sample(*sample)
|
|
100
|
-
.map_err(|e| format!("Error writing sample: {:?}", e))?;
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
writer
|
|
104
|
-
.finalize()
|
|
105
|
-
.map_err(|e| format!("Error finalizing WAV: {:?}", e))?;
|
|
106
|
-
|
|
107
|
-
Ok(())
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
// Insert note moved here from original engine.rs
|
|
111
|
-
pub fn insert_note(
|
|
112
|
-
&mut self,
|
|
113
|
-
waveform: String,
|
|
114
|
-
freq: f32,
|
|
115
|
-
amp: f32,
|
|
116
|
-
start_time_ms: f32,
|
|
117
|
-
duration_ms: f32,
|
|
118
|
-
synth_params: HashMap<String, Value>,
|
|
119
|
-
note_params: HashMap<String, Value>,
|
|
120
|
-
automation: Option<HashMap<String, Value>>,
|
|
121
|
-
) {
|
|
122
|
-
// Keep internal logic; helpers called from helpers module
|
|
123
|
-
let attack = self.extract_f32(&synth_params, "attack").unwrap_or(0.0);
|
|
124
|
-
let decay = self.extract_f32(&synth_params, "decay").unwrap_or(0.0);
|
|
125
|
-
let sustain = self.extract_f32(&synth_params, "sustain").unwrap_or(1.0);
|
|
126
|
-
let release = self.extract_f32(&synth_params, "release").unwrap_or(0.0);
|
|
127
|
-
let attack_s = if attack > 10.0 {
|
|
128
|
-
attack / 1000.0
|
|
129
|
-
} else {
|
|
130
|
-
attack
|
|
131
|
-
};
|
|
132
|
-
let decay_s = if decay > 10.0 { decay / 1000.0 } else { decay };
|
|
133
|
-
let release_s = if release > 10.0 {
|
|
134
|
-
release / 1000.0
|
|
135
|
-
} else {
|
|
136
|
-
release
|
|
137
|
-
};
|
|
138
|
-
let sustain_level = if sustain > 1.0 {
|
|
139
|
-
(sustain / 100.0).clamp(0.0, 1.0)
|
|
140
|
-
} else {
|
|
141
|
-
sustain.clamp(0.0, 1.0)
|
|
142
|
-
};
|
|
143
|
-
|
|
144
|
-
let duration_ms = self
|
|
145
|
-
.extract_f32(¬e_params, "duration")
|
|
146
|
-
.unwrap_or(duration_ms);
|
|
147
|
-
let velocity = self.extract_f32(¬e_params, "velocity").unwrap_or(1.0);
|
|
148
|
-
let glide = self.extract_boolean(¬e_params, "glide").unwrap_or(false);
|
|
149
|
-
let slide = self.extract_boolean(¬e_params, "slide").unwrap_or(false);
|
|
150
|
-
|
|
151
|
-
let _amplitude = (i16::MAX as f32) * amp.clamp(0.0, 1.0) * velocity.clamp(0.0, 1.0);
|
|
152
|
-
|
|
153
|
-
let freq_start = freq;
|
|
154
|
-
let mut freq_end = freq;
|
|
155
|
-
let amp_start = amp * velocity.clamp(0.0, 1.0);
|
|
156
|
-
let mut amp_end = amp_start;
|
|
157
|
-
|
|
158
|
-
if glide {
|
|
159
|
-
if let Some(Value::Number(target_freq)) = note_params.get("target_freq") {
|
|
160
|
-
freq_end = *target_freq;
|
|
161
|
-
} else {
|
|
162
|
-
freq_end = freq * 1.5;
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
|
|
166
|
-
if slide {
|
|
167
|
-
if let Some(Value::Number(target_amp)) = note_params.get("target_amp") {
|
|
168
|
-
amp_end = *target_amp * velocity.clamp(0.0, 1.0);
|
|
169
|
-
} else {
|
|
170
|
-
amp_end = amp_start * 0.5;
|
|
171
|
-
}
|
|
172
|
-
}
|
|
173
|
-
|
|
174
|
-
let sample_rate = SAMPLE_RATE as f32;
|
|
175
|
-
let channels = CHANNELS as usize;
|
|
176
|
-
|
|
177
|
-
let total_samples = ((duration_ms / 1000.0) * sample_rate) as usize;
|
|
178
|
-
let start_sample = ((start_time_ms / 1000.0) * sample_rate) as usize;
|
|
179
|
-
|
|
180
|
-
let (volume_env, pan_env, pitch_env) =
|
|
181
|
-
crate::core::audio::engine::helpers::env_maps_from_automation(&automation);
|
|
182
|
-
|
|
183
|
-
let mut stereo_samples: Vec<i16> = Vec::with_capacity(total_samples * 2);
|
|
184
|
-
let fade_len = (sample_rate * 0.01) as usize; // 10 ms fade
|
|
185
|
-
|
|
186
|
-
let attack_samples = (attack_s * sample_rate) as usize;
|
|
187
|
-
let decay_samples = (decay_s * sample_rate) as usize;
|
|
188
|
-
let release_samples = (release_s * sample_rate) as usize;
|
|
189
|
-
let sustain_samples = if total_samples > attack_samples + decay_samples + release_samples {
|
|
190
|
-
total_samples - attack_samples - decay_samples - release_samples
|
|
191
|
-
} else {
|
|
192
|
-
0
|
|
193
|
-
};
|
|
194
|
-
|
|
195
|
-
for i in 0..total_samples {
|
|
196
|
-
let t = ((start_sample + i) as f32) / sample_rate;
|
|
197
|
-
|
|
198
|
-
// Glide
|
|
199
|
-
let current_freq = if glide {
|
|
200
|
-
freq_start + ((freq_end - freq_start) * (i as f32)) / (total_samples as f32)
|
|
201
|
-
} else {
|
|
202
|
-
freq
|
|
203
|
-
};
|
|
204
|
-
|
|
205
|
-
// Pitch automation (in semitones), applied as frequency multiplier
|
|
206
|
-
let pitch_semi = crate::core::audio::engine::helpers::eval_env_map(
|
|
207
|
-
&pitch_env,
|
|
208
|
-
(i as f32) / (total_samples as f32),
|
|
209
|
-
0.0,
|
|
210
|
-
);
|
|
211
|
-
let current_freq = current_freq * (2.0_f32).powf(pitch_semi / 12.0);
|
|
212
|
-
|
|
213
|
-
// Slide
|
|
214
|
-
let current_amp = if slide {
|
|
215
|
-
amp_start + ((amp_end - amp_start) * (i as f32)) / (total_samples as f32)
|
|
216
|
-
} else {
|
|
217
|
-
amp_start
|
|
218
|
-
};
|
|
219
|
-
|
|
220
|
-
let mut value =
|
|
221
|
-
crate::core::audio::engine::helpers::oscillator_sample(&waveform, current_freq, t);
|
|
222
|
-
|
|
223
|
-
// ADSR envelope
|
|
224
|
-
let envelope = crate::core::audio::engine::helpers::adsr_envelope_value(
|
|
225
|
-
i,
|
|
226
|
-
attack_samples,
|
|
227
|
-
decay_samples,
|
|
228
|
-
sustain_samples,
|
|
229
|
-
release_samples,
|
|
230
|
-
sustain_level,
|
|
231
|
-
);
|
|
232
|
-
|
|
233
|
-
// Fade in/out
|
|
234
|
-
if fade_len > 0 && i < fade_len {
|
|
235
|
-
if fade_len == 1 {
|
|
236
|
-
value *= 0.0;
|
|
237
|
-
} else {
|
|
238
|
-
value *= (i as f32) / (fade_len as f32);
|
|
239
|
-
}
|
|
240
|
-
} else if fade_len > 0 && i >= total_samples.saturating_sub(fade_len) {
|
|
241
|
-
if fade_len == 1 {
|
|
242
|
-
value *= 0.0;
|
|
243
|
-
} else {
|
|
244
|
-
// ensure last sample becomes exactly zero to avoid clicks
|
|
245
|
-
value *= ((total_samples - 1 - i) as f32) / ((fade_len - 1) as f32);
|
|
246
|
-
}
|
|
247
|
-
}
|
|
248
|
-
|
|
249
|
-
value *= envelope;
|
|
250
|
-
let mut sample_val = value * (i16::MAX as f32) * current_amp;
|
|
251
|
-
|
|
252
|
-
let vol_mul = crate::core::audio::engine::helpers::eval_env_map(
|
|
253
|
-
&volume_env,
|
|
254
|
-
(i as f32) / (total_samples as f32),
|
|
255
|
-
1.0,
|
|
256
|
-
)
|
|
257
|
-
.clamp(0.0, 10.0);
|
|
258
|
-
sample_val *= vol_mul;
|
|
259
|
-
|
|
260
|
-
let pan_val = crate::core::audio::engine::helpers::eval_env_map(
|
|
261
|
-
&pan_env,
|
|
262
|
-
(i as f32) / (total_samples as f32),
|
|
263
|
-
0.0,
|
|
264
|
-
)
|
|
265
|
-
.clamp(-1.0, 1.0);
|
|
266
|
-
let (left_gain, right_gain) = crate::core::audio::engine::helpers::pan_gains(pan_val);
|
|
267
|
-
|
|
268
|
-
let left = (sample_val * left_gain)
|
|
269
|
-
.round()
|
|
270
|
-
.clamp(i16::MIN as f32, i16::MAX as f32) as i16;
|
|
271
|
-
let right = (sample_val * right_gain)
|
|
272
|
-
.round()
|
|
273
|
-
.clamp(i16::MIN as f32, i16::MAX as f32) as i16;
|
|
274
|
-
|
|
275
|
-
stereo_samples.push(left);
|
|
276
|
-
stereo_samples.push(right);
|
|
277
|
-
}
|
|
278
|
-
|
|
279
|
-
// Increment note counter for diagnostics
|
|
280
|
-
self.note_count = self.note_count.saturating_add(1);
|
|
281
|
-
|
|
282
|
-
crate::core::audio::engine::helpers::mix_stereo_samples_into_buffer(
|
|
283
|
-
self,
|
|
284
|
-
start_sample,
|
|
285
|
-
channels,
|
|
286
|
-
&stereo_samples,
|
|
287
|
-
);
|
|
288
|
-
}
|
|
289
|
-
|
|
290
|
-
// helper extraction functions left in this struct for now
|
|
291
|
-
fn extract_f32(&self, map: &HashMap<String, Value>, key: &str) -> Option<f32> {
|
|
292
|
-
match map.get(key) {
|
|
293
|
-
Some(Value::Number(n)) => Some(*n),
|
|
294
|
-
Some(Value::String(s)) => s.parse::<f32>().ok(),
|
|
295
|
-
Some(Value::Boolean(b)) => Some(if *b { 1.0 } else { 0.0 }),
|
|
296
|
-
_ => None,
|
|
297
|
-
}
|
|
298
|
-
}
|
|
299
|
-
|
|
300
|
-
fn extract_boolean(&self, map: &HashMap<String, Value>, key: &str) -> Option<bool> {
|
|
301
|
-
match map.get(key) {
|
|
302
|
-
Some(Value::Boolean(b)) => Some(*b),
|
|
303
|
-
Some(Value::Number(n)) => Some(*n != 0.0),
|
|
304
|
-
Some(Value::Identifier(s)) => {
|
|
305
|
-
if s == "true" {
|
|
306
|
-
Some(true)
|
|
307
|
-
} else if s == "false" {
|
|
308
|
-
Some(false)
|
|
309
|
-
} else {
|
|
310
|
-
None
|
|
311
|
-
}
|
|
312
|
-
}
|
|
313
|
-
Some(Value::String(s)) => {
|
|
314
|
-
if s == "true" {
|
|
315
|
-
Some(true)
|
|
316
|
-
} else if s == "false" {
|
|
317
|
-
Some(false)
|
|
318
|
-
} else {
|
|
319
|
-
None
|
|
320
|
-
}
|
|
321
|
-
}
|
|
322
|
-
_ => None,
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
|
-
}
|
|
@@ -1,311 +0,0 @@
|
|
|
1
|
-
use crate::core::{
|
|
2
|
-
audio::engine::AudioEngine,
|
|
3
|
-
parser::statement::{Statement, StatementKind},
|
|
4
|
-
plugin::runner::WasmPluginRunner,
|
|
5
|
-
store::{global::GlobalStore, variable::VariableTable},
|
|
6
|
-
};
|
|
7
|
-
use devalang_types::Value;
|
|
8
|
-
use devalang_utils::logger::{LogLevel, Logger};
|
|
9
|
-
|
|
10
|
-
use std::collections::HashMap;
|
|
11
|
-
|
|
12
|
-
pub fn interprete_call_arrow_statement(
|
|
13
|
-
stmt: &Statement,
|
|
14
|
-
audio_engine: &mut AudioEngine,
|
|
15
|
-
variable_table: &VariableTable,
|
|
16
|
-
global_store: &GlobalStore,
|
|
17
|
-
base_bpm: f32,
|
|
18
|
-
base_duration: f32,
|
|
19
|
-
max_end_time: &mut f32,
|
|
20
|
-
mut cursor_time: Option<&mut f32>,
|
|
21
|
-
update_cursor: bool,
|
|
22
|
-
) -> (f32, f32) {
|
|
23
|
-
let cursor_copy = cursor_time.as_ref().map(|c| **c).unwrap_or(0.0);
|
|
24
|
-
|
|
25
|
-
if let StatementKind::ArrowCall {
|
|
26
|
-
target,
|
|
27
|
-
method,
|
|
28
|
-
args,
|
|
29
|
-
} = &stmt.kind
|
|
30
|
-
{
|
|
31
|
-
let Some(Value::Statement(synth_stmt)) = variable_table.get(target) else {
|
|
32
|
-
let logger = Logger::new();
|
|
33
|
-
logger.log_message(
|
|
34
|
-
LogLevel::Error,
|
|
35
|
-
&format!("Synth '{}' not found in variable table", target),
|
|
36
|
-
);
|
|
37
|
-
return (*max_end_time, cursor_copy);
|
|
38
|
-
};
|
|
39
|
-
|
|
40
|
-
let Value::Map(synth_map) = &synth_stmt.value else {
|
|
41
|
-
let logger = Logger::new();
|
|
42
|
-
logger.log_message(
|
|
43
|
-
LogLevel::Error,
|
|
44
|
-
&format!("Invalid synth statement for '{}', expected a map.", target),
|
|
45
|
-
);
|
|
46
|
-
return (*max_end_time, cursor_copy);
|
|
47
|
-
};
|
|
48
|
-
|
|
49
|
-
let Some(Value::String(entity)) = synth_map.get("entity") else {
|
|
50
|
-
let logger = Logger::new();
|
|
51
|
-
logger.log_message(
|
|
52
|
-
LogLevel::Error,
|
|
53
|
-
&format!("Missing 'entity' key in synth '{}'.", target),
|
|
54
|
-
);
|
|
55
|
-
return (*max_end_time, cursor_copy);
|
|
56
|
-
};
|
|
57
|
-
|
|
58
|
-
if entity != "synth" {
|
|
59
|
-
let logger = Logger::new();
|
|
60
|
-
logger.log_message(
|
|
61
|
-
LogLevel::Error,
|
|
62
|
-
&format!("'{}' is not a synth, entity is '{}'.", target, entity),
|
|
63
|
-
);
|
|
64
|
-
return (*max_end_time, cursor_copy);
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
let Some(Value::Map(value_map)) = synth_map.get("value") else {
|
|
68
|
-
let logger = Logger::new();
|
|
69
|
-
logger.log_message(
|
|
70
|
-
LogLevel::Error,
|
|
71
|
-
&format!("Missing 'value' map in synth '{}'.", target),
|
|
72
|
-
);
|
|
73
|
-
return (*max_end_time, cursor_copy);
|
|
74
|
-
};
|
|
75
|
-
|
|
76
|
-
let waveform_str = match value_map.get("waveform") {
|
|
77
|
-
Some(Value::String(s)) => s.clone(),
|
|
78
|
-
Some(Value::Identifier(s)) => s.clone(),
|
|
79
|
-
_ => {
|
|
80
|
-
let logger = Logger::new();
|
|
81
|
-
logger.log_message(
|
|
82
|
-
LogLevel::Error,
|
|
83
|
-
&format!("Missing or invalid 'waveform' in synth '{}'.", target),
|
|
84
|
-
);
|
|
85
|
-
return (*max_end_time, cursor_copy);
|
|
86
|
-
}
|
|
87
|
-
};
|
|
88
|
-
let Some(Value::Map(params)) = value_map.get("parameters") else {
|
|
89
|
-
println!("❌ Missing or invalid 'parameters' in synth '{}'.", target);
|
|
90
|
-
return (*max_end_time, cursor_copy);
|
|
91
|
-
};
|
|
92
|
-
|
|
93
|
-
// Synth parameters
|
|
94
|
-
let synth_params = params.clone();
|
|
95
|
-
let amp = extract_f32(&synth_params, "amp", base_bpm).unwrap_or(1.0);
|
|
96
|
-
|
|
97
|
-
if method == "note" {
|
|
98
|
-
let filtered_args: Vec<_> = args
|
|
99
|
-
.iter()
|
|
100
|
-
.filter(|arg| !matches!(arg, Value::Unknown))
|
|
101
|
-
.collect();
|
|
102
|
-
|
|
103
|
-
let Some(Value::Identifier(note_name)) = filtered_args.first().map(|v| (*v).clone())
|
|
104
|
-
else {
|
|
105
|
-
println!(
|
|
106
|
-
"❌ Invalid or missing argument for 'note' method on '{}'.",
|
|
107
|
-
target
|
|
108
|
-
);
|
|
109
|
-
return (*max_end_time, cursor_copy);
|
|
110
|
-
};
|
|
111
|
-
|
|
112
|
-
let mut note_params = HashMap::new();
|
|
113
|
-
if let Some(arg1) = filtered_args.get(1) {
|
|
114
|
-
if let Value::Map(map) = (*arg1).clone() {
|
|
115
|
-
for (key, value) in map {
|
|
116
|
-
note_params.insert(key, value);
|
|
117
|
-
}
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
// Note parameters and calculations
|
|
122
|
-
let amp_note = extract_f32(¬e_params, "amp", base_bpm).unwrap_or(amp);
|
|
123
|
-
let duration_ms =
|
|
124
|
-
extract_f32(¬e_params, "duration", base_bpm).unwrap_or(base_duration * 1000.0);
|
|
125
|
-
|
|
126
|
-
let duration_secs = duration_ms / 1000.0;
|
|
127
|
-
let final_freq = note_to_freq(¬e_name);
|
|
128
|
-
let start_time = cursor_copy;
|
|
129
|
-
let end_time = start_time + duration_secs;
|
|
130
|
-
|
|
131
|
-
// Fetch automation map if present:
|
|
132
|
-
// - Global (per-synth): key "<target>__automation" => map with key "params"
|
|
133
|
-
// - Per-note: note parameter "automate" => map
|
|
134
|
-
let auto_key = format!("{}__automation", target);
|
|
135
|
-
let synth_automation = match variable_table.get(&auto_key) {
|
|
136
|
-
Some(Value::Map(map)) => match map.get("params") {
|
|
137
|
-
Some(Value::Map(p)) => Some(p.clone()),
|
|
138
|
-
_ => None,
|
|
139
|
-
},
|
|
140
|
-
_ => None,
|
|
141
|
-
};
|
|
142
|
-
|
|
143
|
-
let note_automation = match note_params.get("automate") {
|
|
144
|
-
Some(Value::Map(m)) => Some(m.clone()),
|
|
145
|
-
_ => None,
|
|
146
|
-
};
|
|
147
|
-
|
|
148
|
-
// Merge: per-note overrides synth automation per key (volume/pan/pitch)
|
|
149
|
-
let automation = match (synth_automation, note_automation) {
|
|
150
|
-
(Some(mut a), Some(n)) => {
|
|
151
|
-
for (k, v) in n {
|
|
152
|
-
a.insert(k, v);
|
|
153
|
-
}
|
|
154
|
-
Some(a)
|
|
155
|
-
}
|
|
156
|
-
(None, Some(n)) => Some(n),
|
|
157
|
-
(Some(a), None) => Some(a),
|
|
158
|
-
_ => None,
|
|
159
|
-
};
|
|
160
|
-
|
|
161
|
-
// If waveform references a plugin alias (e.g., alias.synth), use the WASM plugin runner
|
|
162
|
-
if waveform_str.contains('.') && waveform_str.ends_with(".synth") {
|
|
163
|
-
let alias = waveform_str.split('.').next().unwrap_or("");
|
|
164
|
-
if let Some(Value::String(uri)) = variable_table.get(alias) {
|
|
165
|
-
if let Some(id) = uri.strip_prefix("devalang://plugin/") {
|
|
166
|
-
let mut parts = id.split('.');
|
|
167
|
-
let author = parts.next().unwrap_or("");
|
|
168
|
-
let name = parts.next().unwrap_or("");
|
|
169
|
-
let key = format!("{}:{}", author, name);
|
|
170
|
-
if let Some((_info, wasm_bytes)) = global_store.plugins.get(&key) {
|
|
171
|
-
// Prepare buffer (stereo f32)
|
|
172
|
-
let sample_rate = 44100.0_f32;
|
|
173
|
-
let total_samples = ((duration_ms / 1000.0) * sample_rate) as usize;
|
|
174
|
-
let channels = 2usize;
|
|
175
|
-
let start_index = ((start_time * sample_rate) as usize) * channels;
|
|
176
|
-
let required_len = start_index + total_samples * channels;
|
|
177
|
-
if audio_engine.buffer.len() < required_len {
|
|
178
|
-
audio_engine.buffer.resize(required_len, 0);
|
|
179
|
-
}
|
|
180
|
-
let mut fbuf = vec![0.0f32; total_samples * channels];
|
|
181
|
-
let runner = WasmPluginRunner::new();
|
|
182
|
-
let mut params_num: std::collections::HashMap<String, f32> =
|
|
183
|
-
std::collections::HashMap::new();
|
|
184
|
-
let mut params_str: std::collections::HashMap<String, String> =
|
|
185
|
-
std::collections::HashMap::new();
|
|
186
|
-
for (k, v) in synth_params.iter() {
|
|
187
|
-
match v {
|
|
188
|
-
Value::Number(n) => {
|
|
189
|
-
params_num.insert(k.clone(), *n);
|
|
190
|
-
}
|
|
191
|
-
Value::String(s) => {
|
|
192
|
-
params_str.insert(k.clone(), s.clone());
|
|
193
|
-
}
|
|
194
|
-
Value::Identifier(s) => {
|
|
195
|
-
params_str.insert(k.clone(), s.clone());
|
|
196
|
-
}
|
|
197
|
-
_ => {}
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
|
-
let _ = runner.render_note_with_params_in_place(
|
|
201
|
-
wasm_bytes,
|
|
202
|
-
&mut fbuf,
|
|
203
|
-
None,
|
|
204
|
-
final_freq,
|
|
205
|
-
amp_note,
|
|
206
|
-
duration_ms as i32,
|
|
207
|
-
44100,
|
|
208
|
-
2,
|
|
209
|
-
¶ms_num,
|
|
210
|
-
Some(¶ms_str),
|
|
211
|
-
);
|
|
212
|
-
for (i, sample) in
|
|
213
|
-
fbuf.iter().enumerate().take(total_samples * channels)
|
|
214
|
-
{
|
|
215
|
-
let s = (sample.clamp(-1.0, 1.0) * (i16::MAX as f32)) as i16;
|
|
216
|
-
let idx = start_index + i;
|
|
217
|
-
audio_engine.buffer[idx] =
|
|
218
|
-
audio_engine.buffer[idx].saturating_add(s);
|
|
219
|
-
}
|
|
220
|
-
} else {
|
|
221
|
-
let logger = Logger::new();
|
|
222
|
-
logger.log_message(
|
|
223
|
-
LogLevel::Warning,
|
|
224
|
-
&format!(
|
|
225
|
-
"Plugin bytes not found for key '{}' (alias '{}').",
|
|
226
|
-
key, alias
|
|
227
|
-
),
|
|
228
|
-
);
|
|
229
|
-
}
|
|
230
|
-
} else {
|
|
231
|
-
let logger = Logger::new();
|
|
232
|
-
logger.log_message(
|
|
233
|
-
LogLevel::Warning,
|
|
234
|
-
&format!("Invalid plugin URI in alias '{}': {}", alias, uri),
|
|
235
|
-
);
|
|
236
|
-
}
|
|
237
|
-
} else {
|
|
238
|
-
let logger = Logger::new();
|
|
239
|
-
logger.log_message(
|
|
240
|
-
LogLevel::Warning,
|
|
241
|
-
&format!("Plugin alias '{}' not found in variable table.", alias),
|
|
242
|
-
);
|
|
243
|
-
}
|
|
244
|
-
} else {
|
|
245
|
-
audio_engine.insert_note(
|
|
246
|
-
waveform_str.clone(),
|
|
247
|
-
final_freq,
|
|
248
|
-
amp_note,
|
|
249
|
-
start_time * 1000.0,
|
|
250
|
-
duration_ms,
|
|
251
|
-
synth_params,
|
|
252
|
-
note_params,
|
|
253
|
-
automation,
|
|
254
|
-
);
|
|
255
|
-
}
|
|
256
|
-
|
|
257
|
-
*max_end_time = (*max_end_time).max(end_time);
|
|
258
|
-
|
|
259
|
-
if update_cursor {
|
|
260
|
-
if let Some(c) = cursor_time.as_mut() {
|
|
261
|
-
**c = end_time;
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
return (*max_end_time, end_time);
|
|
266
|
-
} else {
|
|
267
|
-
let logger = Logger::new();
|
|
268
|
-
logger.log_message(
|
|
269
|
-
LogLevel::Error,
|
|
270
|
-
&format!("Unknown method '{}' on synth '{}'.", method, target),
|
|
271
|
-
);
|
|
272
|
-
}
|
|
273
|
-
}
|
|
274
|
-
|
|
275
|
-
(*max_end_time, cursor_copy)
|
|
276
|
-
}
|
|
277
|
-
|
|
278
|
-
fn extract_f32(map: &HashMap<String, Value>, key: &str, base_bpm: f32) -> Option<f32> {
|
|
279
|
-
map.get(key).and_then(|v| match v {
|
|
280
|
-
Value::Number(n) => Some(*n),
|
|
281
|
-
Value::Beat(beat_str) => {
|
|
282
|
-
let parts: Vec<&str> = beat_str.split('/').collect();
|
|
283
|
-
if parts.len() == 2 {
|
|
284
|
-
let numerator = parts[0].parse::<f32>().ok()?;
|
|
285
|
-
let denominator = parts[1].parse::<f32>().ok()?;
|
|
286
|
-
|
|
287
|
-
Some((numerator / denominator) * ((60.0 / base_bpm) * 1000.0))
|
|
288
|
-
} else {
|
|
289
|
-
None
|
|
290
|
-
}
|
|
291
|
-
}
|
|
292
|
-
_ => None,
|
|
293
|
-
})
|
|
294
|
-
}
|
|
295
|
-
|
|
296
|
-
fn note_to_freq(note: &str) -> f32 {
|
|
297
|
-
let notes = [
|
|
298
|
-
"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B",
|
|
299
|
-
];
|
|
300
|
-
|
|
301
|
-
if note.len() < 2 || note.len() > 3 {
|
|
302
|
-
return 440.0;
|
|
303
|
-
}
|
|
304
|
-
|
|
305
|
-
let (name, octave_str) = note.split_at(note.len() - 1);
|
|
306
|
-
let semitone = notes.iter().position(|&n| n == name).unwrap_or(9) as i32;
|
|
307
|
-
let octave = octave_str.parse::<i32>().unwrap_or(4);
|
|
308
|
-
let midi_note = (octave + 1) * 12 + semitone;
|
|
309
|
-
|
|
310
|
-
440.0 * (2.0_f32).powf(((midi_note as f32) - 69.0) / 12.0)
|
|
311
|
-
}
|
|
@@ -1,54 +0,0 @@
|
|
|
1
|
-
use crate::core::{
|
|
2
|
-
audio::{engine::AudioEngine, interpreter::driver::run_audio_program},
|
|
3
|
-
parser::statement::Statement,
|
|
4
|
-
store::global::GlobalStore,
|
|
5
|
-
};
|
|
6
|
-
use devalang_utils::logger::{LogLevel, Logger};
|
|
7
|
-
use std::collections::HashMap;
|
|
8
|
-
|
|
9
|
-
pub fn render_audio_with_modules(
|
|
10
|
-
modules: HashMap<String, Vec<Statement>>,
|
|
11
|
-
output_dir: &str,
|
|
12
|
-
global_store: &mut GlobalStore,
|
|
13
|
-
) -> HashMap<String, AudioEngine> {
|
|
14
|
-
let mut result = HashMap::new();
|
|
15
|
-
|
|
16
|
-
for (module_name, statements) in modules {
|
|
17
|
-
let mut global_max_end_time: f32 = 0.0;
|
|
18
|
-
let mut audio_engine = AudioEngine::new(module_name.clone());
|
|
19
|
-
|
|
20
|
-
// Apply global variables to the initial engine
|
|
21
|
-
if let Some(module) = global_store.get_module(&module_name) {
|
|
22
|
-
// interprete statements to fill the audio buffer
|
|
23
|
-
let (module_max_end_time, _cursor_time) = run_audio_program(
|
|
24
|
-
&statements,
|
|
25
|
-
&mut audio_engine,
|
|
26
|
-
module_name.clone(),
|
|
27
|
-
output_dir.to_string(),
|
|
28
|
-
module.variable_table.clone(),
|
|
29
|
-
module.function_table.clone(),
|
|
30
|
-
global_store,
|
|
31
|
-
);
|
|
32
|
-
|
|
33
|
-
// Verify if the buffer is silent (all samples are zero)
|
|
34
|
-
if audio_engine.buffer.iter().all(|&s| s == 0) {
|
|
35
|
-
let logger = Logger::new();
|
|
36
|
-
logger.log_message(
|
|
37
|
-
LogLevel::Warning,
|
|
38
|
-
&format!(
|
|
39
|
-
"Module '{}' ignored: silent buffer (no non-zero samples)",
|
|
40
|
-
module_name
|
|
41
|
-
),
|
|
42
|
-
);
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
// Determines the maximum end time for the module
|
|
46
|
-
global_max_end_time = global_max_end_time.max(module_max_end_time);
|
|
47
|
-
audio_engine.set_duration(global_max_end_time);
|
|
48
|
-
|
|
49
|
-
result.insert(module_name, audio_engine);
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
result
|
|
54
|
-
}
|