more sound api + bugfixes

hxd/res/Sound.hx

@@ -3,6 +3,7 @@ package hxd.res;
 class Sound extends Resource {
 
 	var data : hxd.snd.Data;
+	var channel : hxd.snd.Channel;
 	public var lastPlay(default, null) = 0.;
 
 	public function getData() : hxd.snd.Data {
@@ -22,10 +23,25 @@ class Sound extends Resource {
 	}
 
 	public function dispose() {
+		stop();
 		data = null;
 	}
 
-	public function play( loop = false ) {
+	public function stop() {
+		if( channel != null ) {
+			channel.stop();
+			channel = null;
+		}
+	}
+
+	public function play( loop = false, volume = 1. ) {
+		lastPlay = haxe.Timer.stamp();
+		return channel = getWorker().play(this, loop, volume);
+	}
+
+	static var defaultWorker : hxd.snd.Worker = null;
+
+	public static function getWorker() {
 		if( defaultWorker == null ) {
 			// don't use a native worker since we haven't setup it in our main()
 			var old = hxd.Worker.ENABLE;
@@ -34,12 +50,9 @@ class Sound extends Resource {
 			defaultWorker.start();
 			hxd.Worker.ENABLE = old;
 		}
-		lastPlay = haxe.Timer.stamp();
-		return defaultWorker.play(this, loop);
+		return defaultWorker;
 	}
 
-	static var defaultWorker : hxd.snd.Worker = null;
-
 	public static function startWorker() {
 		if( defaultWorker != null )
 			return true;

hxd/snd/NativeChannel.hx

@@ -60,7 +60,9 @@ class NativeChannel {
 	function onFlashSample( event : flash.events.SampleDataEvent ) {
 		var buf = event.data;
 		buf.length = bufferSamples * 2 * 4;
+		buf.position = 0;
 		onSample(haxe.io.Float32Array.fromBytes(haxe.io.Bytes.ofData(buf)));
+		buf.position = bufferSamples * 2 * 4;
 	}
 	#end
 

hxd/snd/Worker.hx

@@ -32,6 +32,7 @@ class NativeChannelData {
 	public var tmpBuf : haxe.io.Bytes;
 	public var channel : NativeChannel;
 	public var channels : Array<Channel>;
+	public var busy : Bool;
 	public function new(w:Worker) {
 		channels = [];
 		tmpBuf = haxe.io.Bytes.alloc(w.bufferSamples * 4 * 2);
@@ -72,7 +73,7 @@ class Worker extends hxd.Worker<Message> {
 
 	function cleanChannels() {
 		for( c in channels )
-			if( c.channels.length == 0 && c.channel != null ) {
+			if( c.channels.length == 0 && c.channel != null && !c.busy ) {
 				c.channel.stop();
 				c.channel = null;
 			}
@@ -198,7 +199,7 @@ class Worker extends hxd.Worker<Message> {
 		var cmax = chan.channels.length;
 		for( i in 0...bufferSamples*2 )
 			out[i] = 0;
-
+		chan.busy = cmax != 0;
 		while( cid < cmax ) {
 			var c = chan.channels[cid++];