Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:
strategy:
fail-fast: false
matrix:
# os: [macos-latest, macos-13, ubuntu-20.04, windows-latest]
# os: [macos-latest, macos-15-intel, ubuntu-20.04, windows-latest]
include:
- name: Mac ARM
os: macos-latest
zipname: mac-arm

- name: Mac x86
os: macos-13
os: macos-15-intel
zipname: mac-x86

- name: Linux x86
Expand Down
4 changes: 2 additions & 2 deletions chorus/src/director.rs
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,9 @@ impl Director {
// Smoothly transition between the two notes. The time and envelope shape depend both on how
// large a jump we're making and on what vowel we're heading toward.

let transition_time = (1000 + 150*(current_note_index-note_index).abs()) as i64;
let transition_time = (2000 + 20*(current_note_index-note_index).abs()) as i64;
self.add_transition(delay, transition_time, TransitionData::FrequencyChange {start_frequency: self.frequency_after_transitions, end_frequency: frequency});
let min_envelope = self.envelope_after_transitions*f32::powf(0.85, (current_note_index-note_index).abs() as f32);
let min_envelope = self.envelope_after_transitions*f32::max(0.5, 1.0-0.05*((current_note_index-note_index).abs() as f32));
let first_vowel;
if !continuous && new_syllable.initial_vowels.len() > 0 {
first_vowel = new_syllable.initial_vowels[0];
Expand Down