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

Make HowlerJS define consistent

Browse Source
This commit is contained in:
Joshua Granick
2018-08-09 12:02:05 -07:00
parent 91872a282e
commit 2222e81767
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/lime/_internal/backend/html5/HTML5AudioSource.hx
View File

@@ -47,7 +47,7 @@ class HTML5AudioSource {
public function play ():Void {
#if howlerjs
#if lime_howlerjs
if (playing || parent.buffer == null || parent.buffer.__srcHowl == null) {
@@ -82,7 +82,7 @@ class HTML5AudioSource {
public function pause ():Void {
#if howlerjs
#if lime_howlerjs
playing = false;
@@ -99,7 +99,7 @@ class HTML5AudioSource {
public function stop ():Void {
#if howlerjs
#if lime_howlerjs
playing = false;
@@ -123,7 +123,7 @@ class HTML5AudioSource {
private function howl_onEnd () {
#if howlerjs
#if lime_howlerjs
playing = false;
@@ -164,7 +164,7 @@ class HTML5AudioSource {
}
#if howlerjs
#if lime_howlerjs
if (completed) {
@@ -187,7 +187,7 @@ class HTML5AudioSource {
public function setCurrentTime (value:Int):Int {
#if howlerjs
#if lime_howlerjs
if (parent.buffer != null && parent.buffer.__srcHowl != null) {
@@ -214,7 +214,7 @@ class HTML5AudioSource {
public function setGain (value:Float):Float {
#if howlerjs
#if lime_howlerjs
// set howler volume only if we have an active id.
// Passing -1 might create issues in future play()'s.
@@ -240,7 +240,7 @@ class HTML5AudioSource {
}
#if howlerjs
#if lime_howlerjs
if (parent.buffer != null && parent.buffer.__srcHowl != null) {
@@ -278,7 +278,7 @@ class HTML5AudioSource {
public function getPosition ():Vector4 {
#if howlerjs
#if lime_howlerjs
// TODO: Use 3D audio plugin
@@ -296,7 +296,7 @@ class HTML5AudioSource {
position.z = value.z;
position.w = value.w;
#if howlerjs
#if lime_howlerjs
// TODO: Use 3D audio plugin

22
src/lime/media/AudioBuffer.hx
View File

@@ -14,7 +14,7 @@ import lime.net.HTTPRequest;
import lime.utils.Log;
import lime.utils.UInt8Array;
#if howlerjs
#if lime_howlerjs
import lime.media.howlerjs.Howl;
#end
#if (js && html5)
@@ -49,7 +49,7 @@ class AudioBuffer {
@:noCompletion private var __srcAudio:#if (js && html5) Audio #else Dynamic #end;
@:noCompletion private var __srcBuffer:#if lime_cffi ALBuffer #else Dynamic #end;
@:noCompletion private var __srcCustom:Dynamic;
@:noCompletion private var __srcHowl:#if howlerjs Howl #else Dynamic #end;
@:noCompletion private var __srcHowl:#if lime_howlerjs Howl #else Dynamic #end;
@:noCompletion private var __srcSound:#if flash Sound #else Dynamic #end;
@:noCompletion private var __srcVorbisFile:#if lime_vorbis VorbisFile #else Dynamic #end;
@@ -75,7 +75,7 @@ class AudioBuffer {
public function dispose ():Void {
#if (js && html5 && howlerjs)
#if (js && html5 && lime_howlerjs)
__srcHowl.unload ();
@@ -88,7 +88,7 @@ class AudioBuffer {
if (base64String == null) return null;
#if (js && html5 && howlerjs)
#if (js && html5 && lime_howlerjs)
// if base64String doesn't contain codec data, add it.
if (base64String.indexOf(",") == -1) {
@@ -144,7 +144,7 @@ class AudioBuffer {
if (bytes == null) return null;
#if (js && html5 && howlerjs)
#if (js && html5 && lime_howlerjs)
var audioBuffer = new AudioBuffer ();
audioBuffer.src = new Howl ({ src: [ "data:" + __getCodec (bytes) + ";base64," + Base64.encode (bytes) ], html5: true, preload: false });
@@ -186,7 +186,7 @@ class AudioBuffer {
if (path == null) return null;
#if (js && html5 && howlerjs)
#if (js && html5 && lime_howlerjs)
var audioBuffer = new AudioBuffer ();
audioBuffer.__srcHowl = new Howl ({ src: [ path ], preload: false });
@@ -242,7 +242,7 @@ class AudioBuffer {
public static function fromFiles (paths:Array<String>):AudioBuffer {
#if (js && html5 && howlerjs)
#if (js && html5 && lime_howlerjs)
var audioBuffer = new AudioBuffer ();
audioBuffer.__srcHowl = new Howl ({ src: paths, preload: false });
@@ -321,7 +321,7 @@ class AudioBuffer {
audioBuffer.__srcSound.addEventListener (flash.events.IOErrorEvent.IO_ERROR, promise.error);
#elseif (js && html5 && howlerjs)
#elseif (js && html5 && lime_howlerjs)
if (audioBuffer != null) {
@@ -383,7 +383,7 @@ class AudioBuffer {
var promise = new Promise<AudioBuffer> ();
#if (js && html5 && howlerjs)
#if (js && html5 && lime_howlerjs)
var audioBuffer = AudioBuffer.fromFiles (paths);
@@ -456,7 +456,7 @@ class AudioBuffer {
@:noCompletion private function get_src ():Dynamic {
#if (js && html5)
#if howlerjs
#if lime_howlerjs
return __srcHowl;
@@ -485,7 +485,7 @@ class AudioBuffer {
@:noCompletion private function set_src (value:Dynamic):Dynamic {
#if (js && html5)
#if howlerjs
#if lime_howlerjs
return __srcHowl = value;

1
src/lime/media/howlerjs/Howler.hx
View File

@@ -62,7 +62,6 @@ class Howler {
}
#else