Merge pull request #146 from iceddev/0.4.3

0.4.3

Author: monteslu

.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - "0.8"
   - "0.10"
 notifications:
   email:
@@ -14,4 +13,4 @@ before_install:
   - "npm install -g bower grunt-cli"
   - "bower install --production"
   - "mv deps/hammer/dist/hammer.js deps/hammer/hammer.js"
-  - "mv deps/Box2d/index.js deps/Box2d.min.js"
+  - "mv deps/Box2d/index.js deps/Box2d.min.js"

specs/sounds/WebAudioSpec.js

@@ -20,7 +20,7 @@ define([
       var sound;
       var filename = 'specs/fixtures/yipee.wav';
       var filename2 = 'specs/fixtures/yipee';
-      var noteOn = jasmine.createSpy('noteOn');
+      var start = jasmine.createSpy('start');
 
       beforeEach(function(){
         sound = new WebAudio();
@@ -147,7 +147,7 @@ define([
 
         beforeEach(function(){
           spyOn(sound, '_initAudio').andReturn({
-            noteOn: noteOn
+            start: start
           });
 
           runs(function(){
@@ -183,11 +183,11 @@ define([
           });
         });
 
-        it('should call noteOn with startTime of 0', function(){
+        it('should call start with startTime of 0', function(){
           runs(function(){
             sound.loop();
-            expect(noteOn).toHaveBeenCalled();
-            expect(noteOn).toHaveBeenCalledWith(0);
+            expect(start).toHaveBeenCalled();
+            expect(start).toHaveBeenCalledWith(0);
           });
         });
 
@@ -197,7 +197,7 @@ define([
 
         beforeEach(function(){
           spyOn(sound, '_initAudio').andReturn({
-            noteOn: noteOn
+            start: start
           });
 
           runs(function(){
@@ -233,19 +233,19 @@ define([
           });
         });
 
-        it('should call noteOn with startTime of 0 if startTime not passed in', function(){
+        it('should call start with startTime of 0 if startTime not passed in', function(){
           runs(function(){
             sound.play();
-            expect(noteOn).toHaveBeenCalled();
-            expect(noteOn).toHaveBeenCalledWith(0);
+            expect(start).toHaveBeenCalled();
+            expect(start).toHaveBeenCalledWith(0);
           });
         });
 
-        it('should call noteOn with startTime passed in', function(){
+        it('should call start with startTime passed in', function(){
           runs(function(){
             sound.play(1, 100);
-            expect(noteOn).toHaveBeenCalled();
-            expect(noteOn).toHaveBeenCalledWith(100);
+            expect(start).toHaveBeenCalled();
+            expect(start).toHaveBeenCalledWith(100);
           });
         });
 
@@ -266,6 +266,8 @@ define([
         it('should return a source', function(){
           runs(function(){
             expect(sound._initAudio()).toBeDefined();
+            expect(sound._initAudio(1)).toBeDefined();
+            expect(sound._initAudio(1, true)).toBeDefined();
           });
         });
 

src/sounds/WebAudio.js

@@ -31,7 +31,7 @@ define([
         var source = audioContext.createBufferSource();
         source.buffer = audioContext.createBuffer(1, 1, 22050);
         source.connect(audioContext.destination);
-        source.noteOn(0);
+        source.start(0);
       });
     }
   }
@@ -104,7 +104,7 @@ define([
       }
 
       var audio = this._initAudio(volume, true);
-      audio.noteOn(0);
+      audio.start(0);
     },
 
     play: function(volume, startTime){
@@ -116,7 +116,7 @@ define([
       startTime = startTime || 0;
 
       var audio = this._initAudio(volume, false);
-      audio.noteOn(startTime);
+      audio.start(startTime);
     },
 
     _initAudio: function(volume, loop){
@@ -126,10 +126,10 @@ define([
       source.buffer = this.buffer;
       source.loop = loop;
       if(volume){
-        var gainNode = this.audioContext.createGainNode();
-        gainNode.gain.value = volume;
-        source.connect(gainNode);
-        gainNode.connect(this.audioContext.destination);
+        var gain = this.audioContext.createGain();
+        gain.gain.value = volume;
+        source.connect(gain);
+        gain.connect(this.audioContext.destination);
       } else {
         source.connect(this.audioContext.destination);
       }