Skip to content

Fix temperament widget playing incorrect notes for default temperaments #4802

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix temperament widget playing incorrect notes for default temperaments #4802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 23 additions & 1 deletion js/widgets/temperament.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1896,12 +1896,34 @@ function TemperamentWidget() {
const duration = 1 / 2;
let notes;

// Ensure the synth's temperament is set correctly
this._logo.synth.inTemperament = this.inTemperament;
this._logo.synth.changeInTemperament = true;

if (docById("wheelDiv4") === null) {
notes = this.frequencies[pitchNumber];
// For edit modes, use frequencies directly
if (this.editMode == "equal" && this.eqTempHzs && this.eqTempHzs.length) {
notes = this.eqTempHzs[pitchNumber];
} else if (this.editMode == "ratio" && this.NEqTempHzs && this.NEqTempHzs.length) {
notes = this.NEqTempHzs[pitchNumber];
} else {
// For default temperaments, use note names so the synth can apply temperament mapping
if (isCustomTemperament(this.inTemperament)) {
// For custom temperaments, use frequency or custom frequency method
notes = this.frequencies[pitchNumber];
} else {
// For default temperaments (non-12EDO), use note names
// Convert note array to string format (e.g., ["C", 4] -> "C4")
if (this.notes[pitchNumber] && Array.isArray(this.notes[pitchNumber])) {
const noteName = this.notes[pitchNumber][0];
const octave = this.notes[pitchNumber][1];
// Replace Unicode sharps/flats with ASCII equivalents
notes = noteName.replace(/♭/g, "b").replace(/♯/g, "#") + octave;
} else {
// Fallback to frequency if note format is unexpected
notes = this.frequencies[pitchNumber];
}
}
}
} else {
notes = this.tempRatios1[pitchNumber] * this.frequencies[0];
Expand Down