theremin corrections

assignments.html

@@ -15,8 +15,9 @@ <h1>Assignments for the Music & the Internet class:</h1>
     <ul>
         <li><a href="questionnaire.txt" target="_blank">Questionnaire</a></li>
 	    <li><a href="fanpage/">Assignment 2: Fanpage </a></li>
-        <li><a href="musicbrainz/">Assignment 3: Musicbrainz API </a></li>
-        <li><a href="audio-compression/index.html">Assignment 4: Audio Compression </a></li>
+        <li><a href="/musicbrainz/">Assignment 3: Musicbrainz API </a></li>
+        <li><a href="/audio-compression/index.html">Assignment 4: Audio Compression </a></li>
+	<li><a href="/theremin/">Assignment 5: Virtual Theremin </a></li>
     </ul>
 
 </body>

theremin/11.js

@@ -17,30 +17,33 @@ const userGestureEvents = [
 ];
 
 var userInteraction = false;
-const unlockAudio = () => {
+const unlockAudio = (e) => {
+    console.log("EVENT : "+e);
     userGestureEvents.forEach(eventName => {
-        document.removeEventListener(eventName, unlockAudio);
         userInteraction = true;
+        document.removeEventListener(eventName, unlockAudio);
     });
 };
 
 
 // Turn theremin on
 function thereminOn(oscillator) {
     oscillator.play();
+    // console.log("USER INTERACTION : "+userInteraction);
     if( userInteraction == false ) { window.alert("Please click on the page before playing so the browser can enable audio playback."); }
 }
 
 // Control the theremin
 function thereminControl(e, oscillator, theremin) {
     let x = e.offsetX;
     let y = e.offsetY;
-    console.log(x, y);
+    // console.log(x, y);
 
     let minFrequency = 220.0;
     let maxFrequency = 880.0;
     let freqRange = maxFrequency - minFrequency;
     let thereminFreq = minFrequency + (x / theremin.clientWidth) * freqRange;
+    let thereminFreqRound = thereminFreq.toFixed(2);
     let thereminVolume = 1.0 - (y / theremin.clientHeight);
 
     if( autotune ) {
@@ -49,7 +52,7 @@ function thereminControl(e, oscillator, theremin) {
     }
     oscillator.frequency = thereminFreq;
     var frequency = document.querySelector('#frequency .info');
-    frequency.innerHTML = thereminFreq;
+    frequency.innerHTML = thereminFreqRound;
 
     oscillator.volume = thereminVolume;
     var volumeElement = document.querySelector('#volume .info');