Changeset 30093 for main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/audiosynth.view.js

Timestamp:

2015-08-04T13:50:35+12:00 (9 years ago)

Author:

davidb

Message:

Development work done in at JCDL

File:

• main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/audiosynth.view.js (modified) (6 diffs)

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/audiosynth.view.js

@@ -292 +292 @@
 
     var fnPlayKeyboard = function(e) {
-    console.log("***### fnPlayKeyboard() e=" + e); //JSON.stringify(e));
+    //console.log("***### fnPlayKeyboard() e=" + e); //JSON.stringify(e));
 
     // check to see if any modal dialogs are open
@@ -307 +307 @@
     }
 
-    console.log("**** testing keyboard event key: '" + e.key + "' keycode = " + e.keyCode);
+    //console.log("**** testing keyboard event key: '" + e.key + "' keycode = " + e.keyCode);
 
     var $focused = $(':focus');
@@ -321 +321 @@
     if (e.keyCode == 32) { // <space-bar>
         togglePlayPause();
-        //e.preventDefault();
+        e.preventDefault();
         return false;
     }
@@ -438 +438 @@
     }
 
+    var drumKeyDown = { "C": false, "V": false, "B": false, "N": false, "M": false };
+    
     var fnRemoveKeyBinding = function(e) {
     
-    console.log("**** key up at: " + Date.now())
+    //console.log("**** key up at: " + Date.now())
     // console.log("*** event e = " + JSON.stringify(e));
 
@@ -462 +464 @@
         keysPressed.splice(i, 1);
         }
-        }
-    
-    }
+    }
+
+    // See if drum animation should be stopped
+    if (e.keyCode == "C".charCodeAt(0)) {
+        drumKeyDown["C"] = false;
+        $('#drum1').trigger("mouseup");
+    }
+    else if (e.keyCode == "V".charCodeAt(0)) {
+        drumKeyDown["V"] = false;
+        $('#drum3').trigger("mouseup");
+    }
+    else if (e.keyCode == "B".charCodeAt(0)) {
+        drumKeyDown["B"] = false;
+        $('#drum2').trigger("mouseup");
+    }
+    else if (e.keyCode == "N".charCodeAt(0)) {
+        drumKeyDown["N"] = false;
+        $('#drum4').trigger("mouseup");
+    }
+    else if (e.keyCode == "M".charCodeAt(0)) {
+        drumKeyDown["M"] = false;
+        $('#drum5').trigger("mouseup");
+    }
+    
+    }
 
     var fnPlaySong = function(arr) {
@@ -491 +515 @@
     console.log("*** drum pressed keyCode: " + e.keyCode);
     if (e.keyCode == "C".charCodeAt(0)) {
+        drumKeyDown["C"] = true;
         $('#drum1').trigger("mousedown");
     }
     else if (e.keyCode == "V".charCodeAt(0)) {
+        drumKeyDown["V"] = true;
+        $('#drum3').trigger("mousedown");
+    }
+    else if (e.keyCode == "B".charCodeAt(0)) {
+        drumKeyDown["B"] = true;
         $('#drum2').trigger("mousedown");
     }
-    else if (e.keyCode == "B".charCodeAt(0)) {
-        $('#drum3').trigger("mousedown");
-    }
     else if (e.keyCode == "N".charCodeAt(0)) {
+        drumKeyDown["N"] = true;
         $('#drum4').trigger("mousedown");
     }
     else if (e.keyCode == "M".charCodeAt(0)) {
+        drumKeyDown["M"] = true;
         $('#drum5').trigger("mousedown");
     }