Changeset 28746 for main/trunk/model-sites-dev

Timestamp:

2013-12-05T22:52:51+13:00 (10 years ago)

Author:

davidb

Message:

Latest version of Firefox now supports Web-Audio, but the written JS files for Greenstone (for audio) don't seem to play nicely. Make it use the Firefox audio extension for now

File:

• main/trunk/model-sites-dev/multimodal-mdl/collect/salami-ground-truth/script2/hybrid-audio-player.js (modified) (4 diffs)

main/trunk/model-sites-dev/multimodal-mdl/collect/salami-ground-truth/script2/hybrid-audio-player.js

@@ -56 +56 @@
 }
 
+// Latest Firefox now seems to natively support Web audio, but doesn
+// seem to play nicely with the work here
+// => set webAudioContext back to null to force it to use the
+//    original Firefox audio extension
+var is_firefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+if (is_firefox) {
+  webAudioContext = null;
+}
 
 // ******
@@ -151 +159 @@
 }
 
-
-allData = gs.documentMetadata["json.data"];
+// Fake the allData array -- First value is ground-truth => make empty
+//allData = [ [], JSON.parse(gs.documentMetadata["json_seriesData"]) ];
+
+// Set up position zero as empty "ground truth" data
+allData = [ [] ];
 
 // ****
@@ -159 +170 @@
 // 'p.yScaleSimImg;, which presumably automatically generates
 // gs.cgiParams.yScaleSimImg (if present).  Defaults to 0.5
-
+    
 yScaleSimImg=gs.variables.cgiargYScaleSimImg || 0.5; 
 
@@ -165 +176 @@
 
 
+
 $(function() {
+
+
 
     var audio = document.getElementById('rta-audio-element');