Remove FrameSig

The intention behind FrameSig was that some signals only need to be
updated once per batch of samples rather than once per audio sample.
This mostly corresponds to user input. This caused some problems with
compatibility between components. FrameSigs could be converted to Sigs
but not the other way around, and some code was written to expect
FrameSigs. Another issue is that when a boolean value is represented by
a FrameSig, it can only chance at a cadence of once per frame, which
means that trigger signals will remain high for an entire batch of
samples rather than a single sample as was likely the intention.

Author: gridbugs

bevy/src/lib.rs

@@ -1,19 +1,19 @@
 use bevy::{input::keyboard::KeyboardInput, prelude::*, window::PrimaryWindow};
 use caw_computer_keyboard::Keyboard;
-use caw_core::{frame_sig_var, FrameSig, FrameSigVar};
+use caw_core::{sig_var, Sig, SigVar};
 
 #[derive(Resource, Clone)]
 pub struct BevyInput {
-    pub mouse_x: FrameSig<FrameSigVar<f32>>,
-    pub mouse_y: FrameSig<FrameSigVar<f32>>,
-    pub keyboard: Keyboard<FrameSig<FrameSigVar<bool>>>,
+    pub mouse_x: Sig<SigVar<f32>>,
+    pub mouse_y: Sig<SigVar<f32>>,
+    pub keyboard: Keyboard<Sig<SigVar<bool>>>,
 }
 
 impl Default for BevyInput {
     fn default() -> Self {
-        let keyboard = Keyboard::new(|_| frame_sig_var(false));
-        let mouse_x = frame_sig_var(0.5);
-        let mouse_y = frame_sig_var(0.5);
+        let keyboard = Keyboard::new(|_| sig_var(false));
+        let mouse_x = sig_var(0.5);
+        let mouse_y = sig_var(0.5);
         Self {
             keyboard,
             mouse_x,
@@ -88,7 +88,7 @@ fn get_key<K>(key_code: KeyCode, keyboard: &Keyboard<K>) -> Option<&K> {
 
 fn update_key_state(
     input: &KeyboardInput,
-    keyboard: &Keyboard<FrameSig<FrameSigVar<bool>>>,
+    keyboard: &Keyboard<Sig<SigVar<bool>>>,
 ) {
     get_key(input.key_code, keyboard)
         .iter()
@@ -104,8 +104,8 @@ fn update_key_state(
 
 fn update_mouse_position(
     window: &Window,
-    mouse_x: &FrameSig<FrameSigVar<f32>>,
-    mouse_y: &FrameSig<FrameSigVar<f32>>,
+    mouse_x: &Sig<SigVar<f32>>,
+    mouse_y: &Sig<SigVar<f32>>,
 ) {
     if let Some(position) = window.cursor_position() {
         let window_size = window.size();

computer-keyboard/src/lib.rs

@@ -1,4 +1,4 @@
-use caw_core::{Buf, FrameSig, FrameSigT, Sig, SigT};
+use caw_core::{Buf, Sig, SigT};
 use caw_keyboard::{KeyEvent, KeyEvents, Note};
 use itertools::izip;
 
@@ -314,7 +314,7 @@ fn opinionated_note_by_key(start_note: Note) -> Vec<(Key, Note)> {
         .collect::<Vec<_>>()
 }
 
-pub fn opinionated_key_events_<S>(
+pub fn opinionated_key_events<S>(
     keyboard: &Keyboard<S>,
     start_note: Note,
 ) -> Sig<impl SigT<Item = KeyEvents>>
@@ -353,67 +353,14 @@ where
     })
 }
 
-pub fn opinionated_key_events<S>(
-    keyboard: &Keyboard<S>,
-    start_note: Note,
-) -> FrameSig<impl FrameSigT<Item = KeyEvents>>
-where
-    S: FrameSigT<Item = bool> + Clone,
-{
-    struct KeyState<S>
-    where
-        S: FrameSigT<Item = bool> + Clone,
-    {
-        key_sig: S,
-        note: Note,
-        pressed: bool,
-    }
-    let note_by_key = opinionated_note_by_key(start_note);
-    let mut state = note_by_key
-        .into_iter()
-        .map(|(key, note)| KeyState {
-            key_sig: keyboard.get(key),
-            note,
-            pressed: false,
-        })
-        .collect::<Vec<_>>();
-    FrameSig::from_fn(move |ctx| {
-        let mut key_events = KeyEvents::empty();
-        for state in state.iter_mut() {
-            let pressed = state.key_sig.frame_sample(ctx);
-            if pressed != state.pressed {
-                state.pressed = pressed;
-                key_events.push(KeyEvent {
-                    note: state.note,
-                    pressed,
-                    velocity_01: 1.0,
-                });
-            }
-        }
-        key_events
-    })
-}
-
 impl<K> Keyboard<K>
 where
     K: SigT<Item = bool> + Clone,
-{
-    pub fn opinionated_key_events_(
-        self,
-        start_note: Note,
-    ) -> Sig<impl SigT<Item = KeyEvents>> {
-        opinionated_key_events_(&self, start_note)
-    }
-}
-
-impl<K> Keyboard<K>
-where
-    K: FrameSigT<Item = bool> + Clone,
 {
     pub fn opinionated_key_events(
         self,
         start_note: Note,
-    ) -> FrameSig<impl FrameSigT<Item = KeyEvents>> {
+    ) -> Sig<impl SigT<Item = KeyEvents>> {
         opinionated_key_events(&self, start_note)
     }
 }