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.

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

Rework looping logic #420

Merged
merged 3 commits into from
Oct 30, 2020
Merged

Rework looping logic #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
416391c
Rework looping logic
Danielku15 Oct 24, 2020
88a982b
A bit cleanup
Danielku15 Oct 24, 2020
f4878f8
Ensure last note is fully played.
Danielku15 Oct 24, 2020
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
40 changes: 7 additions & 33 deletions src.csharp/AlphaTab.Windows/NAudioSynthOutput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public class NAudioSynthOutput : WaveProvider32, ISynthOutput, IDisposable

private DirectSoundOut _context;
private CircularSampleBuffer _circularBuffer;
private bool _finished;

/// <inheritdoc />
public double SampleRate => PreferredSampleRate;
Expand All @@ -42,7 +41,6 @@ public void Activate()
/// <inheritdoc />
public void Open()
{
_finished = false;
_circularBuffer = new CircularSampleBuffer(BufferSize * BufferCount);

_context = new DirectSoundOut(100);
Expand All @@ -62,7 +60,6 @@ public void Dispose()
/// </summary>
public void Close()
{
_finished = true;
_context.Stop();
_circularBuffer.Clear();
_context.Dispose();
Expand All @@ -72,7 +69,6 @@ public void Close()
public void Play()
{
RequestBuffers();
_finished = false;
_context.Play();
}

Expand All @@ -82,12 +78,6 @@ public void Pause()
_context.Pause();
}

/// <inheritdoc />
public void SequencerFinished()
{
_finished = true;
}

/// <inheritdoc />
public void AddSamples(Float32Array f)
{
Expand Down Expand Up @@ -117,29 +107,16 @@ private void RequestBuffers()
/// <inheritdoc />
public override int Read(float[] buffer, int offset, int count)
{
if (_circularBuffer.Count < count)
{
if (_finished)
{
((EventEmitter) Finished).Trigger();
}
}
else
{
var read = new Float32Array(count);
_circularBuffer.Read(read, 0, read.Length);
var read = new Float32Array(count);
_circularBuffer.Read(read, 0, System.Math.Min(read.Length, _circularBuffer.Count));

Buffer.BlockCopy(read.Data, 0, buffer, offset * sizeof(float),
count * sizeof(float));
Buffer.BlockCopy(read.Data, 0, buffer, offset * sizeof(float),
count * sizeof(float));

var samples = count / 2;
((EventEmitterOfT<double>) SamplesPlayed).Trigger(samples);
}
var samples = count / 2;
((EventEmitterOfT<double>) SamplesPlayed).Trigger(samples);

if (!_finished)
{
RequestBuffers();
}
RequestBuffers();

return count;
}
Expand All @@ -152,8 +129,5 @@ public override int Read(float[] buffer, int offset, int count)

/// <inheritdoc />
public IEventEmitter SampleRequest { get; } = new EventEmitter();

/// <inheritdoc />
public IEventEmitter Finished { get; } = new EventEmitter();
}
}
38 changes: 11 additions & 27 deletions src/platform/javascript/AlphaSynthWebAudioOutput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ export class AlphaSynthWebAudioOutput implements ISynthOutput {
private _source: AudioBufferSourceNode | null = null;
private _audioNode: ScriptProcessorNode | null = null;
private _circularBuffer!: CircularSampleBuffer;
private _finished: boolean = false;

public get sampleRate(): number {
return this._context ? this._context.sampleRate : AlphaSynthWebAudioOutput.PreferredSampleRate;
}

public open(): void {
this._finished = false;
this.patchIosSampleRate();
this._circularBuffer = new CircularSampleBuffer(
AlphaSynthWebAudioOutput.BufferSize * AlphaSynthWebAudioOutput.BufferCount
Expand Down Expand Up @@ -75,11 +73,11 @@ export class AlphaSynthWebAudioOutput implements ISynthOutput {
context.close();
}
}

private createAudioContext(): AudioContext {
if('AudioContext' in Environment.globalThis) {
if ('AudioContext' in Environment.globalThis) {
return new AudioContext();
} else if('webkitAudioContext' in Environment.globalThis) {
} else if ('webkitAudioContext' in Environment.globalThis) {
return new webkitAudioContext();
}
throw new AlphaTabError(AlphaTabErrorType.General, "AudioContext not found");
Expand All @@ -101,7 +99,6 @@ export class AlphaSynthWebAudioOutput implements ISynthOutput {
this._audioNode.onaudioprocess = this.generateSound.bind(this);
this._circularBuffer.clear();
this.requestBuffers();
this._finished = false;
this._source = ctx.createBufferSource();
this._source.buffer = this._buffer;
this._source.loop = true;
Expand All @@ -122,10 +119,6 @@ export class AlphaSynthWebAudioOutput implements ISynthOutput {
this._audioNode = null;
}

public sequencerFinished(): void {
this._finished = true;
}

public addSamples(f: Float32Array): void {
this._circularBuffer.write(f, 0, f.length);
}
Expand All @@ -149,27 +142,18 @@ export class AlphaSynthWebAudioOutput implements ISynthOutput {
let left: Float32Array = e.outputBuffer.getChannelData(0);
let right: Float32Array = e.outputBuffer.getChannelData(1);
let samples: number = left.length + right.length;
if (this._circularBuffer.count < samples) {
if (this._finished) {
(this.finished as EventEmitter).trigger();
}
} else {
let buffer: Float32Array = new Float32Array(samples);
this._circularBuffer.read(buffer, 0, buffer.length);
let s: number = 0;
for (let i: number = 0; i < left.length; i++) {
left[i] = buffer[s++];
right[i] = buffer[s++];
}
(this.samplesPlayed as EventEmitterOfT<number>).trigger(left.length);
}
if (!this._finished) {
this.requestBuffers();
let buffer: Float32Array = new Float32Array(samples);
this._circularBuffer.read(buffer, 0, Math.min(buffer.length, this._circularBuffer.count));
let s: number = 0;
for (let i: number = 0; i < left.length; i++) {
left[i] = buffer[s++];
right[i] = buffer[s++];
}
(this.samplesPlayed as EventEmitterOfT<number>).trigger(left.length);
this.requestBuffers();
}

readonly ready: IEventEmitter = new EventEmitter();
readonly samplesPlayed: IEventEmitterOfT<number> = new EventEmitterOfT<number>();
readonly sampleRequest: IEventEmitter = new EventEmitter();
readonly finished: IEventEmitter = new EventEmitter();
}
11 changes: 0 additions & 11 deletions src/platform/javascript/AlphaSynthWebWorkerApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ export class AlphaSynthWebWorkerApi implements IAlphaSynth {
this._output.ready.on(this.onOutputReady.bind(this));
this._output.samplesPlayed.on(this.onOutputSamplesPlayed.bind(this));
this._output.sampleRequest.on(this.onOutputSampleRequest.bind(this));
this._output.finished.on(this.onOutputFinished.bind(this));
this._output.open();
try {
let script: string = "importScripts('" + alphaSynthScriptFile + "')";
Expand Down Expand Up @@ -349,9 +348,6 @@ export class AlphaSynthWebWorkerApi implements IAlphaSynth {
this.checkReadyForPlayback();
(this.midiLoadFailed as EventEmitterOfT<Error>).trigger(data.error);
break;
case 'alphaSynth.output.sequencerFinished':
this._output.sequencerFinished();
break;
case 'alphaSynth.output.addSamples':
this._output.addSamples(data.samples);
break;
Expand Down Expand Up @@ -400,13 +396,6 @@ export class AlphaSynthWebWorkerApi implements IAlphaSynth {
cmd: 'alphaSynth.output.sampleRequest'
});
}

public onOutputFinished(): void {
this._synth.postMessage({
cmd: 'alphaSynth.output.finished'
});
}

public onOutputSamplesPlayed(samples: number): void {
this._synth.postMessage({
cmd: 'alphaSynth.output.samplesPlayed',
Expand Down
13 changes: 0 additions & 13 deletions src/platform/javascript/AlphaSynthWorkerSynthOutput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@ import { Environment } from '@src/Environment';
*/
export class AlphaSynthWorkerSynthOutput implements ISynthOutput {
public static readonly CmdOutputPrefix: string = 'alphaSynth.output.';
public static readonly CmdOutputSequencerFinished: string =
AlphaSynthWorkerSynthOutput.CmdOutputPrefix + 'sequencerFinished';
public static readonly CmdOutputAddSamples: string = AlphaSynthWorkerSynthOutput.CmdOutputPrefix + 'addSamples';
public static readonly CmdOutputPlay: string = AlphaSynthWorkerSynthOutput.CmdOutputPrefix + 'play';
public static readonly CmdOutputPause: string = AlphaSynthWorkerSynthOutput.CmdOutputPrefix + 'pause';
public static readonly CmdOutputResetSamples: string = AlphaSynthWorkerSynthOutput.CmdOutputPrefix + 'resetSamples';
public static readonly CmdOutputSampleRequest: string =
AlphaSynthWorkerSynthOutput.CmdOutputPrefix + 'sampleRequest';
public static readonly CmdOutputFinished: string = AlphaSynthWorkerSynthOutput.CmdOutputPrefix + 'finished';
public static readonly CmdOutputSamplesPlayed: string =
AlphaSynthWorkerSynthOutput.CmdOutputPrefix + 'samplesPlayed';

Expand Down Expand Up @@ -45,9 +42,6 @@ export class AlphaSynthWorkerSynthOutput implements ISynthOutput {
case AlphaSynthWorkerSynthOutput.CmdOutputSampleRequest:
(this.sampleRequest as EventEmitter).trigger();
break;
case AlphaSynthWorkerSynthOutput.CmdOutputFinished:
(this.finished as EventEmitter).trigger();
break;
case AlphaSynthWorkerSynthOutput.CmdOutputSamplesPlayed:
(this.samplesPlayed as EventEmitterOfT<number>).trigger(data.samples);
break;
Expand All @@ -57,13 +51,6 @@ export class AlphaSynthWorkerSynthOutput implements ISynthOutput {
public readonly ready: IEventEmitter = new EventEmitter();
public readonly samplesPlayed: IEventEmitterOfT<number> = new EventEmitterOfT<number>();
public readonly sampleRequest: IEventEmitter = new EventEmitter();
public readonly finished: IEventEmitter = new EventEmitter();

public sequencerFinished(): void {
this._worker.postMessage({
cmd: 'alphaSynth.output.sequencerFinished'
});
}

public addSamples(samples: Float32Array): void {
this._worker.postMessage({
Expand Down
63 changes: 46 additions & 17 deletions src/synth/AlphaSynth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,30 +143,35 @@ export class AlphaSynth implements IAlphaSynth {
(this.ready as EventEmitter).trigger();
this.checkReadyForPlayback();
});
this.output.finished.on(() => {
// stop everything
this.stop();
Logger.debug('AlphaSynth', 'Finished playback');
(this.finished as EventEmitter).trigger();
if (this._sequencer.isLooping) {
this.play();
}
});
this.output.sampleRequest.on(() => {
// synthesize buffer
this._sequencer.fillMidiEventQueue();
let samples: Float32Array = this._synthesizer.synthesize();
let samples: Float32Array = new Float32Array(
SynthConstants.MicroBufferSize * SynthConstants.MicroBufferCount * SynthConstants.AudioChannels
);
let bufferPos: number = 0;

for (let i = 0; i < SynthConstants.MicroBufferCount; i++) {
// synthesize buffer
this._sequencer.fillMidiEventQueue();
this._synthesizer.synthesize(samples, bufferPos, SynthConstants.MicroBufferSize);
bufferPos += SynthConstants.MicroBufferSize * SynthConstants.AudioChannels;

// tell sequencer to check whether its work is done
if (this._sequencer.isFinished) {
break;
}
}

// send it to output
if (bufferPos < samples.length) {
samples = samples.subarray(0, bufferPos);
}
this.output.addSamples(samples);
// tell sequencer to check whether its work is done
this._sequencer.checkForStop();
});
this.output.samplesPlayed.on(this.onSamplesPlayed.bind(this));

Logger.debug('AlphaSynth', 'Creating synthesizer');
this._synthesizer = new TinySoundFont(this.output.sampleRate);
this._sequencer = new MidiFileSequencer(this._synthesizer);
this._sequencer.finished.on(this.output.sequencerFinished.bind(this.output));

Logger.debug('AlphaSynth', 'Opening output');
this.output.open();
Expand Down Expand Up @@ -230,7 +235,7 @@ export class AlphaSynth implements IAlphaSynth {
(this.soundFontLoaded as EventEmitter).trigger();
}

public loadSoundFont(data: Uint8Array, append:boolean): void {
public loadSoundFont(data: Uint8Array, append: boolean): void {
this.pause();

let input: ByteBuffer = ByteBuffer.fromBuffer(data);
Expand Down Expand Up @@ -299,6 +304,30 @@ export class AlphaSynth implements IAlphaSynth {
private onSamplesPlayed(sampleCount: number): void {
let playedMillis: number = (sampleCount / this._synthesizer.outSampleRate) * 1000;
this.updateTimePosition(this._timePosition + playedMillis);

this.checkForFinish();
}

private checkForFinish() {
let startTick = 0;
let endTick = 0;
if (this.playbackRange) {
startTick = this.playbackRange.startTick;
endTick = this.playbackRange.endTick;
} else {
endTick = this._sequencer.endTick;
}

if (this._tickPosition >= endTick) {
Logger.debug('AlphaSynth', 'Finished playback');
(this.finished as EventEmitter).trigger();

if (this.isLooping) {
this.tickPosition = startTick;
} else {
this.stop();
}
}
}

private updateTimePosition(timePosition: number): void {
Expand All @@ -309,7 +338,7 @@ export class AlphaSynth implements IAlphaSynth {
const endTick: number = this._sequencer.endTick;
Logger.debug(
'AlphaSynth',
`Position changed: (time: ${currentTime}/${endTime}, tick: ${currentTick}/${endTime}, Active Voices: ${this._synthesizer.activeVoiceCount}`
`Position changed: (time: ${currentTime}/${endTime}, tick: ${currentTick}/${endTick}, Active Voices: ${this._synthesizer.activeVoiceCount}`
);
(this.positionChanged as EventEmitterOfT<PositionChangedEventArgs>).trigger(
new PositionChangedEventArgs(currentTime, endTime, currentTick, endTick)
Expand Down
11 changes: 0 additions & 11 deletions src/synth/ISynthOutput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ export interface ISynthOutput {
*/
open(): void;

/**
* Called when the sequencer finished the playback.
* This tells the output not to request any samples anymore after the existing buffers are finished.
*/
sequencerFinished(): void;

/**
* Called when the output should start the playback.
*/
Expand Down Expand Up @@ -62,9 +56,4 @@ export interface ISynthOutput {
* Fired when the output needs more samples to be played.
*/
readonly sampleRequest: IEventEmitter;

/**
* Fired when the last samples after calling SequencerFinished have been played.
*/
readonly finished: IEventEmitter;
}
Loading