expose new modulators

Author: orsinium

src/host/audio.rs

@@ -245,13 +245,60 @@ pub(crate) fn mod_hold(mut caller: C, node_id: u32, param: u32, low: f32, high:
     modulate(state, node_id, param, Box::new(lfo), low, high);
 }
 
+pub(crate) fn mod_adsr(
+    mut caller: C,
+    node_id: u32,
+    param: u32,
+    low: f32,
+    high: f32,
+    attack: u32,
+    decay: u32,
+    sustain: u32,
+    sustain_level: f32,
+    release: u32,
+) {
+    let state = caller.data_mut();
+    state.called = "audio.mod_adsr";
+    let lfo = modulators::Adsr::new(attack, decay, sustain, sustain_level, release);
+    modulate(state, node_id, param, Box::new(lfo), low, high);
+}
+
+// TODO(@orsinium): Put `low` and `high` before modulator params for consistency.
 pub(crate) fn mod_sine(mut caller: C, node_id: u32, param: u32, freq: f32, low: f32, high: f32) {
     let state = caller.data_mut();
     state.called = "audio.mod_sine";
     let lfo = modulators::Sine::new(freq);
     modulate(state, node_id, param, Box::new(lfo), low, high);
 }
 
+pub(crate) fn mod_square(
+    mut caller: C,
+    node_id: u32,
+    param: u32,
+    low: f32,
+    high: f32,
+    period: u32,
+) {
+    let state = caller.data_mut();
+    state.called = "audio.mod_square";
+    let lfo = modulators::Pulse::new_square(period);
+    modulate(state, node_id, param, Box::new(lfo), low, high);
+}
+
+pub(crate) fn mod_sawtooth(
+    mut caller: C,
+    node_id: u32,
+    param: u32,
+    low: f32,
+    high: f32,
+    period: u32,
+) {
+    let state = caller.data_mut();
+    state.called = "audio.mod_sawtooth";
+    let lfo = modulators::Triangle::new_sawtooth(period);
+    modulate(state, node_id, param, Box::new(lfo), low, high);
+}
+
 fn modulate(
     state: &mut State,
     node_id: u32,

src/linking.rs

@@ -117,31 +117,40 @@ fn select_audio_external<'a>(
         "reset" => Func::wrap(ctx, audio::reset),
         "reset_all" => Func::wrap(ctx, audio::reset_all),
         "clear" => Func::wrap(ctx, audio::clear),
-        "add_empty" => Func::wrap(ctx, audio::add_empty),
-        "add_file" => Func::wrap(ctx, audio::add_file),
-        "add_mix" => Func::wrap(ctx, audio::add_mix),
+
+        // Processors.
         "add_all_for_one" => Func::wrap(ctx, audio::add_all_for_one),
+        "add_clip" => Func::wrap(ctx, audio::add_clip),
+        "add_concat" => Func::wrap(ctx, audio::add_concat),
+        "add_file" => Func::wrap(ctx, audio::add_file),
         "add_gain" => Func::wrap(ctx, audio::add_gain),
+        "add_high_pass" => Func::wrap(ctx, audio::add_high_pass),
         "add_loop" => Func::wrap(ctx, audio::add_loop),
-        "add_concat" => Func::wrap(ctx, audio::add_concat),
-        "add_pan" => Func::wrap(ctx, audio::add_pan),
+        "add_low_pass" => Func::wrap(ctx, audio::add_low_pass),
+        "add_mix" => Func::wrap(ctx, audio::add_mix),
         "add_mute" => Func::wrap(ctx, audio::add_mute),
+        "add_pan" => Func::wrap(ctx, audio::add_pan),
         "add_pause" => Func::wrap(ctx, audio::add_pause),
-        "add_track_position" => Func::wrap(ctx, audio::add_track_position),
-        "add_low_pass" => Func::wrap(ctx, audio::add_low_pass),
-        "add_high_pass" => Func::wrap(ctx, audio::add_high_pass),
+        "add_swap" => Func::wrap(ctx, audio::add_swap),
         "add_take_left" => Func::wrap(ctx, audio::add_take_left),
         "add_take_right" => Func::wrap(ctx, audio::add_take_right),
-        "add_swap" => Func::wrap(ctx, audio::add_swap),
-        "add_clip" => Func::wrap(ctx, audio::add_clip),
+        "add_track_position" => Func::wrap(ctx, audio::add_track_position),
+
+        // Generators.
+        "add_empty" => Func::wrap(ctx, audio::add_empty),
         "add_noise" => Func::wrap(ctx, audio::add_noise),
+        "add_sawtooth" => Func::wrap(ctx, audio::add_sawtooth),
         "add_sine" => Func::wrap(ctx, audio::add_sine),
         "add_square" => Func::wrap(ctx, audio::add_square),
-        "add_sawtooth" => Func::wrap(ctx, audio::add_sawtooth),
         "add_triangle" => Func::wrap(ctx, audio::add_triangle),
         "add_zero" => Func::wrap(ctx, audio::add_zero),
+
+        // Modulators.
         "mod_linear" => Func::wrap(ctx, audio::mod_linear),
         "mod_hold" => Func::wrap(ctx, audio::mod_hold),
+        "mod_adsr" => Func::wrap(ctx, audio::mod_adsr),
+        "mod_square" => Func::wrap(ctx, audio::mod_square),
+        "mod_sawtooth" => Func::wrap(ctx, audio::mod_sawtooth),
         "mod_sine" => Func::wrap(ctx, audio::mod_sine),
         _ => return None,
     };