Minor cleaning and fix #29

mon · Jul 3, 2017 · 52e8d31 · 52e8d31
1 parent 7a116b9
commit 52e8d31
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/js/HuesCanvas.js b/src/js/HuesCanvas.js
@@ -471,7 +471,7 @@ class HuesCanvas {
     }
 
     doBlackout(whiteout) {
-        if (typeof(whiteout)==='undefined') whiteout = false;
+        if(typeof(whiteout) === 'undefined') whiteout = false;
         if(whiteout) {
             this.blackoutColour = "#FFF";
         } else {
@@ -489,7 +489,6 @@ class HuesCanvas {
         }
     }
 
-    // for song changes
     clearBlackout() {
         this.blackout = false;
         this.blackoutTimeout = 0;
@@ -500,10 +499,15 @@ class HuesCanvas {
     }
 
     doShortBlackout(beatTime) {
-        this.doBlackout();
-        this.blackoutTimeout = this.audio.currentTime + beatTime / 1.7;
         // looks better if we go right to black
-        this.blackoutStart = 0;
+        this.doInstantBlackout();
+        this.blackoutTimeout = this.audio.currentTime + beatTime / 1.7;
+    }
+
+    doInstantBlackout() {
+        this.doBlackout();
+        // sufficiently negative
+        this.blackoutStart = -Math.pow(2, 32);
     }
 
     doColourFade(length) {

diff --git a/src/js/HuesCore.js b/src/js/HuesCore.js
@@ -97,10 +97,10 @@ class HuesCore {
              */
             frame : [],
 
-            /* callback songstarted()
+            /* callback songstarted(song)
              *
              * Called when the song actually begins to play, not just when the
-             * new song processing begins
+             * new song processing begins. Song object passed.
              */
             songstarted : [],
 
@@ -524,12 +524,12 @@ class HuesCore {
             }
         }
         this.setInvert(false);
-        this.renderer.doBlackout();
+        this.renderer.doInstantBlackout();
         return this.soundManager.playSong(this.currentSong, this.doBuildup)
         .then(() => {
             this.resetAudio();
             this.fillBuildup();
-            this.callEventListeners("songstarted");
+            this.callEventListeners("songstarted", this.currentSong);
         });
     }