Changeset 36861

Timestamp:

2022-10-22T17:45:58+13:00 (18 months ago)

Author:

davidb

Message:

Now auto-seeks to matching point (offsetFrame)

Location:

gs3-installations/mars/trunk/sites/mars/collect/amc-essentia

Files:

• etc/collectionConfig.xml (modified) (10 diffs)
• js/av_document.js (added)

gs3-installations/mars/trunk/sites/mars/collect/amc-essentia/etc/collectionConfig.xml

@@ -119 +119 @@
       <xsl:choose>
         <xsl:when test="/page/pageResponse/service/@name = 'AudioQuery'">
+          <gsf:variable name="frameOffset">
+        <xsl:value-of select="@frameOffset"/>
+          </gsf:variable>
+          <gsf:variable name="rank">
+        <xsl:value-of select="@rank"/>
+          </gsf:variable>
+          
           <a>
         <xsl:choose>
@@ -130 +137 @@
         <gsf:metadata name="amc.title"/>
         by <gsf:metadata name="amc.artist"/>
-          </a>      
+          </a>
+    
+          <span style="font-style: italics; font-size: 100%" >
+        (Matching offset @ <xsl:value-of select="@frameOffset"/> secs)
+          </span>
+
+          
         </xsl:when>
         <xsl:otherwise>
@@ -474 +487 @@
             <gsf:template name="documentHeading">
               <!-- title will be dsiplayed in playbar at top of page, so supress showing title here -->
+              <!--
               <gsf:script src="interfaces/{$interface_name}/js/direct-edit-source.js"/>
               <xsl:call-template name="init-direct-edit"/>
+              -->
             </gsf:template>
             
@@ -512 +527 @@
               -->
               
+              <gsf:script src="{$httpCollection}/js/av_document.js"/>
+
               <div class="documenttext" style="padding-bottom: 20px; width:100%;"> 
                 <style>
@@ -548 +565 @@
               
               <div class="documenttext">
-
-
+                
+                <style>
+                  #wave-timeline {
+                    background-color: #fff; 
+                }
+                </style>
+                
         <div id="demo">
             <div id="waveform">
@@ -578 +600 @@
         <div>
         
-          <div class="controls">
+          <div class="controls">
+        <button class="btn btn-primary" onclick="AVSeekTo(0)">
+          Return to Start
+        </button>
+
+        <!--
         <button class="btn btn-primary" data-action="play">
                   <i class="glyphicon glyphicon-play"></i>
@@ -585 +612 @@
                   Pause
         </button>
+        -->
+        
+        <button class="btn btn-primary" onclick="AVPlayPause()">
+                  Play
+        </button>
+        
               </div>
         </div>
@@ -594 +627 @@
       <xsl:text>  </xsl:text>
     </script>
+
     <gsf:script>
+      //var currentPosIsZero = true;
+
+
+      
       document.addEventListener('DOMContentLoaded', function() {
+        postInitWavesurfer(wavesurfer);
+/*    
         // Load audio from URL
         wavesurfer.load(gs.variables.mp3url);
@@ -604 +644 @@
           var current_time_rounded = current_time.toFixed(1);
           $('#audioCurrentPos').html(current_time_rounded + " secs");
-        });     
+
+          if (current_time == 0) {
+            recommendFromStart();
+            //currentPosIsZero = true;
+            //$('#makeRecommendationFrom').html("Based on the start of this musical/sound art work: ");
+          }
+          else if ((currentPosIsZero) &amp;&amp; (current_time > 0)) {
+            recommendFromPos();
+            //currentPosIsZero = false;
+           // $('#makeRecommendationFrom').html("Based on the current timeline position of this musical/sound art work: ");
+          }
+          });
+*/        
       });
     </gsf:script>
+
               </div>
 
@@ -663 +716 @@
                 <input name="s1.arousal" type="hidden" value="0"/>
                 <input name="s1.valence" type="hidden" value="0"/>
+
+                <div style="font-style: italics;">
+                  <span id="makeRecommendationFrom">
+                Based on the start of this musical/sound art work:
+                  </span>
+                  <input onclick="preSubmit(this.form);" type="submit" value="Make Arousal-Valence Recommendations"/>
+                </div>
                 
-                <div style="font-style: italics;">Make arousal-valence music recommendation based on content  @ <span id="audioCurrentPos">0 secs</span>:
+                <div style="font-style: italics; display: none;">
+                  Make arousal-valence music recommendation based on content  @ <span id="audioCurrentPos">0 secs
+                  </span>:
                 <!--,
                 with excerpt lasting <span class="editable-offset" id="audioWindowDuration" style="cursor: pointer; border: 1px solid black; padding: 3px; width: 200px; min-width: 200px;">3.0</span> secs
                 -->
-                <input onclick="preSubmit(this.form);" type="submit" value="Recommend"/></div>
+                </div>
               </form>
               <hr/>
+              <!--
               <script>
                 <xsl:text disable-output-escaping="yes">
-
-/*                
-    function playFromOffset(id,frameOffset) 
-    {
-      var msecOffset = 250 * frameOffset; 
-      idElem = document.getElementById(id);
-      pagePlayer.handleClick({target:idElem}); // fake a click 
-      soundManager.stopAll();
-      // soundManager.setPosition(id,5000); 
-      soundManager.play(id,{position: msecOffset});
-    }
-    */
-    
-    function preSubmit(form) 
-    {
-      // Note, the Arousal and Valence feature window values used is:
-      //   6 secs + 50% overlap
-      // So the Weka computed AV values are spaced out:
-      //   6s, 9s, 12s, ...
-
-      // clamp to ensure >= 6.0 secs 
-      var current_time = Math.max(6.0,wavesurfer.getCurrentTime());
-
-      wavesurfer.pause();
-
-      weka_segment = Math.round(current_time/3) * 3;
-      form.elements["s1.offset"].value = weka_segment;
-      
-      var arousal_val = parseFloat($('#arousal-val').text());
-      var valence_val = parseFloat($('#valence-val').text());
-
-      //console.log("arousal val = " + arousal_val);
-      //console.log("valence val = " + valence_val);
-
-      form.elements["s1.arousal"].value = arousal_val;
-      form.elements["s1.valence"].value = valence_val;
-      
-
-    /*
-      var currentPosElem = document.getElementById("audioCurrentPos");
-      var offsetInMSecs = currentPosElem.getAttribute("offsetInMSecs");
-      var frameOffset = Math.round(offsetInMSecs/250.0);
-      form.elements["s1.offset"].value = frameOffset;
-
-      var lengthInSecs = document.getElementById("audioWindowDuration").innerHTML;
-
-      var frameLength = Math.round(lengthInSecs*1000/250.0);
-      form.elements["s1.length"].value = frameLength;
-      */
-      return true;
-    }
                 </xsl:text>
               </script>             
-
+              -->
               
             </xsl:template>