diff --git a/src/PlayerSettings.ts b/src/PlayerSettings.ts index 56e8a2539..9176f920f 100644 --- a/src/PlayerSettings.ts +++ b/src/PlayerSettings.ts @@ -25,42 +25,42 @@ export class VibratoPlaybackSettings { /** * Gets or sets the wavelength of the note-wide vibrato in midi ticks. */ - public noteWideLength: number = 480; + public noteWideLength: number = 240; /** * Gets or sets the amplitude for the note-wide vibrato in semitones. */ - public noteWideAmplitude: number = 2; + public noteWideAmplitude: number = 1; /** * Gets or sets the wavelength of the note-slight vibrato in midi ticks. */ - public noteSlightLength: number = 480; + public noteSlightLength: number = 360; /** * Gets or sets the amplitude for the note-slight vibrato in semitones. */ - public noteSlightAmplitude: number = 2; + public noteSlightAmplitude: number = 0.5; /** * Gets or sets the wavelength of the beat-wide vibrato in midi ticks. */ - public beatWideLength: number = 240; + public beatWideLength: number = 480; /** * Gets or sets the amplitude for the beat-wide vibrato in semitones. */ - public beatWideAmplitude: number = 3; + public beatWideAmplitude: number = 2; /** * Gets or sets the wavelength of the beat-slight vibrato in midi ticks. */ - public beatSlightLength: number = 240; + public beatSlightLength: number = 480; /** * Gets or sets the amplitude for the beat-slight vibrato in semitones. */ - public beatSlightAmplitude: number = 3; + public beatSlightAmplitude: number = 2; } /** diff --git a/test/audio/MidiFileGenerator.test.ts b/test/audio/MidiFileGenerator.test.ts index 46e93a632..4cf6722a9 100644 --- a/test/audio/MidiFileGenerator.test.ts +++ b/test/audio/MidiFileGenerator.test.ts @@ -804,13 +804,13 @@ describe('MidiFileGeneratorTest', () => { new FlatNoteBendEvent(0, 0, info.primaryChannel, note1.realValue, 8192), // no bend (note itself) new FlatNoteBendEvent(0, 0, info.primaryChannel, note1.realValue, 8192), // no bend (vibrato start on main note) - new FlatNoteBendEvent(120, 0, info.primaryChannel, note1.realValue, 8704), + new FlatNoteBendEvent(120, 0, info.primaryChannel, note1.realValue, 8320), new FlatNoteBendEvent(240, 0, info.primaryChannel, note1.realValue, 8192), - new FlatNoteBendEvent(360, 0, info.primaryChannel, note1.realValue, 7680), + new FlatNoteBendEvent(360, 0, info.primaryChannel, note1.realValue, 8064), new FlatNoteBendEvent(480, 0, info.primaryChannel, note1.realValue, 8192), - new FlatNoteBendEvent(600, 0, info.primaryChannel, note1.realValue, 8704), + new FlatNoteBendEvent(600, 0, info.primaryChannel, note1.realValue, 8320), new FlatNoteBendEvent(720, 0, info.primaryChannel, note1.realValue, 8192), - new FlatNoteBendEvent(840, 0, info.primaryChannel, note1.realValue, 7680), + new FlatNoteBendEvent(840, 0, info.primaryChannel, note1.realValue, 8064), new FlatNoteBendEvent(960, 0, info.primaryChannel, note1.realValue, 8192), // end of quarter note (main) new FlatNoteEvent( 0, @@ -822,13 +822,13 @@ describe('MidiFileGeneratorTest', () => { ), new FlatNoteBendEvent(960, 0, info.primaryChannel, note1.realValue, 8192), // no bend (vibrato start on main note) - new FlatNoteBendEvent(1080, 0, info.primaryChannel, note1.realValue, 8704), // continued vibrato on tied note + new FlatNoteBendEvent(1080, 0, info.primaryChannel, note1.realValue, 8320), // continued vibrato on tied note new FlatNoteBendEvent(1200, 0, info.primaryChannel, note1.realValue, 8192), - new FlatNoteBendEvent(1320, 0, info.primaryChannel, note1.realValue, 7680), + new FlatNoteBendEvent(1320, 0, info.primaryChannel, note1.realValue, 8064), new FlatNoteBendEvent(1440, 0, info.primaryChannel, note1.realValue, 8192), - new FlatNoteBendEvent(1560, 0, info.primaryChannel, note1.realValue, 8704), + new FlatNoteBendEvent(1560, 0, info.primaryChannel, note1.realValue, 8320), new FlatNoteBendEvent(1680, 0, info.primaryChannel, note1.realValue, 8192), - new FlatNoteBendEvent(1800, 0, info.primaryChannel, note1.realValue, 7680), + new FlatNoteBendEvent(1800, 0, info.primaryChannel, note1.realValue, 8064), new FlatNoteBendEvent(1920, 0, info.primaryChannel, note1.realValue, 8192), // end of second quarter note // end of track @@ -1127,13 +1127,13 @@ describe('MidiFileGeneratorTest', () => { // vibrato starts on tied note on height of the bend-end new FlatNoteBendEvent(960, 0, info.secondaryChannel, note1.realValue, 9216), - new FlatNoteBendEvent(1080, 0, info.secondaryChannel, note1.realValue, 9728), + new FlatNoteBendEvent(1080, 0, info.secondaryChannel, note1.realValue, 9344), new FlatNoteBendEvent(1200, 0, info.secondaryChannel, note1.realValue, 9216), - new FlatNoteBendEvent(1320, 0, info.secondaryChannel, note1.realValue, 8704), + new FlatNoteBendEvent(1320, 0, info.secondaryChannel, note1.realValue, 9088), new FlatNoteBendEvent(1440, 0, info.secondaryChannel, note1.realValue, 9216), - new FlatNoteBendEvent(1560, 0, info.secondaryChannel, note1.realValue, 9728), + new FlatNoteBendEvent(1560, 0, info.secondaryChannel, note1.realValue, 9344), new FlatNoteBendEvent(1680, 0, info.secondaryChannel, note1.realValue, 9216), - new FlatNoteBendEvent(1800, 0, info.secondaryChannel, note1.realValue, 8704), + new FlatNoteBendEvent(1800, 0, info.secondaryChannel, note1.realValue, 9088), new FlatNoteBendEvent(1920, 0, info.secondaryChannel, note1.realValue, 9216), // end of track