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
8 changes: 4 additions & 4 deletions src/platform/javascript/AlphaSynthWebWorkerApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export class AlphaSynthWebWorkerApi implements IAlphaSynth {
}

public set masterVolume(value: number) {
value = SynthHelper.clamp(value, SynthConstants.MinVolume, SynthConstants.MaxVolume);
value = Math.max(value, SynthConstants.MinVolume);
this._masterVolume = value;
this._synth.postMessage({
cmd: 'alphaSynth.setMasterVolume',
Expand All @@ -76,7 +76,7 @@ export class AlphaSynthWebWorkerApi implements IAlphaSynth {
}

public set metronomeVolume(value: number) {
value = SynthHelper.clamp(value, SynthConstants.MinVolume, SynthConstants.MaxVolume);
value = Math.max(value, SynthConstants.MinVolume);
this._metronomeVolume = value;
this._synth.postMessage({
cmd: 'alphaSynth.setMetronomeVolume',
Expand All @@ -88,7 +88,7 @@ export class AlphaSynthWebWorkerApi implements IAlphaSynth {
}

public set countInVolume(value: number) {
value = SynthHelper.clamp(value, SynthConstants.MinVolume, SynthConstants.MaxVolume);
value = Math.max(value, SynthConstants.MinVolume);
this._countInVolume = value;
this._synth.postMessage({
cmd: 'alphaSynth.setCountInVolume',
Expand Down Expand Up @@ -318,7 +318,7 @@ export class AlphaSynthWebWorkerApi implements IAlphaSynth {
}

public setChannelVolume(channel: number, volume: number): void {
volume = SynthHelper.clamp(volume, SynthConstants.MinVolume, SynthConstants.MaxVolume);
volume = Math.max(volume, SynthConstants.MinVolume);
this._synth.postMessage({
cmd: 'alphaSynth.setChannelVolume',
channel: channel,
Expand Down
8 changes: 4 additions & 4 deletions src/synth/AlphaSynth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export class AlphaSynth implements IAlphaSynth {
}

public set masterVolume(value: number) {
value = SynthHelper.clamp(value, SynthConstants.MinVolume, SynthConstants.MaxVolume);
value = Math.max(value, SynthConstants.MinVolume);
this._synthesizer.masterVolume = value;
}

Expand All @@ -64,7 +64,7 @@ export class AlphaSynth implements IAlphaSynth {
}

public set metronomeVolume(value: number) {
value = SynthHelper.clamp(value, SynthConstants.MinVolume, SynthConstants.MaxVolume);
value = Math.max(value, SynthConstants.MinVolume);
this._metronomeVolume = value;
this._synthesizer.metronomeVolume = value;
}
Expand All @@ -74,7 +74,7 @@ export class AlphaSynth implements IAlphaSynth {
}

public set countInVolume(value: number) {
value = SynthHelper.clamp(value, SynthConstants.MinVolume, SynthConstants.MaxVolume);
value = Math.max(value, SynthConstants.MinVolume);
this._countInVolume = value;
}

Expand Down Expand Up @@ -333,7 +333,7 @@ export class AlphaSynth implements IAlphaSynth {
}

public setChannelVolume(channel: number, volume: number): void {
volume = SynthHelper.clamp(volume, SynthConstants.MinVolume, SynthConstants.MaxVolume);
volume = Math.max(volume, SynthConstants.MinVolume);
this._synthesizer.channelSetMixVolume(channel, volume);
}

Expand Down
1 change: 0 additions & 1 deletion src/synth/SynthConstants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export class SynthConstants {
public static readonly MetronomeChannel: number = SynthConstants.DefaultChannelCount - 1;
public static readonly AudioChannels: number = 2;
public static readonly MinVolume: number = 0;
public static readonly MaxVolume: number = 1;
public static readonly MinProgram: number = 0;
public static readonly MaxProgram: number = 127;
public static readonly MinPlaybackSpeed: number = 0.125;
Expand Down