Switch widget

Author: gridbugs

caw/examples/live_example.rs

@@ -50,8 +50,8 @@ fn main() {
     ]
     .into_iter()
     .sum::<Sig<_>>()
-        * knob("drum vol").build())
-    .shared();
+        * 0.5) //knob("drum vol").build())
+        .shared();
     out.set_channel(|channel| {
         let voice = key_events.clone().mono_voice();
         let (note, gate) = key_looper(voice.triggered_note(), clock.clone())
@@ -60,6 +60,12 @@ fn main() {
             .persist_with_name("keys")
             .build()
             .ungated();
+        let vib_hz = knob("vibrato").build() * 20.;
+        let max = semitone_ratio_sig(knob("vib scale").build() * 4.).shared();
+        let min = (1.0 / max.clone()).shared();
+        let vib = sine(vib_hz).build().signed_to_range(min, max);
+        let lfo =
+            sine(10.0).build().signed_to_01() * knob("lfo").build() * 1000.;
         let cutoff_hz =
             value_looper(cutoff_hz.clone(), clock.clone(), lpf_space.clone())
                 .persist_with_name("low_pass")
@@ -68,27 +74,27 @@ fn main() {
         let env = adsr(gate)
             .key_press_trig(clock.clone())
             .a(tempo_s.clone() * knob("attack").build() * 4.)
-            .r(tempo_s.clone() * knob("release").build() * 4.)
+            //   .r(tempo_s.clone() * knob("release").build() * 4.)
             .s(knob("sustain").build())
             .d(tempo_s.clone() * knob("decay").build() * 4.)
             .build()
             .exp_01(1.)
             .shared();
-        let voice = (saw(note.freq_hz())
+        let voice = (saw(note.freq_hz() * vib)
             .reset_offset_01(channel.circle_phase_offset_01())
             .build()
             * env.clone())
         .filter(
             low_pass::default(
-                10. + (env.clone()
+                lfo + (env.clone()
                     * cutoff_hz
                     * 15000.
                     * knob("cutoff_scale").build()),
             )
             .q(res.clone()),
         )
         .filter_enable(
-            true,
+            switch("band pass").build(),
             band_pass::centered::default(
                 knob("mid").build() * 1_000.,
                 knob("width").build() * 4.,
@@ -111,6 +117,7 @@ fn main() {
                     .feedback_ratio(0.5),
             )
             .filter(reverb::default().room_size(0.9).damping(0.1))
+            .filter(high_pass::default(1.))
             + drums.clone()
     });
     thread::park();

core/src/sig.rs

@@ -875,6 +875,20 @@ where
         Sig(SignedTo01(self.0))
     }
 
+    pub fn signed_to_range<L, U>(
+        self,
+        lower: L,
+        upper: U,
+    ) -> Sig<impl SigT<Item = f32>>
+    where
+        U: SigT<Item = f32>,
+        L: SigT<Item = f32>,
+    {
+        let lower = sig_shared(lower);
+        let delta = Sig(upper) - lower.clone();
+        lower + (self.signed_to_01() * delta)
+    }
+
     pub fn abs(self) -> Sig<SigAbs<S>> {
         Sig(SigAbs(self.0))
     }

keyboard/src/a440_12tet.rs

@@ -209,11 +209,22 @@ pub fn freq_hz_of_midi_index(midi_index: u8) -> f32 {
         ))
 }
 
+/// The ratio between a pair of notes one semitone apart:
+/// 2.0.powf(1.0 / 12.0)
+pub const SEMITONE_RATIO: f32 = 1.0594630943592953;
+
+/// The ratio between a pair of notes one tone (ie. two semitones) apart.
+pub const TONE_RATIO: f32 = SEMITONE_RATIO * SEMITONE_RATIO;
+
 pub fn semitone_ratio(num_semitones: f32) -> f32 {
     2.0_f32.powf(num_semitones / (NOTES_PER_OCTAVE as f32))
 }
 
-pub const TONE_RATIO: f32 = 1.122_462;
+pub fn semitone_ratio_sig(
+    num_semitones: impl SigT<Item = f32>,
+) -> Sig<impl SigT<Item = f32>> {
+    Sig(num_semitones).map(semitone_ratio)
+}
 
 /// Definition of notes based on MIDI tuned to A_440
 #[derive(

midi-udp-widgets-app-lib/src/lib.rs

@@ -1,6 +1,9 @@
 pub mod button;
 pub use button::button;
 
+pub mod switch;
+pub use switch::switch;
+
 pub mod knob;
 pub use knob::{knob, knob_with_space};
 

midi-udp-widgets-app-lib/src/switch.rs

@@ -0,0 +1,48 @@
+use crate::{
+    midi,
+    server::MidiChannelUdp,
+    widget::{ByTitle, Widget},
+};
+use caw_core::{Sig, SigShared, sig_shared};
+use caw_keyboard::Note;
+use caw_midi::{MidiKeyPress, MidiMessagesT};
+use lazy_static::lazy_static;
+
+pub type Switch = MidiKeyPress<MidiChannelUdp>;
+
+lazy_static! {
+    static ref BY_TITLE: ByTitle<Sig<SigShared<Switch>>> = Default::default();
+}
+
+fn new_switch(title: String) -> Sig<SigShared<Switch>> {
+    BY_TITLE.get_or_insert(title.as_str(), || {
+        let widget =
+            Widget::new(title.clone(), midi::alloc_channel(), "switch", vec![])
+                .unwrap();
+        // The choice of note here is arbitrary.
+        sig_shared(widget.channel().key_press(Note::default()))
+    })
+}
+
+mod builder {
+    use super::*;
+    use caw_builder_proc_macros::builder;
+    use caw_core::{Sig, SigShared};
+
+    builder! {
+        #[constructor = "switch_"]
+        #[constructor_doc = "A visual switch in a new window"]
+        #[generic_setter_type_name = "X"]
+        #[build_fn = "new_switch"]
+        #[build_ty = "Sig<SigShared<Switch>>"]
+        pub struct Props {
+            title: String,
+        }
+    }
+
+    pub fn switch(title: impl Into<String>) -> Props {
+        switch_(title.into())
+    }
+}
+
+pub use builder::switch;

midi-udp-widgets-app/src/main.rs

@@ -8,14 +8,15 @@ use caw_keyboard::{Note, note};
 use caw_midi::MidiEvent;
 use caw_midi_udp_client::*;
 use caw_widgets::{
-    AxisLabels, Button, ComputerKeyboard, Knob, NumKeysBits7, Xy,
+    AxisLabels, Button, ComputerKeyboard, Knob, NumKeysBits7, Switch, Xy,
 };
 use clap::{Parser, Subcommand};
 use midly::num::u7;
 
 #[derive(Subcommand)]
 enum Command {
     Button,
+    Switch,
     Knob {
         #[arg(short, long, default_value_t = 0)]
         controller: u8,
@@ -97,6 +98,24 @@ fn main() {
                 }
             }
         }
+        Command::Switch => {
+            let mut button = Switch::new(cli.title.as_deref()).unwrap();
+            let mut prev_pressed = false;
+            loop {
+                button.tick().unwrap();
+                let pressed = button.pressed();
+                if is_spam() || pressed != prev_pressed {
+                    let key = Note::default().to_midi_index().into();
+                    let message = if button.pressed() {
+                        MidiMessage::NoteOn { key, vel: 0.into() }
+                    } else {
+                        MidiMessage::NoteOff { key, vel: 0.into() }
+                    };
+                    client.send(MidiEvent { channel, message }).unwrap();
+                    prev_pressed = pressed;
+                }
+            }
+        }
         Command::Knob {
             controller,
             initial_value,

widgets/Cargo.toml

@@ -13,6 +13,7 @@ documentation = "https://docs.rs/caw_widgets"
 anyhow = "1.0"
 sdl2 = { version = "0.38", features = ["gfx"] }
 line_2d = "0.5"
+coord_2d = "0.3"
 midly = "0.5"
 caw_computer_keyboard = { version = "0.4", path = "../computer-keyboard" }
 caw_keyboard = { version = "0.4", path = "../keyboard" }

widgets/src/lib.rs

@@ -7,11 +7,13 @@ mod button;
 mod computer_keyboard;
 mod knob;
 mod num_keys_bits_7;
+mod switch;
 mod window;
 mod xy;
 
 pub use button::*;
 pub use computer_keyboard::*;
 pub use knob::*;
 pub use num_keys_bits_7::*;
+pub use switch::*;
 pub use xy::*;