IT IS MUSIC

Cargo.lock

@@ -33,6 +33,15 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "anstream"
 version = "0.6.21"
@@ -83,6 +92,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
 [[package]]
 name = "bindgen"
 version = "0.72.1"
@@ -125,6 +140,16 @@ version = "3.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
 
+[[package]]
+name = "cc"
+version = "1.2.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
 [[package]]
 name = "cexpr"
 version = "0.6.0"
@@ -140,6 +165,19 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
+[[package]]
+name = "chrono"
+version = "0.4.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-link",
+]
+
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -201,6 +239,7 @@ checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 name = "composer"
 version = "0.1.0"
 dependencies = [
+ "chrono",
  "clap",
  "env_logger",
  "itertools 0.14.0",
@@ -291,6 +330,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
 [[package]]
 name = "futures-core"
 version = "0.3.32"
@@ -333,6 +378,30 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.13.0"
@@ -500,6 +569,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "num_enum"
 version = "0.7.5"

Cargo.toml

@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+chrono = "0.4.44"
 clap = { version = "4.5.60", features = ["derive"] }
 env_logger = "0.11.9"
 itertools = "0.14.0"

src/flags.rs

@@ -5,9 +5,6 @@ pub struct Flags {
     #[arg(short, long, default_value_t = false)]
     pub debug: bool,
 
-    #[arg(long, default_value_t = 16)] 
-    pub smallest_note: usize,
-
     #[arg(long, default_value_t = 60)]
     pub bpm: usize,
 

src/main.rs

@@ -3,27 +3,33 @@ use itertools::Itertools;
 mod flags;
 mod syn;
 mod tone;
+mod seq;
 
 fn main() {
     let flags = flags::Flags::new();
 
-    let mut syn = syn::Syn::new(
+    let mut syn_seq = seq::new_syn(syn::Syn::new(
         flags.debug,
         flags.sound_font,
         flags.sample_rate,
-    );
+    ));
-    syn.tone_on(0, tone::new("c+5"));
+    syn_seq.append("c");
+    syn_seq.append("2e");
+    syn_seq.append("g");
+    //syn.tone_on(0, tone::new("c+5"));
 
-    play(syn, flags.sample_rate, flags.bpm, flags.smallest_note);
+    play(syn_seq, flags.sample_rate, flags.bpm);
 }
 
-fn play(mut s: syn::Syn, sample_rate: usize, bpm: usize, smallest_note: usize) {
+fn play(mut s: seq::SynSeq, sample_rate: usize, bpm: usize) {
-    let samples_per_smallest_note = sample_rate / bpm * 60 / smallest_note;
+    let samples_per_beat = sample_rate / bpm * 60;
     let params = tinyaudio::prelude::OutputDeviceParameters {
         channels_count: 2,
         sample_rate: sample_rate,
-        channel_sample_count: samples_per_smallest_note,
+        channel_sample_count: samples_per_beat,
     };
+    let beats = s.beats();
+    let duration = 1 + 60 * beats / bpm;
 
     let sample_count = (params.channel_sample_count) as usize;
     let mut left: Vec<f32> = vec![0_f32; sample_count];
@@ -40,5 +46,5 @@ fn play(mut s: syn::Syn, sample_rate: usize, bpm: usize, smallest_note: usize) {
     .unwrap();
 
     // Wait it out
-    std::thread::sleep(std::time::Duration::from_secs(2));
+    std::thread::sleep(std::time::Duration::from_secs(duration as u64));
 }

src/seq.rs

@@ -0,0 +1,99 @@
+use crate::tone;
+use crate::syn;
+
+pub struct SynSeq {
+   seq: Seq,
+   syn: syn::Syn,
+}
+
+pub fn new_syn(syn: syn::Syn) -> SynSeq {
+   SynSeq{
+      seq: new(),
+      syn: syn,
+   }
+}
+
+impl SynSeq {
+   pub fn append<S: ToString>(&mut self, s: S) {
+      self.seq.append(s);
+   }
+
+   pub fn render(&mut self, left: &mut [f32], right: &mut [f32]) {
+      if let Some(tone) = self.seq.pop() {
+         self.syn.set(tone);
+      }
+      self.syn.render(left, right);
+   }
+
+   pub fn beats(&self) -> usize {
+      self.seq.beats.len()
+   }
+}
+
+#[derive(PartialEq)]
+pub struct Seq {
+   beats: Vec<(i32, tone::Tone)>,
+}
+
+pub fn new() -> Seq {
+   Seq::new()
+}
+
+impl Seq {
+   fn new() -> Seq {
+      Seq{
+         beats: vec![],
+      }
+   }
+
+   pub fn pop(&mut self) -> Option<tone::Tone> {
+      match self.beats.len() {
+         0 => None,
+         _ => match self.beats[0].0 {
+            1 => Some(self.beats.remove(0).1),
+            _ => {
+               self.beats[0].0 -= 1;
+               Some(self.beats[0].1.clone())
+            },
+         },
+      }
+   }
+
+   pub fn append<S: ToString>(&mut self, s: S) {
+      self.append_one(s.to_string());
+   }
+
+   fn append_one(&mut self, s: String) {
+      let re = regex::Regex::new(r"^(?<count>[0-9]*)(?<tone>[a-z].*)$").unwrap();
+      let captures = re.captures(&s).unwrap();
+
+      let n = match captures.name("count") {
+         Some(number) if number.as_str().len() > 0 => number.as_str().parse::<usize>().unwrap(),
+         _ => 1,
+      } as i32;
+
+      let tone = tone::new(captures.name("tone").unwrap().as_str());
+      self.beats.push((n, tone));
+   }
+}
+
+#[cfg(test)]
+mod test {
+   use super::*;
+
+   #[test]
+   fn test_seq() {
+      let mut seq = new();
+      seq.append("c");
+      seq.append("4d");
+      assert_eq!(seq.beats.len(), 2);
+      assert_eq!(seq.beats[0], (1 as i32, tone::new("c")));
+      assert_eq!(seq.beats[1], (4 as i32, tone::new("d")));
+
+      assert_eq!(seq.pop(), Some(tone::new("c")));
+      for _ in 0..4 {
+         assert_eq!(seq.pop(), Some(tone::new("d")));
+      }
+      assert_eq!(seq.pop(), None);
+   }
+}

src/syn.rs

@@ -31,13 +31,28 @@ impl Syn {
         Syn::Real(synthesizer)
     }
 
-    pub fn tone_on(&mut self, a: i32, b: tone::Tone) {
+    pub fn set(&mut self, b: tone::Tone) {
+        let a = 0 as i32;
+        match self {
+            // channel=[0..16)
+            // velocity=[0..128)
+            Syn::Real(syn) => {
+               syn.note_off_all_channel(a, false);
+            },
+            Syn::Text{m, ..} => {
+               m.clear();
+            },
+        };
+        self.tone_on(b);
+    }
+
+    fn tone_on(&mut self, b: tone::Tone) {
+        let a = 0 as i32;
         match self {
             // channel=[0..16)
             // velocity=[0..128)
             Syn::Real(syn) => syn.note_on(a, b.i32(), 127),
             Syn::Text{m, ..} => {
-                eprintln!("tone_on({:?}, {:?}, {:?})", a, b.i32(), 127);
                 match m.get_mut(&a) {
                     Some(m2) => { m2.insert(b.i32(), 127); },
                     None => {
@@ -50,11 +65,11 @@ impl Syn {
         };
     }
 
-    pub fn tone_off(&mut self, a: i32, b: tone::Tone) {
+    fn tone_off(&mut self, b: tone::Tone) {
+        let a = 0 as i32;
         match self {
             Syn::Real(syn) => syn.note_off(a, b.i32()),
             Syn::Text{m, ..} => {
-                eprintln!("tone_off({:?}, {:?})", a, b.i32());
                 match m.get_mut(&a) {
                     Some(m) => { m.remove(&b.i32()); },
                     None => {},
@@ -68,7 +83,7 @@ impl Syn {
         match self {
             Syn::Real(syn) => syn.render(a, b),
             Syn::Text{m, i} => {
-                eprintln!("render[{}]({:?})", i, m);
+                eprintln!("{} | render[{}]({:?})", chrono::prelude::Utc::now(), i, m);
                 *i += 1;
             },
         };
@@ -83,10 +98,10 @@ mod test {
    fn test_new_real() {
       let mut syn = Syn::new(false, "super_small_font.sf2".to_string(), 44100);
 
-      syn.tone_on(1, tone::new("c"));
+      syn.tone_on(tone::new("c"));
-      syn.tone_on(2, tone::new("d"));
+      syn.tone_on(tone::new("d"));
 
-      syn.tone_off(2, tone::new("d"));
+      syn.tone_off(tone::new("d"));
 
       let mut buffer1 = Vec::<f32>::new();
       let mut buffer2 = Vec::<f32>::new();
@@ -97,10 +112,10 @@ mod test {
    fn test_text() {
       let mut syn = Syn::new(true, ".sf2".to_string(), 1);
 
-      syn.tone_on(1, tone::new("c"));
+      syn.tone_on(tone::new("c"));
-      syn.tone_on(2, tone::new("d"));
+      syn.tone_on(tone::new("d"));
 
-      syn.tone_off(2, tone::new("d"));
+      syn.tone_off(tone::new("d"));
 
       let mut buffer1 = Vec::<f32>::new();
       let mut buffer2 = Vec::<f32>::new();

src/tone.rs

@@ -1,4 +1,4 @@
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Clone)]
 pub struct Tone(i32);
 
 // new parses [a-g][+-]?[1-5]? to tone, sharp or flat, down 2 octave..up 1 octave