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

groovebox: reenable sampler record_finish
Some checks are pending
/ build (push) Waiting to run
Details

Browse source
This commit is contained in:
🪞👃🪞 2025-05-10 16:38:00 +03:00
parent 5648c96c6a
commit fb99128650
2 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/keys_sampler.edn
View file

@ -3,3 +3,4 @@
(@left sampler select :sample-to-left) (@left sampler select :sample-to-left)
(@right sampler select :sample-to-right) (@right sampler select :sample-to-right)
(@r sampler record-toggle :sample-selected) (@r sampler record-toggle :sample-selected)
(@shift-R sampler record-cancel)

24
crates/device/src/sampler/sampler_api.rs
View file

@ -55,7 +55,7 @@ impl Sampler {
impl SamplerCommand { impl SamplerCommand {
fn record_toggle (sampler: &mut Sampler, sample: usize) -> Perhaps<Self> { fn record_toggle (sampler: &mut Sampler, sample: usize) -> Perhaps<Self> {
if sampler.recording.is_some() { if sampler.recording.is_some() {
Self::record_cancel(sampler) Self::record_finish(sampler)
} else { } else {
Self::record_begin(sampler, sample) Self::record_begin(sampler, sample)
} }
@ -72,6 +72,17 @@ impl SamplerCommand {
)); ));
Ok(None) Ok(None)
} }
fn record_finish (sampler: &mut Sampler) -> Perhaps<Self> {
let recording = sampler.recording.take();
let _sample = if let Some((index, sample)) = recording {
let old = sampler.mapped[index].clone();
sampler.mapped[index] = Some(sample);
old
} else {
None
};
Ok(None)
}
fn record_cancel (sampler: &mut Sampler) -> Perhaps<Self> { fn record_cancel (sampler: &mut Sampler) -> Perhaps<Self> {
sampler.recording = None; sampler.recording = None;
Ok(None) Ok(None)
@ -86,17 +97,6 @@ impl SamplerCommand {
//self.mapped[i] = sample; //self.mapped[i] = sample;
//Some(Self::Set(old)) //Some(Self::Set(old))
//} //}
//fn record_finish (&self, state: &mut Sampler) -> Option<Self> {
//let recording = self.recording.take();
//let _sample = if let Some((index, sample)) = recording {
//let old = self.mapped[index].clone();
//self.mapped[index] = Some(sample);
//old
//} else {
//None
//};
//None
//}
//fn set_start (&self, state: &mut Sampler, pitch: u7, frame: usize) -> Option<Self> { //fn set_start (&self, state: &mut Sampler, pitch: u7, frame: usize) -> Option<Self> {
//todo!() //todo!()
//} //}