kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use BYTES_OFFSET instead of SEC_OFFSET (closes #898)

Browse Source
This commit is contained in:
Joshua Granick
2017-01-24 12:46:17 -08:00
parent 8247e2ab37
commit 4f4918ae0a
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lime/_backend/native/NativeAudioSource.hx
View File

@@ -37,6 +37,7 @@ class NativeAudioSource {
private var parent:AudioSource; private var parent:AudioSource;
private var playing:Bool; private var playing:Bool;
private var position:Vector4; private var position:Vector4;
private var samples:Int;
private var stream:Bool; private var stream:Bool;
private var streamTimer:Timer; private var streamTimer:Timer;
private var timer:Timer; private var timer:Timer;
@@ -127,6 +128,8 @@ class NativeAudioSource {
} }
samples = Std.int ((dataLength * 8) / (parent.buffer.channels * parent.buffer.bitsPerSample));
} }
@@ -360,7 +363,13 @@ class NativeAudioSource {
} else { } else {
var time = Std.int (AL.getSourcef (handle, AL.SEC_OFFSET) * 1000) - parent.offset; var offset = AL.getSourcei (handle, AL.BYTE_OFFSET);
var ratio = (offset / dataLength);
var totalSeconds = samples / parent.buffer.sampleRate;
var time = Std.int (totalSeconds * ratio * 1000) - parent.offset;
//var time = Std.int (AL.getSourcef (handle, AL.SEC_OFFSET) * 1000) - parent.offset;
if (time < 0) return 0; if (time < 0) return 0;
return time; return time;
@@ -385,7 +394,19 @@ class NativeAudioSource {
AL.sourceRewind (handle); AL.sourceRewind (handle);
if (playing) AL.sourcePlay (handle); if (playing) AL.sourcePlay (handle);
AL.sourcef (handle, AL.SEC_OFFSET, (value + parent.offset) / 1000); //AL.sourcef (handle, AL.SEC_OFFSET, (value + parent.offset) / 1000);
var secondOffset = (value + parent.offset) / 1000;
var totalSeconds = samples / parent.buffer.sampleRate;
if (secondOffset < 0) secondOffset = 0;
if (secondOffset > totalSeconds) secondOffset = totalSeconds;
var ratio = (secondOffset / totalSeconds);
var totalOffset = Std.int (dataLength * ratio);
var currentOffset = AL.getSourcei (handle, AL.BYTE_OFFSET);
AL.sourcei (handle, AL.BYTE_OFFSET, totalOffset - currentOffset);
} }
@@ -441,7 +462,6 @@ class NativeAudioSource {
} }
var samples = (dataLength * 8) / (parent.buffer.channels * parent.buffer.bitsPerSample);
return Std.int (samples / parent.buffer.sampleRate * 1000) - parent.offset; return Std.int (samples / parent.buffer.sampleRate * 1000) - parent.offset;
} }