@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,35 +0,0 @@
|
|
|
1
|
-
use crate::cli::install::addon::install_addon;
|
|
2
|
-
#[cfg(feature = "cli")]
|
|
3
|
-
use devalang_types::AddonType;
|
|
4
|
-
use devalang_utils::path as path_utils;
|
|
5
|
-
|
|
6
|
-
/// Handles the installation command for a given addon type and name.
|
|
7
|
-
#[cfg(feature = "cli")]
|
|
8
|
-
pub async fn handle_install_command(name: String, addon_type: AddonType) -> Result<(), String> {
|
|
9
|
-
use devalang_utils::{
|
|
10
|
-
logger::{LogLevel, Logger},
|
|
11
|
-
spinner::start_spinner,
|
|
12
|
-
};
|
|
13
|
-
|
|
14
|
-
let logger = Logger::new();
|
|
15
|
-
let deva_dir = path_utils::ensure_deva_dir()?;
|
|
16
|
-
|
|
17
|
-
let spinner = start_spinner("Installing...");
|
|
18
|
-
|
|
19
|
-
if let Err(e) = install_addon(addon_type.clone(), name.as_str(), &deva_dir).await {
|
|
20
|
-
spinner.finish_and_clear();
|
|
21
|
-
logger.log_message_with_trace(
|
|
22
|
-
LogLevel::Error,
|
|
23
|
-
&format!("Error installing {:?} '{}'", addon_type, name),
|
|
24
|
-
vec![&e],
|
|
25
|
-
);
|
|
26
|
-
} else {
|
|
27
|
-
spinner.finish_and_clear();
|
|
28
|
-
logger.log_message(
|
|
29
|
-
LogLevel::Success,
|
|
30
|
-
&format!("{:?} '{}' installed successfully!", addon_type, name),
|
|
31
|
-
);
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
Ok(())
|
|
35
|
-
}
|
package/rust/cli/install/mod.rs
DELETED
|
@@ -1,61 +0,0 @@
|
|
|
1
|
-
use crate::{
|
|
2
|
-
config::ops::load_config,
|
|
3
|
-
web::cdn::{download_from_cdn, get_cdn_url},
|
|
4
|
-
};
|
|
5
|
-
use devalang_utils::path as path_utils;
|
|
6
|
-
use std::{fs, path::Path};
|
|
7
|
-
|
|
8
|
-
pub async fn install_plugin(name: &str, target_dir: &Path) -> Result<(), String> {
|
|
9
|
-
let cdn_url = get_cdn_url();
|
|
10
|
-
let url = format!("{}/plugin/{}/download", cdn_url, name);
|
|
11
|
-
|
|
12
|
-
let plugin_dir = target_dir.join("plugins");
|
|
13
|
-
|
|
14
|
-
// Ensure .deva/tmp exists and build archive path
|
|
15
|
-
let deva_dir = path_utils::ensure_deva_dir()?;
|
|
16
|
-
let tmp_dir = deva_dir.join("tmp");
|
|
17
|
-
if !tmp_dir.exists() {
|
|
18
|
-
fs::create_dir_all(&tmp_dir)
|
|
19
|
-
.map_err(|e| format!("Failed to create tmp dir '{}': {}", tmp_dir.display(), e))?;
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
let archive_path = tmp_dir.join(format!("{}.devaplugin", name));
|
|
23
|
-
let extract_path = plugin_dir.join(name);
|
|
24
|
-
|
|
25
|
-
if extract_path.exists() {
|
|
26
|
-
println!(
|
|
27
|
-
"Plugin '{}' already exists at '{}'. Skipping install.",
|
|
28
|
-
name,
|
|
29
|
-
extract_path.display()
|
|
30
|
-
);
|
|
31
|
-
return Ok(());
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
download_from_cdn(&url, &archive_path)
|
|
35
|
-
.await
|
|
36
|
-
.map_err(|e| format!("Failed to download: {}", e))?;
|
|
37
|
-
|
|
38
|
-
// Add the plugin to the config: locate project root from target_dir
|
|
39
|
-
let project_root = path_utils::find_project_root_from(target_dir)
|
|
40
|
-
.ok_or_else(|| "Failed to determine project root from target_dir".to_string())?;
|
|
41
|
-
|
|
42
|
-
let config_path = project_root.join(path_utils::DEVALANG_CONFIG);
|
|
43
|
-
if !config_path.exists() {
|
|
44
|
-
return Err(format!(
|
|
45
|
-
"Config file not found at '{}'. Please run 'devalang init' before adding an addon",
|
|
46
|
-
config_path.display()
|
|
47
|
-
));
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
let _config = load_config(Some(&config_path))
|
|
51
|
-
.ok_or_else(|| format!("Failed to load config from '{}'", config_path.display()))?;
|
|
52
|
-
|
|
53
|
-
let _dependency_path = &format!("devalang://plugin/{}", name);
|
|
54
|
-
|
|
55
|
-
devalang_utils::file::extract_zip_safely(&archive_path, &extract_path)
|
|
56
|
-
.map_err(|e| format!("Failed to extract: {}", e))?;
|
|
57
|
-
|
|
58
|
-
// TODO: Add the plugin to the config
|
|
59
|
-
|
|
60
|
-
Ok(())
|
|
61
|
-
}
|
|
@@ -1,366 +0,0 @@
|
|
|
1
|
-
use crate::core::{store::variable::VariableTable, utils::path::normalize_path};
|
|
2
|
-
use devalang_types::Value;
|
|
3
|
-
use rodio::{Decoder, Source};
|
|
4
|
-
use std::{collections::HashMap, fs::File, io::BufReader, path::Path};
|
|
5
|
-
|
|
6
|
-
const SAMPLE_RATE: u32 = 44100;
|
|
7
|
-
const CHANNELS: u16 = 2;
|
|
8
|
-
|
|
9
|
-
impl super::synth::AudioEngine {
|
|
10
|
-
pub fn insert_sample(
|
|
11
|
-
&mut self,
|
|
12
|
-
filepath: &str,
|
|
13
|
-
time_secs: f32,
|
|
14
|
-
dur_sec: f32,
|
|
15
|
-
effects: Option<HashMap<String, Value>>,
|
|
16
|
-
variable_table: &VariableTable,
|
|
17
|
-
) {
|
|
18
|
-
if filepath.is_empty() {
|
|
19
|
-
eprintln!("❌ Empty file path provided for audio sample.");
|
|
20
|
-
return;
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
let module_root = Path::new(&self.module_name);
|
|
24
|
-
let root = match devalang_utils::path::get_project_root() {
|
|
25
|
-
Ok(p) => p,
|
|
26
|
-
Err(_) => std::env::current_dir().unwrap_or_else(|_| std::path::PathBuf::from(".")),
|
|
27
|
-
};
|
|
28
|
-
let resolved_path: String;
|
|
29
|
-
|
|
30
|
-
let mut var_path = filepath.to_string();
|
|
31
|
-
if let Some(Value::String(variable_path)) = variable_table.variables.get(filepath) {
|
|
32
|
-
var_path = variable_path.clone();
|
|
33
|
-
} else if let Some(Value::Sample(sample_path)) = variable_table.variables.get(filepath) {
|
|
34
|
-
var_path = sample_path.clone();
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
if var_path.starts_with("devalang://") {
|
|
38
|
-
let path_after_protocol = var_path.replace("devalang://", "");
|
|
39
|
-
let parts: Vec<&str> = path_after_protocol.split('/').collect();
|
|
40
|
-
|
|
41
|
-
if parts.len() < 3 {
|
|
42
|
-
eprintln!(
|
|
43
|
-
"❌ Invalid devalang:// path format. Expected devalang://<type>/<author>.<bank>/<entity>"
|
|
44
|
-
);
|
|
45
|
-
return;
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
let obj_type = parts[0];
|
|
49
|
-
let bank_name = parts[1];
|
|
50
|
-
// Rejoin the remainder as the entity path so bank entries can contain
|
|
51
|
-
// nested paths like "subdir/sample.wav" or plain names.
|
|
52
|
-
let entity_name = parts[2..].join("/");
|
|
53
|
-
|
|
54
|
-
let deva_dir = match devalang_utils::path::get_deva_dir() {
|
|
55
|
-
Ok(dir) => dir,
|
|
56
|
-
Err(e) => {
|
|
57
|
-
eprintln!("❌ {}", e);
|
|
58
|
-
return;
|
|
59
|
-
}
|
|
60
|
-
};
|
|
61
|
-
let subdir = match obj_type {
|
|
62
|
-
"bank" => "banks",
|
|
63
|
-
"plugin" => "plugins",
|
|
64
|
-
"preset" => "presets",
|
|
65
|
-
"template" => "templates",
|
|
66
|
-
other => other,
|
|
67
|
-
};
|
|
68
|
-
|
|
69
|
-
// Determine the bank audio base directory. Prefer an optional
|
|
70
|
-
// `audioPath` declared in the bank's bank.toml (supports keys
|
|
71
|
-
// `audioPath` or `audio_path`). If absent, fall back to `audio/`.
|
|
72
|
-
let mut audio_dir = deva_dir.join(subdir).join(bank_name).join("audio");
|
|
73
|
-
// Try to read bank.toml to get audioPath
|
|
74
|
-
let bank_toml = deva_dir.join(subdir).join(bank_name).join("bank.toml");
|
|
75
|
-
if bank_toml.exists() {
|
|
76
|
-
if let Ok(content) = std::fs::read_to_string(&bank_toml) {
|
|
77
|
-
if let Ok(parsed) = toml::from_str::<toml::Value>(&content) {
|
|
78
|
-
if let Some(ap) = parsed
|
|
79
|
-
.get("audioPath")
|
|
80
|
-
.or_else(|| parsed.get("audio_path"))
|
|
81
|
-
.and_then(|v| v.as_str())
|
|
82
|
-
{
|
|
83
|
-
// normalize separators
|
|
84
|
-
let ap_norm = ap.replace("\\", "/");
|
|
85
|
-
audio_dir = deva_dir.join(subdir).join(bank_name).join(ap_norm);
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
// Force looking into the computed audio_dir. If the entity_name
|
|
91
|
-
// already contains an extension (e.g. .wav/.mp3) or a nested path,
|
|
92
|
-
// preserve it as-is. Otherwise, try with a .wav extension.
|
|
93
|
-
let bank_base = audio_dir;
|
|
94
|
-
let candidate = bank_base.join(&entity_name);
|
|
95
|
-
|
|
96
|
-
if candidate.exists() {
|
|
97
|
-
resolved_path = candidate.to_string_lossy().to_string();
|
|
98
|
-
} else {
|
|
99
|
-
// Detect whether the provided entity already includes an extension.
|
|
100
|
-
let has_extension = std::path::Path::new(&entity_name).extension().is_some();
|
|
101
|
-
|
|
102
|
-
if !has_extension {
|
|
103
|
-
// Try appending .wav as a fallback for shorthand names without extension
|
|
104
|
-
let wav_candidate = bank_base.join(format!("{}.wav", entity_name));
|
|
105
|
-
if wav_candidate.exists() {
|
|
106
|
-
resolved_path = wav_candidate.to_string_lossy().to_string();
|
|
107
|
-
} else {
|
|
108
|
-
// Last resort: use the legacy location (no audio/), also with .wav
|
|
109
|
-
resolved_path = deva_dir
|
|
110
|
-
.join(subdir)
|
|
111
|
-
.join(bank_name)
|
|
112
|
-
.join(format!("{}.wav", entity_name))
|
|
113
|
-
.to_string_lossy()
|
|
114
|
-
.to_string();
|
|
115
|
-
}
|
|
116
|
-
} else {
|
|
117
|
-
// If an extension was specified, don't append .wav; try legacy location
|
|
118
|
-
let legacy_candidate = deva_dir.join(subdir).join(bank_name).join(&entity_name);
|
|
119
|
-
|
|
120
|
-
if legacy_candidate.exists() {
|
|
121
|
-
resolved_path = legacy_candidate.to_string_lossy().to_string();
|
|
122
|
-
} else {
|
|
123
|
-
// No file found; fall back to the audio candidate path (even if missing)
|
|
124
|
-
resolved_path = candidate.to_string_lossy().to_string();
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
} else {
|
|
129
|
-
let entry_dir = module_root.parent().unwrap_or(&root);
|
|
130
|
-
let absolute_path = root.join(entry_dir).join(&var_path);
|
|
131
|
-
|
|
132
|
-
resolved_path = normalize_path(absolute_path.to_string_lossy().to_string());
|
|
133
|
-
}
|
|
134
|
-
|
|
135
|
-
if !Path::new(&resolved_path).exists() {
|
|
136
|
-
eprintln!("❌ Unknown trigger or missing audio file: {}", filepath);
|
|
137
|
-
return;
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
let file = match File::open(&resolved_path) {
|
|
141
|
-
Ok(f) => BufReader::new(f),
|
|
142
|
-
Err(e) => {
|
|
143
|
-
eprintln!("❌ Failed to open audio file {}: {}", resolved_path, e);
|
|
144
|
-
return;
|
|
145
|
-
}
|
|
146
|
-
};
|
|
147
|
-
|
|
148
|
-
let decoder = match Decoder::new(file) {
|
|
149
|
-
Ok(d) => d,
|
|
150
|
-
Err(e) => {
|
|
151
|
-
eprintln!("❌ Failed to decode audio file {}: {}", resolved_path, e);
|
|
152
|
-
return;
|
|
153
|
-
}
|
|
154
|
-
};
|
|
155
|
-
|
|
156
|
-
// Read frames from decoder and convert to mono if needed.
|
|
157
|
-
let max_frames = (dur_sec * (SAMPLE_RATE as f32)) as usize;
|
|
158
|
-
let dec_channels = decoder.channels() as usize;
|
|
159
|
-
let max_raw_samples = max_frames.saturating_mul(dec_channels.max(1));
|
|
160
|
-
let raw_samples: Vec<i16> = decoder.convert_samples().take(max_raw_samples).collect();
|
|
161
|
-
|
|
162
|
-
// Convert interleaved channels to mono by averaging channels per frame.
|
|
163
|
-
// Apply a small RMS-preserving scale so mono level is similar to mixed stereo.
|
|
164
|
-
let actual_frames = if dec_channels > 0 {
|
|
165
|
-
raw_samples.len() / dec_channels
|
|
166
|
-
} else {
|
|
167
|
-
0
|
|
168
|
-
};
|
|
169
|
-
let mut samples: Vec<i16> = Vec::with_capacity(actual_frames);
|
|
170
|
-
let rms_scale = (dec_channels as f32).sqrt();
|
|
171
|
-
for frame in 0..actual_frames {
|
|
172
|
-
let mut sum: i32 = 0;
|
|
173
|
-
for ch in 0..dec_channels {
|
|
174
|
-
sum += raw_samples[frame * dec_channels + ch] as i32;
|
|
175
|
-
}
|
|
176
|
-
if dec_channels > 0 {
|
|
177
|
-
let avg = (sum / (dec_channels as i32)) as f32;
|
|
178
|
-
let scaled = (avg * rms_scale).clamp(i16::MIN as f32, i16::MAX as f32) as i16;
|
|
179
|
-
samples.push(scaled);
|
|
180
|
-
} else {
|
|
181
|
-
samples.push(0);
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
|
|
185
|
-
if samples.is_empty() {
|
|
186
|
-
eprintln!("❌ No samples read from {}", resolved_path);
|
|
187
|
-
return;
|
|
188
|
-
}
|
|
189
|
-
|
|
190
|
-
let offset = (time_secs * (SAMPLE_RATE as f32) * (CHANNELS as f32)) as usize;
|
|
191
|
-
let required_len = offset + samples.len() * (CHANNELS as usize);
|
|
192
|
-
if self.buffer.len() < required_len {
|
|
193
|
-
self.buffer.resize(required_len, 0);
|
|
194
|
-
}
|
|
195
|
-
|
|
196
|
-
if let Some(effects_map) = effects {
|
|
197
|
-
self.pad_samples(&samples, time_secs, Some(effects_map));
|
|
198
|
-
} else {
|
|
199
|
-
self.pad_samples(&samples, time_secs, None);
|
|
200
|
-
}
|
|
201
|
-
}
|
|
202
|
-
|
|
203
|
-
fn pad_samples(
|
|
204
|
-
&mut self,
|
|
205
|
-
samples: &[i16],
|
|
206
|
-
time_secs: f32,
|
|
207
|
-
effects_map: Option<HashMap<String, Value>>,
|
|
208
|
-
) {
|
|
209
|
-
let offset = (time_secs * (SAMPLE_RATE as f32) * (CHANNELS as f32)) as usize;
|
|
210
|
-
let total_samples = samples.len();
|
|
211
|
-
|
|
212
|
-
let mut gain = 1.0;
|
|
213
|
-
let mut pan = 0.0;
|
|
214
|
-
let mut fade_in = 0.0;
|
|
215
|
-
let mut fade_out = 0.0;
|
|
216
|
-
let mut pitch = 1.0;
|
|
217
|
-
let mut drive = 0.0;
|
|
218
|
-
let mut reverb = 0.0;
|
|
219
|
-
let mut delay = 0.0; // delay time in seconds
|
|
220
|
-
let delay_feedback = 0.35; // default feedback
|
|
221
|
-
|
|
222
|
-
if let Some(map) = &effects_map {
|
|
223
|
-
for (key, val) in map {
|
|
224
|
-
match (key.as_str(), val) {
|
|
225
|
-
("gain", Value::Number(v)) => {
|
|
226
|
-
gain = *v;
|
|
227
|
-
}
|
|
228
|
-
("pan", Value::Number(v)) => {
|
|
229
|
-
pan = *v;
|
|
230
|
-
}
|
|
231
|
-
("fadeIn", Value::Number(v)) => {
|
|
232
|
-
fade_in = *v;
|
|
233
|
-
}
|
|
234
|
-
("fadeOut", Value::Number(v)) => {
|
|
235
|
-
fade_out = *v;
|
|
236
|
-
}
|
|
237
|
-
("pitch", Value::Number(v)) => {
|
|
238
|
-
pitch = *v;
|
|
239
|
-
}
|
|
240
|
-
("drive", Value::Number(v)) => {
|
|
241
|
-
drive = *v;
|
|
242
|
-
}
|
|
243
|
-
("reverb", Value::Number(v)) => {
|
|
244
|
-
reverb = *v;
|
|
245
|
-
}
|
|
246
|
-
("delay", Value::Number(v)) => {
|
|
247
|
-
delay = *v;
|
|
248
|
-
}
|
|
249
|
-
_ => eprintln!("⚠️ Unknown or invalid effect '{}'", key),
|
|
250
|
-
}
|
|
251
|
-
}
|
|
252
|
-
}
|
|
253
|
-
|
|
254
|
-
let fade_in_samples = (fade_in * (SAMPLE_RATE as f32)) as usize;
|
|
255
|
-
let fade_out_samples = (fade_out * (SAMPLE_RATE as f32)) as usize;
|
|
256
|
-
|
|
257
|
-
// If no fade specified, apply a tiny default fade (2 ms) when sample boundaries are non-zero
|
|
258
|
-
let default_boundary_fade_ms = 1.0_f32; // 1 ms
|
|
259
|
-
let default_fade_samples = (default_boundary_fade_ms * (SAMPLE_RATE as f32)) as usize;
|
|
260
|
-
let mut effective_fade_in = fade_in_samples;
|
|
261
|
-
let mut effective_fade_out = fade_out_samples;
|
|
262
|
-
if effective_fade_in == 0 {
|
|
263
|
-
if let Some(&first) = samples.first() {
|
|
264
|
-
if first.abs() > 64 {
|
|
265
|
-
// increased threshold to detect only strong abrupt starts
|
|
266
|
-
effective_fade_in = default_fade_samples.max(1);
|
|
267
|
-
}
|
|
268
|
-
}
|
|
269
|
-
}
|
|
270
|
-
if effective_fade_out == 0 {
|
|
271
|
-
if let Some(&last) = samples.last() {
|
|
272
|
-
if last.abs() > 64 {
|
|
273
|
-
// increased threshold to detect only strong abrupt ends
|
|
274
|
-
effective_fade_out = default_fade_samples.max(1);
|
|
275
|
-
}
|
|
276
|
-
}
|
|
277
|
-
}
|
|
278
|
-
|
|
279
|
-
// Ensure fades do not exceed half the sample length to avoid silencing short samples
|
|
280
|
-
if total_samples > 0 {
|
|
281
|
-
let cap = total_samples / 2;
|
|
282
|
-
if effective_fade_in > cap {
|
|
283
|
-
effective_fade_in = cap.max(1);
|
|
284
|
-
}
|
|
285
|
-
if effective_fade_out > cap {
|
|
286
|
-
effective_fade_out = cap.max(1);
|
|
287
|
-
}
|
|
288
|
-
}
|
|
289
|
-
|
|
290
|
-
let delay_samples = if delay > 0.0 {
|
|
291
|
-
(delay * (SAMPLE_RATE as f32)) as usize
|
|
292
|
-
} else {
|
|
293
|
-
0
|
|
294
|
-
};
|
|
295
|
-
let mut delay_buffer: Vec<f32> = vec![0.0; total_samples + delay_samples];
|
|
296
|
-
|
|
297
|
-
for i in 0..total_samples {
|
|
298
|
-
let pitch_index = if pitch != 1.0 {
|
|
299
|
-
((i as f32) / pitch) as usize
|
|
300
|
-
} else {
|
|
301
|
-
i
|
|
302
|
-
};
|
|
303
|
-
|
|
304
|
-
let mut adjusted = if pitch_index < total_samples {
|
|
305
|
-
samples[pitch_index] as f32
|
|
306
|
-
} else {
|
|
307
|
-
0.0
|
|
308
|
-
};
|
|
309
|
-
|
|
310
|
-
adjusted *= gain;
|
|
311
|
-
|
|
312
|
-
if effective_fade_in > 0 && i < effective_fade_in {
|
|
313
|
-
if effective_fade_in == 1 {
|
|
314
|
-
adjusted *= 0.0;
|
|
315
|
-
} else {
|
|
316
|
-
adjusted *= (i as f32) / (effective_fade_in as f32);
|
|
317
|
-
}
|
|
318
|
-
}
|
|
319
|
-
if effective_fade_out > 0 && i >= total_samples.saturating_sub(effective_fade_out) {
|
|
320
|
-
if effective_fade_out == 1 {
|
|
321
|
-
adjusted *= 0.0;
|
|
322
|
-
} else {
|
|
323
|
-
adjusted *=
|
|
324
|
-
((total_samples - 1 - i) as f32) / ((effective_fade_out - 1) as f32);
|
|
325
|
-
}
|
|
326
|
-
}
|
|
327
|
-
|
|
328
|
-
if drive > 0.0 {
|
|
329
|
-
let normalized = adjusted / (i16::MAX as f32);
|
|
330
|
-
let pre_gain = (10f32).powf(drive / 20.0);
|
|
331
|
-
let driven = (normalized * pre_gain).tanh();
|
|
332
|
-
adjusted = driven * (i16::MAX as f32);
|
|
333
|
-
}
|
|
334
|
-
|
|
335
|
-
if delay_samples > 0 && i >= delay_samples {
|
|
336
|
-
let echo = delay_buffer[i - delay_samples] * delay_feedback;
|
|
337
|
-
adjusted += echo;
|
|
338
|
-
}
|
|
339
|
-
if delay_samples > 0 {
|
|
340
|
-
delay_buffer[i] = adjusted;
|
|
341
|
-
}
|
|
342
|
-
|
|
343
|
-
if reverb > 0.0 {
|
|
344
|
-
let reverb_delay = (0.03 * (SAMPLE_RATE as f32)) as usize;
|
|
345
|
-
if i >= reverb_delay {
|
|
346
|
-
adjusted += (self.buffer[offset + i - reverb_delay] as f32) * reverb;
|
|
347
|
-
}
|
|
348
|
-
}
|
|
349
|
-
|
|
350
|
-
let adjusted_sample = adjusted.round().clamp(i16::MIN as f32, i16::MAX as f32) as i16;
|
|
351
|
-
|
|
352
|
-
let (left_gain, right_gain) = crate::core::audio::engine::helpers::pan_gains(pan);
|
|
353
|
-
|
|
354
|
-
let left = ((adjusted_sample as f32) * left_gain) as i16;
|
|
355
|
-
let right = ((adjusted_sample as f32) * right_gain) as i16;
|
|
356
|
-
|
|
357
|
-
let left_pos = offset + i * 2;
|
|
358
|
-
let right_pos = left_pos + 1;
|
|
359
|
-
|
|
360
|
-
if right_pos < self.buffer.len() {
|
|
361
|
-
self.buffer[left_pos] = self.buffer[left_pos].saturating_add(left);
|
|
362
|
-
self.buffer[right_pos] = self.buffer[right_pos].saturating_add(right);
|
|
363
|
-
}
|
|
364
|
-
}
|
|
365
|
-
}
|
|
366
|
-
}
|