unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-07 12:16:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

load project from file

Browse source
This commit is contained in:
🪞👃🪞 2024-07-08 17:27:58 +03:00
parent e2a842492e
commit eeb2faf064
9 changed files with 320 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

99
demos/project.edn
View file

@ -1,3 +1,5 @@
(bpm 150)
(track { :name "Drums" :gain +0.0 } (track { :name "Drums" :gain +0.0 }
(sampler { :name "DrumKit1" :dir "/home/user/Lab/Music/pak" } (sampler { :name "DrumKit1" :dir "/home/user/Lab/Music/pak" }
@ -14,54 +16,53 @@
(:04 (36 128)) (:04 (36 128))
(:08 (36 128)) (:08 (36 128))
(:12 (36 128))) (:12 (36 128)))
(phrase { :name "5 kicks" :beats 4 :steps 16 }
(:00 (36 128))
(:04 (36 128))
(:08 (36 128))
(:12 (36 128))
(:14 (36 128)))
(phrase { :name "D Beat" :beats 4 })
;(:00 (44 :100) (:34 :100) (:35 :100))
;(:02 (42 :100) )
;(:04 (42 :080) (:38 :100) )
;(:06 (44 :120) )
;(:08 (42 :100) (:34 :100) (:35 :100))
;(:10 (42 :100) (:34 :100) (:35 :100))
;(:12 (44 :100) (:40 :100) )
;(:13 (44 :100) )
;(:14 (44 :100) )
;(:15 (42 :100) )))
(phrase { :name "Garage" :beats 4 }
(:00 (44 100) (36 100) (35 100))
(:01 (44 100))
(:02 (44 100) (35 100))
(:03 (44 100))
(:04 (44 100) (40 100))
(:06 (44 100))
(:07 (44 100) (34 100))
(:09 (44 100))
(:10 (44 100))
(:11 (35 100) (36 100))
(:12 (44 100) (40 100))
(:14 (44 100))))
) (track { :name "Bass" :gain +0.0 }
(phrase { :name "Bass 1" :beats 4 })
(phrase { :name "Bass 2" :beats 4 })
(phrase { :name "Bass 3" :beats 4 })
(phrase { :name "Bass 4" :beats 4 })
(phrase { :name "Bass 5" :beats 4 })
(phrase { :name "Bass 6" :beats 4 })
(phrase { :name "Bass 7" :beats 4 })
(phrase { :name "Bass 8" :beats 4 }))
;(phrase { (track { :name "Lead" :gain +0.0 }
;:name "5 kicks" (phrase { :name "Lead 1" :beats 4 })
;:beats 4 (phrase { :name "Lead 2" :beats 4 })
;} (:00 (36 128)) (phrase { :name "Lead 3" :beats 4 })
;(:04 (36 128)) (phrase { :name "Lead 4" :beats 4 })
;(:08 (36 128)) (phrase { :name "Lead 5" :beats 4 })
;(:12 (36 128)) (phrase { :name "Lead 6" :beats 4 })
;(:14 (36 128))) (phrase { :name "Lead 7" :beats 4 })
(phrase { :name "Lead 8" :beats 4 }))
;(phrase {
;:name "D Beat"
;:beats 4
;} (:00 (:44 :100) (:34 :100) (:35 :100))
;(:02 (:42 :100) )
;(:04 (:42 :080) (:38 :100) )
;(:06 (:44 :120) )
;(:08 (:42 :100) (:34 :100) (:35 :100))
;(:10 (:42 :100) (:34 :100) (:35 :100))
;(:12 (:44 :100) (:40 :100) )
;(:13 (:44 :100) )
;(:14 (:44 :100) )
;(:15 (:42 :100) ))
;(phrase {
;:name "Garage"
;:beats 4
;} (:00 (44 100) (36 100) (35 100))
;(:01 (44 100))
;(:02 (44 100) (35 100))
;(:03 (44 100))
;(:04 (44 100) (40 100))
;(:06 (44 100))
;(:07 (44 100) (34 100))
;(:09 (44 100))
;(:10 (44 100))
;(:11 (35 100) (36 100))
;(:12 (44 100) (40 100))
;(:14 (44 100))))
;(track "Bass"
;(lv2-plugin "Odin2")
;(phrase { :name "Empty" :beats 4 })
;(phrase { :name "Empty" :beats 4 }))
;(track "Lead"
;(lv2-plugin "Odin2")
;(phrase { :name "Empty" :beats 4 })
;(phrase { :name "Empty" :beats 4 }))

