Merge branch 'master' of https://github.com/cwilso/PitchDetect

Conflicts: js/pitchdetect.js
mtree · Dec 5, 2013 · 631f2a8 · 631f2a8
2 parents 9027300 + 6de4bd8
commit 631f2a8
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/js/pitchdetect.js b/js/pitchdetect.js
@@ -61,8 +61,10 @@ function error() {
 
 function getUserMedia(dictionary, callback) {
     try {
-        if (!navigator.getUserMedia)
-        	navigator.getUserMedia = navigator.webkitGetUserMedia;
+        navigator.getUserMedia = 
+        	navigator.getUserMedia ||
+        	navigator.webkitGetUserMedia ||
+        	navigator.mozGetUserMedia;
         navigator.getUserMedia(dictionary, callback, error);
     } catch (e) {
         alert('getUserMedia threw exception :' + e);
@@ -303,17 +305,17 @@ function updatePitch( time ) {
  	} else {
 	 	pitchElem.innerText = Math.floor( pitch ) + "Hz : " + Math.floor(ac) ;
 	 	var note =  noteFromPitch( pitch );
-		noteElem.innerText = noteStrings[note%12];
+		noteElem.innerHTML = noteStrings[note%12];
 		var detune = centsOffFromPitch( pitch, note );
 		if (detune == 0 ) {
 			detuneElem.className = "";
-			detuneAmount.innerText = "--";
+			detuneAmount.innerHTML = "--";
 		} else {
 			if (detune < 0)
 				detuneElem.className = "flat";
 			else
 				detuneElem.className = "sharp";
-			detuneAmount.innerText = Math.abs( detune );
+			detuneAmount.innerHTML = Math.abs( detune );
 		}
 	}