Fixed issues in WebAudio and Flash plugins.

Author: Andrew Start

README.md

@@ -59,7 +59,9 @@ Have a look at the included examples and API documentation for more in-depth inf
 * The FlashAudioPlugin as3 class allows all domains to embed it.
 * The FlashAudioPlugin as3 class plays infinitely looping audio differently to allow it to play gaplessly - this prevents notification when a loop completes in that case.
 * FlashAudioPlugin can handle changing the master volume before the swf is loaded.
+* Changed how FlashAudioPlugin handles loaded files to avoid reloading files each time you play a sound.
 * Sound gets the extension and filename differently from the url so that assets retrieved via PHP service don't break it.
 * Added global pause() and resume() to Sound.
 * Added _volume as a property to AbstractPlugin so it wouldn't be undefined before setVolume() was called
 * Made a small change to XHRRequest's _checkError() to be more Cordova friendly.
+* Added a check in WebAudioSoundInstance to avoid having negative sound durations, which throws errors.

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "SoundJS",
-	"version": "0.6.1",
+	"version": "0.6.2",
 	"homepage": "https://github.com/CreateJS/SoundJS",
 	"authors": [
 		"lannymcnie",
@@ -9,7 +9,7 @@
 		"wdamien"
 	],
 	"description": "A Javascript library for working with Audio. Features a simple interface as the front end to multiple audio APIs via a plugin model. Currently supports WebAudio, HTML5 Audio, and a Flash fallback. Part of the CreateJS suite of libraries.",
-	"main": "lib/soundjs-0.6.1.combined.js",
+	"main": "lib/soundjs-0.6.2.combined.js",
 	"keywords": [
 		"sound",
 		"audio",

build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "SoundJS",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "SoundJS Docs",
   "url": "http://www.createjs.com/#!/SoundJS",
   "logo": "assets/docs-icon-SoundJS.png",

dev/com/createjs/soundjs/FlashAudioPlugin.as

@@ -43,6 +43,7 @@
 		protected var playbackTimer:Timer = new Timer(50);
 		public var masterVolume:Number = 1;
 		public var soundDurationHash:Object;
+		public var soundHash:Object;
 
 	// UI Elements:
 	// ** AUTO-UI ELEMENTS **
@@ -59,6 +60,7 @@
 			lookup = {};
 			preloadHash = {};
 			soundDurationHash = {};
+			soundHash = {};
 			preloadLookup = new Dictionary();
 		}
 
@@ -173,12 +175,17 @@
 
 		protected function handleLoadComplete(event:Event):void {
 			var id = preloadLookup[event.target];
-			ExternalInterface.call(PRELOAD_CALLBACK, id, "handleComplete");
 			delete preloadLookup[event.target];
-			delete preloadHash[id];
 			var src = soundDurationHash[id];
+			var sound = preloadHash[id];
+			sound.removeEventListener(ProgressEvent.PROGRESS, handleLoadProgress, false);
+			sound.removeEventListener(Event.COMPLETE, handleLoadComplete, false);
+			sound.removeEventListener(IOErrorEvent.IO_ERROR, handleLoadError, false);
+			soundHash[src] = sound;
+			delete preloadHash[id];
 			soundDurationHash[src] = event.target.length;
 			delete soundDurationHash[id];
+			ExternalInterface.call(PRELOAD_CALLBACK, id, "handleComplete");
 			log("Preload Complete", id);
 		}
 
@@ -477,11 +484,18 @@ class SoundWrapper extends EventDispatcher {
 		this._startTime = startTime;
 		this._duration = duration;
 		this.owner = owner;
-
-		sound = new Sound();
-		sound.addEventListener(IOErrorEvent.IO_ERROR, handleSoundError, false, 0, true);
-		sound.addEventListener(SecurityErrorEvent.SECURITY_ERROR, handleSoundError, false, 0, true);
-		sound.addEventListener(Event.COMPLETE, handleSoundLoaded, false, 0, true);
+		
+		if(owner.soundHash[src])
+		{
+			sound = owner.soundHash[src];
+		}
+		else
+		{
+			sound = new Sound();
+			sound.addEventListener(IOErrorEvent.IO_ERROR, handleSoundError, false, 0, true);
+			sound.addEventListener(SecurityErrorEvent.SECURITY_ERROR, handleSoundError, false, 0, true);
+			sound.addEventListener(Event.COMPLETE, handleSoundLoaded, false, 0, true);
+		}
 	}
 
 	/**
@@ -497,7 +511,14 @@ class SoundWrapper extends EventDispatcher {
 		this.loop = loop;
 		this._volume = volume;
 		this._pan = pan;
-		sound.load(new URLRequest(src));
+		if(sound.bytesTotal > 0 && sound.bytesTotal == sound.bytesLoaded)
+		{
+			startSound(offset);
+		}
+		else
+		{
+			sound.load(new URLRequest(src));
+		}
 	}
 
 	/**

lib/FlashAudioPlugin.swf

@@ -1628,7 +1628,7 @@ this.createjs = this.createjs || {};
 	 * @type String
 	 * @static
 	 **/
-	s.version = /*=version*/"0.6.1"; // injected by build process
+	s.version = /*=version*/"0.6.2"; // injected by build process
 
 	/**
 	 * The build date for this release in UTC format.
@@ -1637,6 +1637,6 @@ this.createjs = this.createjs || {};
 	 * @type String
 	 * @static
 	 **/
-	s.buildDate = /*=date*/"Thu, 19 Feb 2015 17:32:57 GMT"; // injected by build process
+	s.buildDate = /*=date*/"Thu, 12 Mar 2015 16:01:48 GMT"; // injected by build process
 
 })();

lib/flashaudioplugin.combined.js

@@ -49,15 +49,15 @@ this.createjs = this.createjs || {};
 	 * @type String
 	 * @static
 	 **/
-	s.version = /*=version*/"0.6.1"; // injected by build process
+	s.version = /*=version*/"0.6.2"; // injected by build process
 
 	/**
 	 * The build date for this release in UTC format.
 	 * @property buildDate
 	 * @type String
 	 * @static
 	 **/
-	s.buildDate = /*=date*/"Thu, 19 Feb 2015 17:32:57 GMT"; // injected by build process
+	s.buildDate = /*=date*/"Thu, 12 Mar 2015 16:01:48 GMT"; // injected by build process
 
 })();
 
@@ -6484,6 +6484,8 @@ this.createjs = this.createjs || {};
 		audioNode.buffer = this.playbackResource;
 		audioNode.connect(this.panNode);
 		var dur = this._duration * 0.001;
+		if(offset > dur)
+			offset = dur - 0.001;
 		audioNode.startTime = startTime + dur;
 		audioNode.start(audioNode.startTime, offset+(this._startTime*0.001), dur - offset);
 		return audioNode;