52
demos/scratch.edn Normal file
View file

@ -0,0 +1,52 @@
;(:bpm 150)
;(:track#01 "Drums")
;(:track#02 "Bass")
;(:track#03 "Lead")
;(:scene#01 "Intro" (:01 --) (:02 :01) (:03 :01) )
;(:scene#02 "Hook" )
;(:scene#03 "Verse" )
;(:scene#04 "Chorus")
;(:scene#05 "Bridge")
;(midi-in "nanoKEY Studio.*capture.*")
;(audio-out ["Komplete.+:playback_FL", "Komplete.+:playback_FR"])
;(sampler { :name "DrumKit1" :dir "/home/user/Lab/Music/pak" }
;(sample { :midi 34 :name "808" :file "808.wav" })
;(sample { :midi 35 :name "KC1" :file "kik.wav" })
;(sample { :midi 36 :name "KC2" :file "kik2.wav" })
;(sample { :midi 38 :name "SN1" :file "sna.wav" })
;(sample { :midi 40 :name "SN2" :file "sna2.wav" })
;(sample { :midi 42 :name "HH1" :file "chh.wav" })
;(sample { :midi 44 :name "HH2" :file "chh2.wav" }))
;(phrase { :name "4 kicks" :beats 4 :steps 16 }
;(:00 (36 128))
;(:04 (36 128))
;(:08 (36 128))
;(:12 (36 128))))
;(phrase {
;:name "5 kicks"
;:beats 4
;} (:00 (36 128))
;(:04 (36 128))
;(:08 (36 128))
;(:12 (36 128))
;(:14 (36 128)))
;(track "Bass"
;(lv2-plugin "Odin2")
;(phrase { :name "Empty" :beats 4 })
;(phrase { :name "Empty" :beats 4 }))
;(track "Lead"
;(lv2-plugin "Odin2")
;(phrase { :name "Empty" :beats 4 })
;(phrase { :name "Empty" :beats 4 }))

5
src/core/time.rs
View file

@ -14,7 +14,7 @@ impl Default for Timebase {
fn default () -> Self { fn default () -> Self {
Self { Self {
rate: 48000f64.into(), rate: 48000f64.into(),
bpm: 100f64.into(), bpm: 150f64.into(),
ppq: 96f64.into(), ppq: 96f64.into(),
} }
} }
@ -39,6 +39,9 @@ impl Timebase {
#[inline] pub fn bpm (&self) -> f64 { #[inline] pub fn bpm (&self) -> f64 {
self.bpm.load(Ordering::Relaxed) self.bpm.load(Ordering::Relaxed)
} }
#[inline] pub fn set_bpm (&self, bpm: f64) {
self.bpm.store(bpm, Ordering::Relaxed)
}
#[inline] fn usec_per_beat (&self) -> f64 { #[inline] fn usec_per_beat (&self) -> f64 {
60_000_000f64 / self.bpm() as f64 60_000_000f64 / self.bpm() as f64
} }

116
src/edn.rs
View file

@ -1,70 +1,84 @@
use crate::{core::*, model::*, App}; use crate::{core::*, model::*, App};
use clojure_reader::edn::Edn; use clojure_reader::{edn::{read, Edn}, error::Error as EdnError};
impl App { impl App {
pub fn load_edn (&mut self, mut src: &str) { pub fn load_edn (&mut self, mut src: &str) -> Usually<()> {
loop { loop {
match clojure_reader::edn::read(src) { match clojure_reader::edn::read(src) {
Ok((edn, rest)) => { Ok((edn, rest)) => {
self.load_edn_one(edn); self.load_edn_one(edn)?;
if rest.len() > 0 { if rest.len() > 0 {
src = rest; src = rest;
} else { } else {
break break
} }
}, },
Err(EdnError { ptr: None, .. }) => {
break
},
Err(e) => { Err(e) => {
panic!("{e:?}"); panic!("{e:?}");
} },
} }
} }
Ok(())
} }
fn load_edn_one <'e> (&mut self, edn: Edn<'e>) { fn load_edn_one <'e> (&mut self, edn: Edn<'e>) -> Usually<()> {
match edn { match edn {
Edn::List(items) => { Edn::List(items) => {
let head = items.get(0); let head = items.get(0);
match head { match head {
Some(Edn::Symbol("track")) => Track::load_edn(self, &items[1..]), Some(Edn::Symbol("track")) => {
Track::load_edn(self, &items[1..])?;
},
Some(Edn::Symbol("bpm")) => {
match items.get(1) {
Some(Edn::Int(b)) => self.timebase.set_bpm(*b as f64),
Some(Edn::Double(b)) => self.timebase.set_bpm(f64::from(*b)),
_ => panic!("unspecified bpm")
}
},
_ => panic!("unexpected edn: {head:?}") _ => panic!("unexpected edn: {head:?}")
} }
}, },
_ => { _ => {
panic!("unexpected edn: {edn:?}"); panic!("unexpected edn: {edn:?}");
} }
}; }
Ok(())
} }
} }
impl Track { impl Track {
fn load_edn <'a, 'e> (app: &'a mut App, items: &[Edn<'e>]) -> Usually<&'a mut Self> { fn load_edn <'a, 'e> (app: &'a mut App, args: &[Edn<'e>]) -> Usually<&'a mut Self> {
let ppq = app.timebase.ppq() as usize; let ppq = app.timebase.ppq() as usize;
let mut name = String::new(); let mut name = app.new_track_name();
let mut gain = 0.0f64; let mut gain = 0.0f64;
let mut devices: Vec<JackDevice> = vec![]; let mut devices: Vec<JackDevice> = vec![];
let mut phrases: Vec<Phrase> = vec![]; let mut phrases: Vec<Phrase> = vec![];
for edn in items[1..].iter() { for edn in args {
match edn { match edn {
Edn::Map(map) => { Edn::Map(map) => {
if let Some(Edn::Str(n)) = map.get(&Edn::Key("name")) { if let Some(Edn::Str(n)) = map.get(&Edn::Key(":name")) {
name = String::from(*n); name = String::from(*n);
} }
if let Some(Edn::Double(g)) = map.get(&Edn::Key("gain")) { if let Some(Edn::Double(g)) = map.get(&Edn::Key(":gain")) {
gain = f64::from(*g) gain = f64::from(*g)
} }
}, },
Edn::List(items) => match items.get(0) { Edn::List(args) => match args.get(0) {
Some(Edn::Symbol("phrase")) => { Some(Edn::Symbol("phrase")) => {
phrases.push(Phrase::load_edn(ppq, items)?) phrases.push(Phrase::load_edn(ppq, &args[1..])?)
}, },
Some(Edn::Symbol("sampler")) => { Some(Edn::Symbol("sampler")) => {
devices.push(Sampler::load_edn(items)?) devices.push(Sampler::load_edn(&args[1..])?)
}, },
Some(Edn::Symbol("lv2")) => { Some(Edn::Symbol("lv2")) => {
devices.push(LV2Plugin::load_edn(items)?) devices.push(LV2Plugin::load_edn(&args[1..])?)
}, },
None => panic!("empty list track {name}"), None => panic!("empty list track {name}"),
_ => panic!("unexpected in track {name}: {:?}", items.get(0).unwrap()) _ => panic!("unexpected in track {name}: {:?}", args.get(0).unwrap())
}, },
_ => {} _ => {}
} }
@ -82,39 +96,39 @@ impl Track {
} }
impl Phrase { impl Phrase {
fn load_edn <'e> (ppq: usize, items: &[Edn<'e>]) -> Usually<Self> { fn load_edn <'e> (ppq: usize, args: &[Edn<'e>]) -> Usually<Self> {
let mut name = String::new(); let mut name = String::new();
let mut beats = 0usize; let mut beats = 0usize;
let mut steps = 0usize; let mut steps = 0usize;
let mut data = BTreeMap::new(); let mut data = BTreeMap::new();
for edn in items[1..].iter() { for edn in args {
match edn { match edn {
Edn::Map(map) => { Edn::Map(map) => {
if let Some(Edn::Str(n)) = map.get(&Edn::Key("name")) { if let Some(Edn::Str(n)) = map.get(&Edn::Key(":name")) {
name = String::from(*n); name = String::from(*n);
} }
if let Some(Edn::Int(b)) = map.get(&Edn::Key("beats")) { if let Some(Edn::Int(b)) = map.get(&Edn::Key(":beats")) {
beats = *b as usize; beats = *b as usize;
} }
if let Some(Edn::Int(s)) = map.get(&Edn::Key("steps")) { if let Some(Edn::Int(s)) = map.get(&Edn::Key(":steps")) {
steps = *s as usize; steps = *s as usize;
} }
}, },
Edn::List(items) => { Edn::List(args) => {
let time = (match items.get(0) { let time = (match args.get(0) {
Some(Edn::Symbol(text)) => text.parse::<f64>()?, Some(Edn::Key(text)) => text[1..].parse::<f64>()?,
Some(Edn::Int(i)) => *i as f64, Some(Edn::Int(i)) => *i as f64,
Some(Edn::Double(f)) => f64::from(*f), Some(Edn::Double(f)) => f64::from(*f),
_ => panic!("unexpected in phrase {name}: {:?}", items.get(0)), _ => panic!("unexpected in phrase '{name}': {:?}", args.get(0)),
} * beats as f64 * ppq as f64 / steps as f64) as usize; } * beats as f64 * ppq as f64 / steps as f64) as usize;
for edn in items[1..].iter() { for edn in args[1..].iter() {
match edn { match edn {
Edn::List(items) => if let ( Edn::List(args) => if let (
Some(Edn::Int(key)), Some(Edn::Int(key)),
Some(Edn::Int(vel)), Some(Edn::Int(vel)),
) = ( ) = (
items.get(0), args.get(0),
items.get(1), args.get(1),
) { ) {
if !data.contains_key(&time) { if !data.contains_key(&time) {
data.insert(time, vec![]); data.insert(time, vec![]);
@ -124,13 +138,13 @@ impl Phrase {
vel: u7::from(*vel as u8), vel: u7::from(*vel as u8),
}); });
} else { } else {
panic!("unexpected list in phrase {name}") panic!("unexpected list in phrase '{name}'")
}, },
_ => panic!("unexpected in phrase {name}: {edn:?}") _ => panic!("unexpected in phrase '{name}': {edn:?}")
} }
} }
}, },
_ => panic!("unexpected in phrase {name}: {edn:?}"), _ => panic!("unexpected in phrase '{name}': {edn:?}"),
} }
} }
Ok(Self::new(&name, beats * ppq, Some(data))) Ok(Self::new(&name, beats * ppq, Some(data)))
@ -138,30 +152,30 @@ impl Phrase {
} }
impl Sampler { impl Sampler {
fn load_edn <'e> (items: &[Edn<'e>]) -> Usually<JackDevice> { fn load_edn <'e> (args: &[Edn<'e>]) -> Usually<JackDevice> {
let mut name = String::new(); let mut name = String::new();
let mut dir = String::new(); let mut dir = String::new();
let mut samples = BTreeMap::new(); let mut samples = BTreeMap::new();
for edn in items[1..].iter() { for edn in args {
match edn { match edn {
Edn::Map(map) => { Edn::Map(map) => {
if let Some(Edn::Str(n)) = map.get(&Edn::Key("name")) { if let Some(Edn::Str(n)) = map.get(&Edn::Key(":name")) {
name = String::from(*n); name = String::from(*n);
} }
if let Some(Edn::Str(n)) = map.get(&Edn::Key("dir")) { if let Some(Edn::Str(n)) = map.get(&Edn::Key(":dir")) {
dir = String::from(*n); dir = String::from(*n);
} }
}, },
Edn::List(items) => match items.get(0) { Edn::List(args) => match args.get(0) {
Some(Edn::Symbol("sample")) => { Some(Edn::Symbol("sample")) => {
let (midi, sample) = Sample::load_edn(&items[1..])?; let (midi, sample) = Sample::load_edn(&dir, &args[1..])?;
if let Some(midi) = midi { if let Some(midi) = midi {
samples.insert(midi, sample); samples.insert(midi, sample);
} else { } else {
panic!("sample without midi binding: {}", sample.name); panic!("sample without midi binding: {}", sample.name);
} }
}, },
_ => panic!("unexpected in sampler {name}: {items:?}") _ => panic!("unexpected in sampler {name}: {args:?}")
}, },
_ => panic!("unexpected in sampler {name}: {edn:?}") _ => panic!("unexpected in sampler {name}: {edn:?}")
} }
@ -171,46 +185,46 @@ impl Sampler {
} }
impl Sample { impl Sample {
fn load_edn <'e> (items: &[Edn<'e>]) -> Usually<(Option<u7>, Arc<Self>)> { fn load_edn <'e> (dir: &str, args: &[Edn<'e>]) -> Usually<(Option<u7>, Arc<Self>)> {
let mut name = String::new(); let mut name = String::new();
let mut file = String::new(); let mut file = String::new();
let mut midi = None; let mut midi = None;
let mut start = 0usize; let mut start = 0usize;
for edn in items[1..].iter() { for edn in args.iter() {
match edn { match edn {
Edn::Map(map) => { Edn::Map(map) => {
if let Some(Edn::Str(n)) = map.get(&Edn::Key("name")) { if let Some(Edn::Str(n)) = map.get(&Edn::Key(":name")) {
name = String::from(*n); name = String::from(*n);
} }
if let Some(Edn::Str(f)) = map.get(&Edn::Key("file")) { if let Some(Edn::Str(f)) = map.get(&Edn::Key(":file")) {
file = String::from(*f); file = String::from(*f);
} }
if let Some(Edn::Int(i)) = map.get(&Edn::Key("start")) { if let Some(Edn::Int(i)) = map.get(&Edn::Key(":start")) {
start = *i as usize; start = *i as usize;
} }
if let Some(Edn::Int(m)) = map.get(&Edn::Key("midi")) { if let Some(Edn::Int(m)) = map.get(&Edn::Key(":midi")) {
midi = Some(u7::from(*m as u8)); midi = Some(u7::from(*m as u8));
} }
}, },
_ => panic!("unexpected in sample {name}"), _ => panic!("unexpected in sample {name}"),
} }
} }
let (end, data) = read_sample_data(&file)?; let (end, data) = read_sample_data(&format!("{dir}/{file}"))?;
Ok((midi, Self::new(&name, start, end, data))) Ok((midi, Self::new(&name, start, end, data)))
} }
} }
impl LV2Plugin { impl LV2Plugin {
fn load_edn <'e> (items: &[Edn<'e>]) -> Usually<JackDevice> { fn load_edn <'e> (args: &[Edn<'e>]) -> Usually<JackDevice> {
let mut name = String::new(); let mut name = String::new();
let mut path = String::new(); let mut path = String::new();
for edn in items[1..].iter() { for edn in args.iter() {
match edn { match edn {
Edn::Map(map) => { Edn::Map(map) => {
if let Some(Edn::Str(n)) = map.get(&Edn::Key("name")) { if let Some(Edn::Str(n)) = map.get(&Edn::Key(":name")) {
name = String::from(*n); name = String::from(*n);
} }
if let Some(Edn::Str(p)) = map.get(&Edn::Key("path")) { if let Some(Edn::Str(p)) = map.get(&Edn::Key(":path")) {
path = String::from(*p); path = String::from(*p);
} }
}, },

268
src/main.rs
View file

@ -77,35 +77,20 @@ pub fn main () -> Usually<()> {
state.jack = Some(jack); state.jack = Some(jack);
state.load_edn(include_str!("../demos/project.edn")); state.load_edn(include_str!("../demos/project.edn"))?;
state.add_track_with_cb(Some("Drums"), |_, track|{ //state.add_track_with_cb(Some("Drums"), |_, track|{
track.add_device_with_cb(Sampler::new("Sampler", Some(BTreeMap::from([ //track.add_device_with_cb(Sampler::new("Sampler", Some(BTreeMap::from([
sample!(34, "808", "/home/user/Lab/Music/pak/808.wav"), //sample!(34, "808", "/home/user/Lab/Music/pak/808.wav"),
sample!(35, "Kick1", "/home/user/Lab/Music/pak/kik.wav"), //sample!(35, "Kick1", "/home/user/Lab/Music/pak/kik.wav"),
sample!(36, "Kick2", "/home/user/Lab/Music/pak/kik2.wav"), //sample!(36, "Kick2", "/home/user/Lab/Music/pak/kik2.wav"),
sample!(38, "Snare1", "/home/user/Lab/Music/pak/sna.wav"), //sample!(38, "Snare1", "/home/user/Lab/Music/pak/sna.wav"),
sample!(40, "Snare2", "/home/user/Lab/Music/pak/sna2.wav"), //sample!(40, "Snare2", "/home/user/Lab/Music/pak/sna2.wav"),
sample!(42, "Hihat", "/home/user/Lab/Music/pak/chh.wav"), //sample!(42, "Hihat", "/home/user/Lab/Music/pak/chh.wav"),
sample!(44, "Hihat", "/home/user/Lab/Music/pak/chh2.wav"), //sample!(44, "Hihat", "/home/user/Lab/Music/pak/chh2.wav"),
])))?, |track, device|{ //])))?, |track, device|{
device.connect_midi_in(0, &track.midi_out.clone_unowned())?; //device.connect_midi_in(0, &track.midi_out.clone_unowned())?;
if let Some(Some(left)) = audio_outs.get(0) {
device.connect_audio_out(0, left)?;
}
if let Some(Some(right)) = audio_outs.get(0) {
device.connect_audio_out(1, right)?;
}
Ok(())
})?;
//track.add_device_with_cb(Plugin::lv2(
//"Panagement",
//"file:///home/user/.lv2/Auburn Sounds Panagement 2.lv2"
//)?, |track, device|{
//device.connect_audio_in(0, &track.devices[0].audio_outs()?[0])?;
//device.connect_audio_in(0, &track.devices[0].audio_outs()?[1])?;
//if let Some(Some(left)) = audio_outs.get(0) { //if let Some(Some(left)) = audio_outs.get(0) {
//device.connect_audio_out(0, left)?; //device.connect_audio_out(0, left)?;
//} //}
@ -115,117 +100,132 @@ pub fn main () -> Usually<()> {
//Ok(()) //Ok(())
//})?; //})?;
track.sequence = Some(1); // FIXME ////track.add_device_with_cb(Plugin::lv2(
////"Panagement",
////"file:///home/user/.lv2/Auburn Sounds Panagement 2.lv2"
////)?, |track, device|{
////device.connect_audio_in(0, &track.devices[0].audio_outs()?[0])?;
////device.connect_audio_in(0, &track.devices[0].audio_outs()?[1])?;
////if let Some(Some(left)) = audio_outs.get(0) {
////device.connect_audio_out(0, left)?;
////}
////if let Some(Some(right)) = audio_outs.get(0) {
////device.connect_audio_out(1, right)?;
////}
////Ok(())
////})?;
track.add_phrase("4 kicks", ppq * 4, Some(phrase! { //track.sequence = Some(1); // FIXME
00 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
04 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
08 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
12 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
}));
track.add_phrase("5 kicks", ppq * 4, Some(phrase! {
00 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
04 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
08 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
12 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
14 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
}));
track.add_phrase("D-Beat", ppq * 4, Some(phrase! {
00 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
02 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
04 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
06 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
08 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
10 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
12 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
13 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
14 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
15 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
00 * ppq/4 => MidiMessage::NoteOn { key: 34.into(), vel: 100.into() },
04 * ppq/4 => MidiMessage::NoteOn { key: 38.into(), vel: 100.into() },
08 * ppq/4 => MidiMessage::NoteOn { key: 34.into(), vel: 100.into() },
10 * ppq/4 => MidiMessage::NoteOn { key: 35.into(), vel: 100.into() },
12 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
}));
track.add_phrase("Garage", ppq * 4, Some(phrase! {
00 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
01 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
02 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
03 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
04 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
06 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
07 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
09 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
10 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
12 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
14 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
00 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() }, //track.add_phrase("4 kicks", ppq * 4, Some(phrase! {
00 * ppq/4 => MidiMessage::NoteOn { key: 35.into(), vel: 100.into() }, //00 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
02 * ppq/4 => MidiMessage::NoteOn { key: 34.into(), vel: 100.into() }, //04 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
07 * ppq/4 => MidiMessage::NoteOn { key: 34.into(), vel: 100.into() }, //08 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
04 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() }, //12 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
11 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() }, //}));
11 * ppq/4 => MidiMessage::NoteOn { key: 35.into(), vel: 100.into() }, //track.add_phrase("5 kicks", ppq * 4, Some(phrase! {
12 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() }, //00 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
})); //04 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
Ok(()) //08 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
})?; //12 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
//14 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
//}));
//track.add_phrase("D-Beat", ppq * 4, Some(phrase! {
//00 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//02 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
//04 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
//06 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//08 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
//10 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
//12 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//13 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
//14 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//15 * ppq/4 => MidiMessage::NoteOn { key: 42.into(), vel: 100.into() },
//00 * ppq/4 => MidiMessage::NoteOn { key: 34.into(), vel: 100.into() },
//04 * ppq/4 => MidiMessage::NoteOn { key: 38.into(), vel: 100.into() },
//08 * ppq/4 => MidiMessage::NoteOn { key: 34.into(), vel: 100.into() },
//10 * ppq/4 => MidiMessage::NoteOn { key: 35.into(), vel: 100.into() },
//12 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
//}));
//track.add_phrase("Garage", ppq * 4, Some(phrase! {
//00 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//01 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//02 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//03 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//04 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//06 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//07 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//09 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//10 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//12 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
//14 * ppq/4 => MidiMessage::NoteOn { key: 44.into(), vel: 100.into() },
state.add_track_with_cb(Some("Bass"), |_, track|{ //00 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
track.add_device_with_cb(Plugin::lv2( //00 * ppq/4 => MidiMessage::NoteOn { key: 35.into(), vel: 100.into() },
"Odin2", //02 * ppq/4 => MidiMessage::NoteOn { key: 34.into(), vel: 100.into() },
"file:///home/user/.lv2/Odin2.lv2" //07 * ppq/4 => MidiMessage::NoteOn { key: 34.into(), vel: 100.into() },
)?, |track, device|{ //04 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
device.connect_midi_in(0, &track.midi_out.clone_unowned())?; //11 * ppq/4 => MidiMessage::NoteOn { key: 36.into(), vel: 100.into() },
if let Some(Some(left)) = audio_outs.get(0) { //11 * ppq/4 => MidiMessage::NoteOn { key: 35.into(), vel: 100.into() },
device.connect_audio_out(0, left)?; //12 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
} //}));
if let Some(Some(right)) = audio_outs.get(0) { //Ok(())
device.connect_audio_out(1, right)?; //})?;
}
Ok(())
})?;
track.sequence = Some(0); // FIXME
track.add_phrase("Offbeat", ppq * 4, Some(phrase! {
//00 * ppq/4 => MidiMessage::NoteOff { key: 40.into(), vel: 100.into() },
//02 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
//04 * ppq/4 => MidiMessage::NoteOff { key: 40.into(), vel: 100.into() },
//06 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
//08 * ppq/4 => MidiMessage::NoteOff { key: 40.into(), vel: 100.into() },
//10 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
//12 * ppq/4 => MidiMessage::NoteOff { key: 40.into(), vel: 100.into() },
//14 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
}));
track.add_phrase("Custom1", ppq * 4, None);
track.add_phrase("Custom2", ppq * 4, None);
track.add_phrase("Custom3", ppq * 4, None);
track.add_phrase("Custom4", ppq * 4, None);
Ok(())
})?;
state.add_track_with_cb(Some("Lead"), |_, track|{ //state.add_track_with_cb(Some("Bass"), |_, track|{
track.add_device_with_cb(Plugin::lv2( //track.add_device_with_cb(Plugin::lv2(
"Odin2", //"Odin2",
"file:///home/user/.lv2/Odin2.lv2" //"file:///home/user/.lv2/Odin2.lv2"
)?, |track, device|{ //)?, |track, device|{
device.connect_midi_in(0, &track.midi_out.clone_unowned())?; //device.connect_midi_in(0, &track.midi_out.clone_unowned())?;
if let Some(Some(left)) = audio_outs.get(0) { //if let Some(Some(left)) = audio_outs.get(0) {
device.connect_audio_out(0, left)?; //device.connect_audio_out(0, left)?;
} //}
if let Some(Some(right)) = audio_outs.get(0) { //if let Some(Some(right)) = audio_outs.get(0) {
device.connect_audio_out(1, right)?; //device.connect_audio_out(1, right)?;
} //}
Ok(()) //Ok(())
})?; //})?;
track.sequence = Some(0); // FIXME //track.sequence = Some(0); // FIXME
track.add_phrase("Custom0", ppq * 4, None); //track.add_phrase("Offbeat", ppq * 4, Some(phrase! {
track.add_phrase("Custom1", ppq * 4, None); ////00 * ppq/4 => MidiMessage::NoteOff { key: 40.into(), vel: 100.into() },
track.add_phrase("Custom2", ppq * 4, None); ////02 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
track.add_phrase("Custom3", ppq * 4, None); ////04 * ppq/4 => MidiMessage::NoteOff { key: 40.into(), vel: 100.into() },
track.add_phrase("Custom4", ppq * 4, None); ////06 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
Ok(()) ////08 * ppq/4 => MidiMessage::NoteOff { key: 40.into(), vel: 100.into() },
})?; ////10 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
////12 * ppq/4 => MidiMessage::NoteOff { key: 40.into(), vel: 100.into() },
////14 * ppq/4 => MidiMessage::NoteOn { key: 40.into(), vel: 100.into() },
//}));
//track.add_phrase("Custom1", ppq * 4, None);
//track.add_phrase("Custom2", ppq * 4, None);
//track.add_phrase("Custom3", ppq * 4, None);
//track.add_phrase("Custom4", ppq * 4, None);
//Ok(())
//})?;
//state.add_track_with_cb(Some("Lead"), |_, track|{
//track.add_device_with_cb(Plugin::lv2(
//"Odin2",
//"file:///home/user/.lv2/Odin2.lv2"
//)?, |track, device|{
//device.connect_midi_in(0, &track.midi_out.clone_unowned())?;
//if let Some(Some(left)) = audio_outs.get(0) {
//device.connect_audio_out(0, left)?;
//}
//if let Some(Some(right)) = audio_outs.get(0) {
//device.connect_audio_out(1, right)?;
//}
//Ok(())
//})?;
//track.sequence = Some(0); // FIXME
//track.add_phrase("Custom0", ppq * 4, None);
//track.add_phrase("Custom1", ppq * 4, None);
//track.add_phrase("Custom2", ppq * 4, None);
//track.add_phrase("Custom3", ppq * 4, None);
//track.add_phrase("Custom4", ppq * 4, None);
//Ok(())
//})?;
state.scenes = vec![ state.scenes = vec![
Scene::new("Intro", vec![None, Some(0), None, None]), Scene::new("Intro", vec![None, Some(0), None, None]),

7
src/model.rs
View file

@ -146,11 +146,14 @@ impl App {
}; };
Ok(()) Ok(())
} }
pub fn new_track_name (&self) -> String {
format!("Track {}", self.tracks.len() + 1)
}
pub fn add_track ( pub fn add_track (
&mut self, &mut self,
name: Option<&str>, name: Option<&str>,
) -> Usually<&mut Track> { ) -> Usually<&mut Track> {
let name = name.ok_or_else(||format!("Track {}", self.tracks.len() + 1))?; let name = name.ok_or_else(||self.new_track_name())?;
self.tracks.push(Track::new(&name, self.client(), None, None)?); self.tracks.push(Track::new(&name, self.client(), None, None)?);
self.track_cursor = self.tracks.len(); self.track_cursor = self.tracks.len();
Ok(&mut self.tracks[self.track_cursor - 1]) Ok(&mut self.tracks[self.track_cursor - 1])
@ -160,7 +163,7 @@ impl App {
name: Option<&str>, name: Option<&str>,
init: impl FnOnce(&Client, &mut Track)->Usually<()>, init: impl FnOnce(&Client, &mut Track)->Usually<()>,
) -> Usually<&mut Track> { ) -> Usually<&mut Track> {
let name = name.ok_or_else(||format!("Track {}", self.tracks.len() + 1))?; let name = name.ok_or_else(||self.new_track_name())?;
let mut track = Track::new(&name, self.client(), None, None)?; let mut track = Track::new(&name, self.client(), None, None)?;
init(self.client(), &mut track)?; init(self.client(), &mut track)?;
self.tracks.push(track); self.tracks.push(track);

1
src/model/phrase.rs
View file

@ -11,6 +11,7 @@ use crate::core::*;
}} }}
} }
#[derive(Debug)]
pub struct Phrase { pub struct Phrase {
pub name: String, pub name: String,
pub length: usize, pub length: usize,

13
src/view.rs
View file

@ -143,12 +143,13 @@ impl App {
note_cursor: self.note_cursor, note_cursor: self.note_cursor,
note_start: self.note_start, note_start: self.note_start,
}.render(buf, area)?; }.render(buf, area)?;
let track = self.tracks.get(self.track_cursor - 1).unwrap(); if let Some(track) = self.tracks.get(self.track_cursor - 1) {
if phrase.is_none() && self.section == AppSection::Sequencer { if phrase.is_none() && self.section == AppSection::Sequencer {
let label = format!("[ENTER] Create new clip: {}", track.name); let label = format!("[ENTER] Create new clip: {}", track.name);
let x = area.x + seq_area.width / 2 - (label.len() / 2) as u16; let x = area.x + seq_area.width / 2 - (label.len() / 2) as u16;
let y = area.y + seq_area.height / 2; let y = area.y + seq_area.height / 2;
label.blit(buf, x, y, Some(Style::default().white())); label.blit(buf, x, y, Some(Style::default().white()));
}
} }
Ok(seq_area) Ok(seq_area)
} }

2
src/view/grid.rs
View file

@ -166,7 +166,7 @@ impl<'a> SceneGridViewVertical<'a> {
" " " "
}, phrase.name) }, phrase.name)
} else { } else {
format!("????") format!(" ??? ")
} }
} else { } else {
format!(" ·········") format!(" ·········")