Skip to content
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.

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

Fix beatGroups in 6/4, 9/4, 12/4 (take 2) #263

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Conversation

vanderstel
Copy link
Member

Follows after #260: compound meters should have a compound beat grouping.

This PR also renames some variables, mostly just to help me follow the logic for compound meters:

  • numBeats -> meterNumerator
  • beatValue -> meterDenominator
  • Rewrote some code to not mutate meterNumerator, a function-scope variable

7/4 is an exception where I think [[2, 8]] makes sense.

tempBeatGroups.push([1, 2]);
} else if (beatValue <= 1) {
} else if (meterDenominator <= 1) {
tempBeatGroups.push([1, 1]);
} else {
// 4/4, 2/4, 3/4, standard stuff
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the next PR can this comment be moved? It's now incorrectly placed.

tempBeatGroups.push([3, meterDenominator]);
}
} else {
tempBeatGroups.push([2, 8]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here is the standard stuff.

Copy link
Member

@mscuthbert mscuthbert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the fix.

@mscuthbert mscuthbert merged commit b1a221d into master Sep 18, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants