Skip to content

fix merging of holds and rests in cycle #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix merging of holds and rests in cycle #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3443214
fix merging of holds and rests in cycle
emuell Jun 11, 2024
3e1ec6b
"event" to "events"
unlessgames Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 26 additions & 47 deletions src/tidal/cycle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,14 +413,6 @@ impl Event {
}
}

#[cfg(test)]
fn with_hold(&self) -> Self {
Self {
value: Value::Hold,
..self.clone()
}
}

#[cfg(test)]
fn with_float(&self, f: f64) -> Self {
Self {
Expand Down Expand Up @@ -579,7 +571,7 @@ impl Events {

// filter out holds while extending preceding events
fn merge_holds(events: &[Event]) -> Vec<Event> {
let mut result: Vec<Event> = vec![];
let mut result: Vec<Event> = Vec::with_capacity(events.len());
for e in events {
match e.value {
Value::Hold => {
Expand All @@ -594,16 +586,16 @@ impl Events {
}

// filter out consecutive rests
// so any remaining rest can be converted to a note-off later
// so any remaining rest can be converted to a single note-off later
// rests at the beginning of a pattern also get dropped
fn merge_rests(events: &[Event]) -> Vec<Event> {
let mut result: Vec<Event> = vec![];
let mut result: Vec<Event> = Vec::with_capacity(events.len());
for e in events {
match e.value {
Value::Rest => {
if let Some(last) = result.last() {
if let Some(last) = result.last_mut() {
match last.value {
Value::Rest => {}
Value::Rest => last.extend(e),
_ => result.push(e.clone()),
}
}
Expand All @@ -615,12 +607,13 @@ impl Events {
}

// merge holds then rests separately to avoid collapsing rests and holding notes before them
fn merge(&self, channels: &mut [Vec<Event>]) -> Vec<Vec<Event>> {
channels
.iter_mut()
.map(|e| Self::merge_holds(e))
.map(|e| Self::merge_rests(&e))
.collect()
fn merge(&self, channels: &mut [Vec<Event>]) {
for events in &mut *channels {
*events = Self::merge_holds(events);
}
for events in channels {
*events = Self::merge_rests(events);
}
}
}

Expand Down Expand Up @@ -1291,18 +1284,17 @@ mod test {
);
assert_eq!(
Cycle::from("[R [e [n o]]] , [[[i s] e ] _]", None)?.generate(),
[
[
vec![
vec![
Event::at(F::from(0), F::new(1u8, 2u8)).with_name("R"),
Event::at(F::new(1u8, 2u8), F::new(1u8, 4u8)).with_note(4, 4),
Event::at(F::new(3u8, 4u8), F::new(1u8, 8u8)).with_name("n"),
Event::at(F::new(7u8, 8u8), F::new(1u8, 8u8)).with_name("o"),
],
[
vec![
Event::at(F::from(0), F::new(1u8, 8u8)).with_name("i"),
Event::at(F::new(1u8, 8u8), F::new(1u8, 8u8)).with_name("s"),
Event::at(F::new(1u8, 4u8), F::new(1u8, 4u8)).with_note(4, 4),
Event::at(F::new(1u8, 2u8), F::new(1u8, 2u8)).with_hold(),
Event::at(F::new(1u8, 4u8), F::new(3u8, 4u8)).with_note(4, 4),
],
]
);
Expand All @@ -1325,12 +1317,10 @@ mod test {
Event::at(F::new(1u8, 2u8), F::new(1u8, 2u8)).with_note(11, 4),
]],
vec![vec![
Event::at(F::from(0), F::new(1u8, 2u8)),
Event::at(F::new(1u8, 2u8), F::new(1u8, 2u8)).with_note(0, 4),
Event::at(F::new(1u8, 2u8), F::new(1u8, 2u8)).with_note(0, 4)
]],
vec![vec![
Event::at(F::from(0), F::new(1u8, 2u8)),
Event::at(F::new(1u8, 2u8), F::new(1u8, 2u8)).with_note(11, 4),
Event::at(F::new(1u8, 2u8), F::new(1u8, 2u8)).with_note(11, 4)
]],
vec![vec![
Event::at(F::from(0), F::new(1u8, 2u8)).with_note(9, 0),
Expand Down Expand Up @@ -1417,11 +1407,8 @@ mod test {
Cycle::from("[1 middle _] {}%42 [] <>", None)?.generate(),
[[
Event::at(F::from(0), F::new(1u8, 12u8)).with_int(1),
Event::at(F::new(1u8, 12u8), F::new(1u8, 12u8)).with_name("middle"),
Event::at(F::new(2u8, 12u8), F::new(1u8, 12u8)).with_hold(),
Event::at(F::new(1u8, 4u8), F::new(1u8, 4u8)),
Event::at(F::new(2u8, 4u8), F::new(1u8, 4u8)),
Event::at(F::new(3u8, 4u8), F::new(1u8, 4u8)),
Event::at(F::new(1u8, 12u8), F::new(1u8, 6u8)).with_name("middle"),
Event::at(F::new(1u8, 4u8), F::new(3u8, 4u8)),
]]
);

Expand Down Expand Up @@ -1480,14 +1467,11 @@ mod test {
],
vec![
Event::at(F::from(0), F::new(1u8, 11u8)).with_name("outside"),
Event::at(F::new(1u8, 11u8), F::new(1u8, 11u8)),
Event::at(F::new(2u8, 11u8), F::new(1u8, 11u8)),
Event::at(F::new(1u8, 11u8), F::new(2u8, 11u8)),
Event::at(F::new(3u8, 11u8), F::new(1u8, 11u8)).with_name("outside"),
Event::at(F::new(4u8, 11u8), F::new(1u8, 11u8)),
Event::at(F::new(5u8, 11u8), F::new(1u8, 11u8)),
Event::at(F::new(4u8, 11u8), F::new(2u8, 11u8)),
Event::at(F::new(6u8, 11u8), F::new(1u8, 11u8)).with_name("outside"),
Event::at(F::new(7u8, 11u8), F::new(1u8, 11u8)),
Event::at(F::new(8u8, 11u8), F::new(1u8, 11u8)),
Event::at(F::new(7u8, 11u8), F::new(2u8, 11u8)),
Event::at(F::new(9u8, 11u8), F::new(1u8, 11u8)).with_name("outside"),
Event::at(F::new(10u8, 11u8), F::new(1u8, 11u8)),
],
Expand All @@ -1507,8 +1491,7 @@ mod test {
Event::at(F::new(5u8, 10u8), F::new(1u8, 10u8))
.with_int(2)
.with_target(Target::Name("a".to_string())),
Event::at(F::new(3u8, 5u8), F::new(1u8, 5u8)),
Event::at(F::new(4u8, 5u8), F::new(1u8, 5u8)),
Event::at(F::new(3u8, 5u8), F::new(2u8, 5u8)),
]],
vec![vec![
Event::at(F::from(0), F::new(1u8, 10u8)).with_int(10),
Expand All @@ -1520,8 +1503,7 @@ mod test {
Event::at(F::new(5u8, 10u8), F::new(1u8, 10u8))
.with_int(20)
.with_target(Target::Name("a".to_string())),
Event::at(F::new(3u8, 5u8), F::new(1u8, 5u8)),
Event::at(F::new(4u8, 5u8), F::new(1u8, 5u8)),
Event::at(F::new(3u8, 5u8), F::new(2u8, 5u8)),
]],
],
)?;
Expand Down Expand Up @@ -1564,11 +1546,8 @@ mod test {
assert_eq!(
Cycle::from("c(3,8,9)", None)?.generate(),
[[
Event::at(F::from(0), F::new(1u8, 8u8)),
Event::at(F::new(1u8, 8u8), F::new(1u8, 8u8)),
Event::at(F::new(2u8, 8u8), F::new(1u8, 8u8)).with_note(0, 4),
Event::at(F::new(3u8, 8u8), F::new(1u8, 8u8)),
Event::at(F::new(4u8, 8u8), F::new(1u8, 8u8)),
Event::at(F::new(3u8, 8u8), F::new(1u8, 4u8)),
Event::at(F::new(5u8, 8u8), F::new(1u8, 8u8)).with_note(0, 4),
Event::at(F::new(6u8, 8u8), F::new(1u8, 8u8)),
Event::at(F::new(7u8, 8u8), F::new(1u8, 8u8)).with_note(0, 4),
Expand Down