Fix multiple files creation

Author: dy

index.js

@@ -68,16 +68,16 @@ function Audio(source, options) {
 		this.buffer = source
 	}
 
-	// audiobuffer case
-	else if (isAudioBuffer(source)) {
-		this.buffer = new AudioBufferList(source)
-	}
-
 	// other Audio instance
 	else if (source instanceof Audio) {
 		this.buffer = source.buffer.clone()
 	}
 
+	// audiobuffer case
+	else if (isAudioBuffer(source)) {
+		this.buffer = new AudioBufferList(source)
+	}
+
 	// array with malformed data
 	else if (isMultisource(source)) {
 		throw Error('Bad argument. Use `Audio.from` to create joined audio.')

package.json

@@ -53,7 +53,7 @@
     "compute-qmean": "^1.0.0",
     "decibels": "^2.0.0",
     "fourier-transform": "^1.0.2",
-    "is-audio-buffer": "^1.0.11",
+    "is-audio-buffer": "^1.1.0",
     "is-browser": "^2.0.1",
     "is-promise": "^2.1.0",
     "is-relative": "^1.0.0",

src/core.js

@@ -136,7 +136,9 @@ Audio.load = function load (source, callback) {
 			// if source is cached but loading - just clone when loaded
 			if (isPromise(Audio.cache[source])) {
 				promise = Audio.cache[source].then(audio => {
-					audio = Audio(audio)
+					// in order to avoid fetching modified source, we clone cached source
+					audio = Audio(Audio.cache[source])
+
 					callback && callback(null, audio)
 					return Promise.resolve(audio)
 				}, error => {
@@ -154,7 +156,10 @@ Audio.load = function load (source, callback) {
 		else {
 			promise = loadAudio(source).then(audioBuffer => {
 				let audio = Audio(audioBuffer)
-				Audio.cache[source] = audio
+
+				// since user may modify original audio later, we have to put clone into cache
+				Audio.cache[source] = Audio(audio)
+
 				callback && callback(null, audio)
 				return Promise.resolve(audio)
 			}, error => {

test/creation.js

@@ -221,11 +221,30 @@ t('load caching', t => {
 
 	//put into cache
 	Audio.load(localWav).then((audio) => {
+		a = audio
+
+		a.slice(0, 1).save('x.wav', e => {
+			if (!isBrowser) {
+				let p = __dirname + path.sep + 'x.wav'
+				t.ok(fs.existsSync(p))
+				fs.unlinkSync(p);
+			}
+		})
+
+
 		t.ok(audio)
 	})
 
 	//load once first item is loaded
-	Audio.load(localWav).then((audio) => {
+	Audio.load(localWav, (err, audio) => {
+		audio.slice(1, 2).save('y.wav', e => {
+			if (!isBrowser) {
+				let p = __dirname + path.sep + 'y.wav'
+				t.ok(fs.existsSync(p))
+				fs.unlinkSync(p);
+			}
+		})
+
 		t.ok(Object.keys(Audio.cache).length)
 		t.ok(audio instanceof Audio)
 		t.notEqual(audio, a)