Merge pull request #1525 from moisesjpelaez/hl_audio_fix

Fix Kore-HL audio initialization and playback

Author: RobDangerous

Backends/Kore-HL/kha/audio2/StreamChannel.hx

@@ -1,6 +1,5 @@
 package kha.audio2;
 
-import haxe.ds.Vector;
 import haxe.io.Bytes;
 
 class StreamChannel implements kha.audio1.AudioChannel {
@@ -9,10 +8,12 @@ class StreamChannel implements kha.audio1.AudioChannel {
 	@:keep var loop: Bool;
 	var myVolume: Float;
 	var paused: Bool = false;
+	var _data: Bytes;
 
 	public function new(data: Bytes, loop: Bool) {
 		myVolume = 1;
 		this.loop = loop;
+		this._data = data;
 		_vorbis = kinc_sound_init_vorbis(data.getData().bytes, data.length);
 	}
 
@@ -28,6 +29,10 @@ class StreamChannel implements kha.audio1.AudioChannel {
 	}
 
 	public function play(): Void {
+		if (atend) {
+			_vorbis = kinc_sound_init_vorbis(_data.getData().bytes, _data.length);
+			atend = false;
+		}
 		paused = false;
 	}
 

Backends/Kore-HL/kinc-bridge/kinc.c.h

@@ -52,9 +52,9 @@ static void mix(kinc_a2_buffer_t *buffer, uint32_t samples, void *userdata) {
 	hl_blocking(true);
 #endif
 
-	audioCallCallback(samples);
+	audioCallCallback(samples * 2);
 
-	for (uint32_t i = 0; i < samples; i += 2) {
+	for (uint32_t i = 0; i < samples; ++i) {
 		float left_value = audioReadSample();
 		float right_value = audioReadSample();
 		*(float *)&buffer->channels[0][buffer->write_location] = left_value;
@@ -94,8 +94,8 @@ void hl_init_kore(vbyte *title, int width, int height, int samplesPerPixel, bool
 void hl_kinc_init_audio(vclosure *callCallback, vclosure *readSample, int *outSamplesPerSecond) {
 	audioCallCallback = *((FN_AUDIO_CALL_CALLBACK *)(&callCallback->fun));
 	audioReadSample = *((FN_AUDIO_READ_SAMPLE *)(&readSample->fun));
-	kinc_a2_set_callback(mix, NULL);
 	kinc_a2_init();
+	kinc_a2_set_callback(mix, NULL);
 	*outSamplesPerSecond = kinc_a2_samples_per_second();
 }