Merge pull request #57 from subalterngames/debug_abc123

Debug abc123

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["audio", "common", "input", "io", "render", "text"]
 
 [workspace.package]
-version = "0.2.6"
+version = "0.2.7"
 authors = ["Esther Alter <[email protected]>"]
 description = "A minimalist and ergonomic MIDI sequencer"
 documentation = "https://github.com/subalterngames/cacophony"
@@ -84,7 +84,7 @@ speech_dispatcher_0_9 = ["text/speech_dispatcher_0_9"]
 
 [package]
 name = "cacophony"
-version = "0.2.6"
+version = "0.2.7"
 authors = ["Esther Alter <[email protected]>"]
 description = "A minimalist and ergonomic MIDI sequencer"
 documentation = "https://github.com/subalterngames/cacophony"
@@ -120,7 +120,7 @@ path = "text"
 name = "Cacophony"
 identifier = "com.subalterngames.cacophony"
 icon = ["icon/32.png", "icon/64.png", "icon/128.png", "icon/256.png"]
-version = "0.2.6"
+version = "0.2.7"
 resources = ["data/*"]
 copyright = "Copyright (c) Subaltern Games LLC 2023. All rights reserved."
 short_description = "A minimalist and ergonomic MIDI sequencer."

changelog.md

@@ -1,5 +1,9 @@
 # 0.2.x
 
+## 0.2.7
+
+- Allow alphanumeric input in `--events events.txt`.
+
 ## 0.2.6
 
 - Fixed: If you let all notes in your music play (as opposed to stopping in the middle), it frequently becomes impossible to play or add new notes.

input/src/debug_input_event.rs

@@ -0,0 +1,7 @@
+use crate::InputEvent;
+
+#[cfg(debug_assertions)]
+pub(crate) enum DebugInputEvent {
+    InputEvent(InputEvent),
+    Alphanumeric(char),
+}

input/src/lib.rs

@@ -3,14 +3,20 @@
 //! - `InputEvent` is an enum defining an event triggered by user input, e.g. a decrease in track volume.
 //! - `Input` maps raw qwerty keycode and raw MIDI messages (control bindings) to input events. It updates per frame, reading input and storing new events.
 
+#[cfg(debug_assertions)]
+mod debug_input_event;
+
 mod input_event;
 mod keys;
 mod midi_binding;
 mod midi_conn;
 mod note_on;
 mod qwerty_binding;
+
 use common::args::Args;
 use common::{State, MAX_NOTE, MIN_NOTE};
+#[cfg(debug_assertions)]
+use debug_input_event::DebugInputEvent;
 use hashbrown::HashMap;
 use ini::Ini;
 pub use input_event::InputEvent;
@@ -89,7 +95,8 @@ pub struct Input {
     /// Characters pressed on this frame.
     pub pressed_chars: Vec<char>,
     /// Debug input events.
-    debug_inputs: Vec<InputEvent>,
+    #[cfg(debug_assertions)]
+    debug_inputs: Vec<DebugInputEvent>,
     /// The MIDI time counter.
     time_counter: i16,
 }
@@ -126,8 +133,11 @@ impl Input {
                     let lines = s.split('\n');
                     for line in lines {
                         match line.trim().parse::<InputEvent>() {
-                            Ok(e) => debug_inputs.push(e),
-                            Err(_) => panic!("Failed to parse {}", line),
+                            Ok(e) => debug_inputs.push(DebugInputEvent::InputEvent(e)),
+                            Err(_) => line
+                                .trim()
+                                .chars()
+                                .for_each(|c| debug_inputs.push(DebugInputEvent::Alphanumeric(c))),
                         }
                     }
                 }
@@ -193,8 +203,12 @@ impl Input {
 
         // DEBUG.
         if cfg!(debug_assertions) && !&self.debug_inputs.is_empty() {
-            let e = self.debug_inputs.remove(0);
-            events.push(e);
+            match self.debug_inputs.remove(0) {
+                // Push an event.
+                DebugInputEvent::InputEvent(e) => events.push(e),
+                // Push a char.
+                DebugInputEvent::Alphanumeric(c) => self.pressed_chars.push(c),
+            }
         }
 
         // Qwerty note input.