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

AudioBuffer feeds into AudioSource, make AudioSource handle context-specific functions to pause/play/etc

Browse Source
This commit is contained in:
Joshua Granick
2014-08-01 01:34:37 -07:00
parent 363a724a50
commit e50c2408a0
7 changed files with 233 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
templates/haxe/DefaultAssetLibrary.hx
View File

@@ -5,7 +5,6 @@ import haxe.Timer;
import haxe.Unserializer;
import lime.app.Preloader;
import lime.media.AudioBuffer;
import lime.media.AudioSource;
import lime.media.Image;
import lime.media.openal.AL;
import lime.utils.ByteArray;
@@ -153,13 +152,13 @@ class DefaultAssetLibrary extends AssetLibrary {
}
public override function getAudio (id:String):AudioSource {
public override function getAudioBuffer (id:String):AudioBuffer {
#if flash
var audio = new AudioSource ();
audio.src = cast (Type.createInstance (className.get (id), []), Sound);
return audio;
var buffer = new AudioBuffer ();
buffer.src = cast (Type.createInstance (className.get (id), []), Sound);
return buffer;
#elseif js
@@ -168,11 +167,7 @@ class DefaultAssetLibrary extends AssetLibrary {
#else
var buffer = AudioBuffer.fromFile (path.get (id));
buffer.createALBuffer ();
var audio = new AudioSource ();
audio.createALSource (buffer);
return audio;
return AudioBuffer.fromFile (path.get (id));
//if (className.exists(id)) return cast (Type.createInstance (className.get (id), []), Sound);
//else return new Sound (new URLRequest (path.get (id)), null, type.get (id) == MUSIC);
@@ -384,7 +379,7 @@ class DefaultAssetLibrary extends AssetLibrary {
}
public override function loadAudio (id:String, handler:AudioSource -> Void):Void {
public override function loadAudioBuffer (id:String, handler:AudioBuffer -> Void):Void {
#if (flash || js)
@@ -400,13 +395,13 @@ class DefaultAssetLibrary extends AssetLibrary {
//} else {
handler (getAudio (id));
handler (getAudioBuffer (id));
//}
#else
handler (getAudio (id));
handler (getAudioBuffer (id));
#end