Merge pull request #31 from mohayonao/v14.10.12

V14.10.12

README.md

@@ -51,6 +51,10 @@ T("sin", {freq:880, mul:0.5}).play();
 MIT
 
 ## ChangeLog ##
+**14.10.12** (356.28KB)
+* Fixed: Decoding wav file
+* Fixed: Envelope release
+
 **14.08.07** (356.19KB)
 * Fixed: Export for CommonJS env [#19](https://github.com/mohayonao/timbre.js/issues/19)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "timbre",
-  "version": "14.08.07",
+  "version": "14.10.12",
   "description": "JavaScript library for objective sound programming",
   "author": "nao yonamine <[email protected]>",
   "repository": {
@@ -15,16 +15,16 @@
     }
   ],
   "dependencies": {
-    "readable-stream": "^1.0.27-1",
-    "speaker": "^0.2.0"
+    "readable-stream": "^1.0.33-1",
+    "speaker": "^0.2.1"
   },
   "devDependencies": {
-    "chai": "^1.9.1",
+    "chai": "^1.9.2",
     "grunt": "^0.4.5",
-    "grunt-contrib-clean": "^0.5.0",
+    "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-uglify": "^0.5.0",
+    "grunt-contrib-uglify": "^0.6.0",
     "grunt-contrib-watch": "^0.6.1",
-    "mocha": "^1.20.1"
+    "mocha": "^1.21.5"
   }
 }

src/core.js

@@ -2322,7 +2322,7 @@
 
     // player
     var ImplClass    = null;
-    var AudioContext = undefined;
+    var AudioContext;
     if (typeof window !== "undefined") {
       AudioContext = window.AudioContext || window.webkitAudioContext;
     }

src/modules/decoder.js

@@ -65,7 +65,9 @@
         var b0, b1, b2, bb, x;
         var int32 = new Int32Array(uint8.length / 3);
         for (var i = 0, imax = uint8.length, j = 0; i < imax; ) {
-            b0 = uint8[i++] ,b1 = uint8[i++], b2 = uint8[i++];
+            b0 = uint8[i++];
+            b1 = uint8[i++];
+            b2 = uint8[i++];
             bb = b0 + (b1 << 8) + (b2 << 16);
             x = (bb & 0x800000) ? bb - 16777216 : bb;
             int32[j++] = x;

src/modules/envelope.js

@@ -103,8 +103,9 @@
         this.status = StatusWait;
     };
     $.release = function() {
-        if (this.releaseNode !== null) {
+        if (this.releaseNode !== null && this._index <= this.releaseNode) {
             this._counter = 0;
+            this._index = this.releaseNode;
             this.status = StatusRelease;
         }
     };

timbre.dev.js

@@ -18,7 +18,7 @@
     var ACCEPT_SAMPLERATES = [8000,11025,12000,16000,22050,24000,32000,44100,48000];
     var ACCEPT_CELLSIZES = [32,64,128,256];
 
-    var _ver = "14.08.07";
+    var _ver = "14.10.12";
     var _sys = null;
     var _constructors = {};
     var _factories    = {};
@@ -2322,7 +2322,7 @@
 
     // player
     var ImplClass    = null;
-    var AudioContext = undefined;
+    var AudioContext;
     if (typeof window !== "undefined") {
       AudioContext = window.AudioContext || window.webkitAudioContext;
     }
@@ -3411,7 +3411,9 @@
         var b0, b1, b2, bb, x;
         var int32 = new Int32Array(uint8.length / 3);
         for (var i = 0, imax = uint8.length, j = 0; i < imax; ) {
-            b0 = uint8[i++] ,b1 = uint8[i++], b2 = uint8[i++];
+            b0 = uint8[i++];
+            b1 = uint8[i++];
+            b2 = uint8[i++];
             bb = b0 + (b1 << 8) + (b2 << 16);
             x = (bb & 0x800000) ? bb - 16777216 : bb;
             int32[j++] = x;
@@ -3735,8 +3737,9 @@
         this.status = StatusWait;
     };
     $.release = function() {
-        if (this.releaseNode !== null) {
+        if (this.releaseNode !== null && this._index <= this.releaseNode) {
             this._counter = 0;
+            this._index = this.releaseNode;
             this.status = StatusRelease;
         }
     };