Changeset 29883 for main/trunk/model-sites-dev
- Timestamp:
- 2015-05-15T11:43:06+12:00 (9 years ago)
- Location:
- main/trunk/model-sites-dev/respooled/collect/popup-video-respooled
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/etc/collectionConfig.xml
r29877 r29883 308 308 <xsl:value-of select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/> 309 309 </gsf:variable> 310 311 <gsf:script src="{$httpCollection}/js/pep.js"/> 312 313 <gsf:link src="{$httpCollection}/style/jtab-helper.css"/> 314 <gsf:script src="{$httpCollection}/js/raphael.js"/> 315 <gsf:script src="{$httpCollection}/js/jtab.js"/> 310 316 <!-- 311 317 <xsl:call-template name="soundmanager2-header"/> … … 350 356 351 357 <!-- MIDI.js library --> 352 353 358 354 359 <gsf:script src="{$httpCollection}/js/midi/inc/shim/Base64.js"/> -
main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/audiosynth.view.js
r29877 r29883 243 243 var playedNotePitch; 244 244 var playedMidiPitch; 245 245 246 var playedNoteStartTime; 247 var playedNoteStartCurrentTime; 248 246 249 var playedDuration; 250 247 251 248 252 // Creates our audio player … … 252 256 253 257 playedNoteStartTime = Date.now(); 258 playedNoteStartCurrentTime = mediaPlayer.currentTime; 259 254 260 playedNotePitch = "note = " + note + ", octave = " + octave; 255 261 playedMidiPitch = midiMiddleC + (12 * (octave-4)) + midiOctaveMap[note]; … … 280 286 // avoid playing a note if some kind of control-key 281 287 // combination (such a web page reload) is pressed 288 return false; 289 } 290 291 if (e.key == " ") { 292 togglePlayPause(); 293 e.preventDefault(); 282 294 return false; 283 295 } … … 381 393 'midiNoteOn' : relativePlayedNoteStartTime, 382 394 'midiNoteOff' : relativePlayedNoteEndTime, 395 'startCurrentTime' : playedNoteStartCurrentTime, 383 396 'duration ': playedDuration, 384 397 'humanReadble': playedNotePitch } … … 442 455 $('#drum1').trigger("mousedown"); 443 456 } 457 else if (e.key == "V") { 458 $('#drum2').trigger("mousedown"); 459 } 444 460 else if (e.key == "B") { 445 $('#drum 2').trigger("mousedown");461 $('#drum3').trigger("mousedown"); 446 462 } 447 463 else if (e.key == "N") { 448 $('#drum 3').trigger("mousedown");464 $('#drum4').trigger("mousedown"); 449 465 } 450 466 else if (e.key == "M") { 451 $('#drum4').trigger("mousedown");452 }453 else if (e.key == " ") {454 467 $('#drum5').trigger("mousedown"); 455 468 } -
main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/in-the-groove.js
r29881 r29883 1 "use strict";1 //"use strict"; 2 2 3 3 // https://developer.mozilla.org/en-US/docs/Web/API/AudioContext/createScriptProcessor … … 5 5 var audioCtx = new (window.AudioContext || window.webkitAudioContext)(); 6 6 7 //var InTheGroove = true; 7 if( 'webkitAudioContext' in window) { 8 console.log("*** Web Audio found in webkit namespace"); 9 audioCtx = new webkitAudioContext(); 10 } 11 8 12 var InTheGroove = false; 9 13 var MissingTheGroovePending = false; … … 44 48 45 49 for (var i = 0; i < bufferSize; i++) { 46 if (InTheGroove) { 50 if ( ((mediaPlaybackMode == "neutral") || (mediaPlaybackMode == "record")) 51 || InTheGroove) { 47 52 output[i] = input[i]; 48 53 } … … 51 56 output[i] = input[i] - prev_input[c]; 52 57 } 53 //if (i==128) {54 // console.log("*** input[128] = " + input[i]);55 //}56 58 57 59 prev_input[c] = input[i]; -
main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/media-player.js
r29877 r29883 1 "use strict";1 //"use strict"; 2 2 3 3 // Based on: … … 240 240 // Updates a button's title, innerHTML and CSS class to a certain value 241 241 function changeButtonType(btn, value) { 242 btn.title = value;242 //btn.title = value; 243 243 btn.innerHTML = value; 244 244 btn.className = value; -
main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/transform/pages/document.xsl
r29877 r29883 76 76 77 77 <xsl:template name="javascript-dsp-header"> 78 78 79 <gsf:script src="ext/js-dsp/dsp-custom.js"/> 79 80 <gsf:script src="ext/js-dsp/dsp.js"/> … … 1324 1325 <div id="video-area" class="documenttext" 1325 1326 style="display: none; position: absolute: left: 0px; top: 0px;"> 1326 1327 <video id="video" width="100%" controls="true"> 1328 <source src="{$httpCollection}/index/assoc/{$assocFilePath}/{$streamablevideo}" /> 1329 Your browser does not support the video tag. 1330 </video> 1327 <center> 1328 <video id="video" width="60%" controls="true"> 1329 <source src="{$httpCollection}/index/assoc/{$assocFilePath}/{$streamablevideo}" /> 1330 Your browser does not support the video tag. 1331 </video> 1332 </center> 1331 1333 </div> 1332 1334 </div> … … 1342 1344 <div style="float:left; padding: 8px; "> 1343 1345 <button id='replay-button' class='buttonx2 replay' title='replay' onclick='replayMedia();'>Replay</button> 1344 <button id='play-pause-button' class='buttonx2 play' title='play ' onclick='togglePlayPause();'>Play</button>1346 <button id='play-pause-button' class='buttonx2 play' title='play/pause (or press space-bar on keyboard)' onclick='togglePlayPause();'>Play</button> 1345 1347 <button id='stop-button' class='buttonx2 stop' title='stop' onclick='stopPlayer();'>Stop</button> 1346 1348 </div> … … 1350 1352 <span id="mediaPlayerTotalTime">0:00.0</span> 1351 1353 </div> 1354 <button id='volume-dec-button' class='button volume-minus' title='decrease volume' onclick="changeVolume('-');">Decrease volume</button> 1352 1355 <button id='volume-inc-button' class='button volume-plus' title='increase volume' onclick="changeVolume('+');">Increase volume</button> 1353 <button id='volume-dec-button' class='button volume-minus' title='decrease volume' onclick="changeVolume('-');">Decrease volume</button>1354 1356 <button id='mute-button' class='button mute' title='mute' onclick="toggleMute('true');">Mute</button> 1355 1357 </div> 1356 1358 </div> 1357 1359 </div> 1358 1359 1360 1361 <div style="clear: both;"><xsl:comment>clear floats</xsl:comment></div>1362 1363 <div class="analysis-bar">1364 <div id="analysis-titlebar" style="background-image: none; background-color: #2E52A4; width: 97%; float: left; margin-bottom: 10px;">1365 Play Along1366 </div>1367 1368 1369 <div id="analysis-area" class="documenttext" style="display: none; position: absolute: left: 0px; top: 0px;">1370 <div style="color: white; width:100%; height: 400px;">1371 <xsl:comment>filler</xsl:comment>1372 </div>1373 1374 </div>1375 </div>1376 1377 1360 1378 1361 … … 1469 1452 <button id="mpm-merge-overlay" 1470 1453 classXX="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-icon-primary" 1471 style="background-color:#2E52A4; color:white; width: 32%; text-align: center; margin-right: 8px;">1454 style="background-color:#2E52A4; color:white; width:24%; text-align: center; margin-right: 8px;"> 1472 1455 Merge Selected 1473 1456 </button> 1474 1457 <button id="mpm-split-overlay" 1475 1458 classXX="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-icon-primary" 1476 style="background-color:#2E52A4; color:white; width: 32%; text-align: center; margin-right: 8px;">1459 style="background-color:#2E52A4; color:white; width:24%; text-align: center; margin-right: 8px;"> 1477 1460 Split Selected 1478 1461 </button> 1479 1462 <button id="mpm-edit-overlay" 1480 1463 classXX="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-icon-primary" 1481 style="background-color:#2E52A4; color:white; width: 32%; text-align: center;">1464 style="background-color:#2E52A4; color:white; width:24%; text-align: center; margin-right: 8px;"> 1482 1465 Edit Selected 1466 </button> 1467 <button id="mpm-delete-overlay" 1468 classXX="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-icon-primary" 1469 style="background-color:#2E52A4; color:white; width:24%; text-align: center;"> 1470 Delete Selected 1483 1471 </button> 1484 1472 </div> … … 1493 1481 1494 1482 <div style="padding: 8px;"> 1495 <button id="pam-merge-overlay" style="background-color:#2E52A4; color:white; width: 32%; text-align: center; margin-right: 8px;">1483 <button id="pam-merge-overlay" style="background-color:#2E52A4; color:white; width:24%; text-align: center; margin-right: 8px;"> 1496 1484 Merge Selected 1497 1485 </button> 1498 <button id="pam-split-overlay" style="background-color:#2E52A4; color:white; width: 32%; text-align: center; margin-right: 8px;">1486 <button id="pam-split-overlay" style="background-color:#2E52A4; color:white; width:24%; text-align: center; margin-right: 8px;"> 1499 1487 Split Selected 1500 1488 </button> 1501 <button id="pam-edit-overlay" style="background-color:#2E52A4; color:white; width: 32%; text-align: center;">1489 <button id="pam-edit-overlay" style="background-color:#2E52A4; color:white; width:24%; text-align: center; margin-right: 8px;"> 1502 1490 Edit Selected 1491 </button> 1492 <button id="pam-delete-overlay" style="background-color:#2E52A4; color:white; width:24%; text-align: center;"> 1493 Delete Selected 1503 1494 </button> 1504 1495 </div> … … 1511 1502 </div> 1512 1503 </div> 1504 1505 1506 <div style="clear: both;"><xsl:comment>clear floats</xsl:comment></div> 1507 1508 <div class="analysis-bar"> 1509 <div id="analysis-titlebar" style="background-image: none; background-color: #2E52A4; width: 97%; float: left; margin-bottom: 10px;"> 1510 Game On 1511 </div> 1512 1513 1514 <div id="analysis-area" class="documenttext" style="display: none; position: absolute: left: 0px; top: 0px;"> 1515 <div style="color: white; width:100%; height: 400px;"> 1516 <xsl:comment>filler</xsl:comment> 1517 </div> 1518 1519 </div> 1520 </div> 1521 1513 1522 1514 1523 <div style="clear: both;"><xsl:comment>clear floats</xsl:comment></div> … … 1582 1591 left: 50%; 1583 1592 transform: translateX(-50%) translateY(-50%); 1584 font-size: 110%; 1593 -webkit-transform: translateX(-50%) translateY(-50%); 1594 font-size: 100%; 1585 1595 color: #888888; 1586 pointer-events: onone;1596 pointer-events: none; 1587 1597 } 1588 1598 </style> … … 1595 1605 src="{$httpCollection}/images/cymbal-overview.png" class="drum" id="drum1" border="0" /> 1596 1606 <div class="drumcontainer" style="color: #555555"> 1597 <Shift-C>1607 <span style="white-space: nowrap;"><Shift-C></span> 1598 1608 </div> 1599 1609 </div> … … 1604 1614 src="{$httpCollection}/images/drum-overview.png" class="drum" id="drum3" border="0" /> 1605 1615 <div class="drumcontainer" > 1606 <Shift-B>1616 <span style="white-space: nowrap;"><Shift-V></span> 1607 1617 </div> 1608 1618 </div> … … 1613 1623 src="{$httpCollection}/images/drum-overview.png" class="drum" id="drum2" border="0" /> 1614 1624 <div class="drumcontainer" > 1615 <Shift-N>1625 <span style="white-space: nowrap;"><Shift-B></span> 1616 1626 </div> 1617 1627 </div> … … 1622 1632 src="{$httpCollection}/images/drum-overview.png" class="drum" id="drum4" border="0" /> 1623 1633 <div class="drumcontainer" > 1624 <Shift-M>1634 <span style="white-space: nowrap;"><Shift-N></span> 1625 1635 </div> 1626 1636 </div> … … 1631 1641 src="{$httpCollection}/images/drum-overview.png" class="drum" id="drum5" border="0" /> 1632 1642 <div class="drumcontainer" > 1633 <Space-Bar>1643 <span style="white-space: nowrap;"> <Space-M></span> 1634 1644 </div> 1635 1645 </div> … … 1655 1665 </div> 1656 1666 </div> 1667 1668 1669 <div style="position: relative; background-color: white;"> 1670 <div style="display:inline-block; width: 150px; height: 200px;"> 1671 <form style="position: absolute; top: 60px; left: 10px;"> 1672 1673 <fieldset> 1674 <legend id="clm-legend">Show Chords</legend> 1675 1676 <div id="clm-div" class="radio-div"> 1677 1678 <div class="radio-label-combo"> 1679 <span> 1680 <input type="radio" id="clm-maj" name="clm-radio" onchange="setChordLineupMode()" value="Maj" 1681 checked="checked"/> 1682 </span> 1683 <label for="clm-maj" class="radio-label"> 1684 <span> 1685 Major 1686 </span> 1687 </label> 1688 </div> 1689 1690 <div class="radio-label-combo"> 1691 <span> 1692 <input type="radio" id="clm-maj" name="clm-radio" onchange="setChordLineupMode()" value="Maj"/> 1693 </span> 1694 <label for="clm-maj" class="radio-label"> 1695 <span> 1696 Minor 1697 </span> 1698 </label> 1699 </div> 1700 </div> 1701 </fieldset> 1702 </form> 1703 </div> 1704 1705 <div id="mytab" style="display:inline-block; height: 160px; width: 780px;"> 1706 <svg class="graph" xmlns = "http://www.w3.org/2000/svg" width="100%" height="100%"> 1707 <g id="scaled-mytab-group" transform="scale(0.5,0.6)"> 1708 <foreignobject id="scaled-mytab" width="2000px" height="300px"><xsl:comment>filler</xsl:comment></foreignobject> 1709 </g> 1710 </svg> 1711 </div> 1712 </div> 1713 1714 1657 1715 </div> 1658 1716 1659 1717 </div> 1660 1718 1719 <div style="position: absolute; top: -300px; background-color: white;"> 1720 <style> 1721 .chordLineup { 1722 -webkit-transform-style: preserve-3d; 1723 -moz-transform-style: preserve-3d; 1724 transform-style: preserve-3d; 1725 } 1726 1727 .chordLineupBlock { 1728 display: inline-block; 1729 } 1730 1731 .chordLineupBlockVerticalCenter { 1732 position: relative; 1733 top: 50%; 1734 transform: translataeY(-50%); 1735 -webkit-transform: translataeY(-50%); 1736 -ms-transform: translataeY(-50%); 1737 } 1738 1739 </style> 1740 <div id="offscreen-jtab-chord-lineup"> 1741 1742 <div id="offscreen-jtab-chord-C" class="chordLineupBlock"> 1743 <xsl:comment>filler</xsl:comment> 1744 </div> 1745 1746 <div class="chordLineupBlock"> 1747 <div id="offscreen-jtab-chord-Db"> 1748 <xsl:comment>filler</xsl:comment> 1749 </div> 1750 <div id="offscreen-jtab-chord-Cs"> 1751 <xsl:comment>filler</xsl:comment> 1752 </div> 1753 </div> 1754 1755 <div id="offscreen-jtab-chord-D" class="chordLineupBlock"> 1756 <xsl:comment>filler</xsl:comment> 1757 </div> 1758 1759 <div class="chordLineupBlock"> 1760 <div id="offscreen-jtab-chord-Eb"> 1761 <xsl:comment>filler</xsl:comment> 1762 </div> 1763 <div id="offscreen-jtab-chord-Ds"> 1764 <xsl:comment>filler</xsl:comment> 1765 </div> 1766 </div> 1767 1768 <div id="offscreen-jtab-chord-E" class="chordLineupBlock"> 1769 <xsl:comment>filler</xsl:comment> 1770 </div> 1771 1772 <div id="offscreen-jtab-chord-F" class="chordLineupBlock"> 1773 <xsl:comment>filler</xsl:comment> 1774 </div> 1775 1776 <div class="chordLineupBlock"> 1777 <div id="offscreen-jtab-chord-Gb"> 1778 <xsl:comment>filler</xsl:comment> 1779 </div> 1780 <div id="offscreen-jtab-chord-Fs"> 1781 <xsl:comment>filler</xsl:comment> 1782 </div> 1783 </div> 1784 1785 <div id="offscreen-jtab-chord-G" class="chordLineupBlock"> 1786 <xsl:comment>filler</xsl:comment> 1787 </div> 1788 1789 <div class="chordLineupBlock"> 1790 <div id="offscreen-jtab-chord-Ab"> 1791 <xsl:comment>filler</xsl:comment> 1792 </div> 1793 <div id="offscreen-jtab-chord-Gs"> 1794 <xsl:comment>filler</xsl:comment> 1795 </div> 1796 </div> 1797 1798 <div id="offscreen-jtab-chord-A" class="chordLineupBlock"> 1799 <xsl:comment>filler</xsl:comment> 1800 </div> 1801 1802 <div class="chordLineupBlock"> 1803 <div id="offscreen-jtab-chord-Bb"> 1804 <xsl:comment>filler</xsl:comment> 1805 </div> 1806 <div id="offscreen-jtab-chord-As"> 1807 <xsl:comment>filler</xsl:comment> 1808 </div> 1809 </div> 1810 1811 <div id="offscreen-jtab-chord-B" class="chordLineupBlock"> 1812 <xsl:comment>filler</xsl:comment> 1813 </div> 1814 1815 </div> 1816 1817 <gsf:script> 1818 $(document).ready(function() { 1819 1820 jtab.render($('#offscreen-jtab-chord-C') ,'C'); 1821 jtab.render($('#offscreen-jtab-chord-Cs'),'C#'); 1822 jtab.render($('#offscreen-jtab-chord-Db'),'Db'); 1823 jtab.render($('#offscreen-jtab-chord-D') ,'D'); 1824 jtab.render($('#offscreen-jtab-chord-Ds'),'D#'); 1825 jtab.render($('#offscreen-jtab-chord-Eb'),'Eb'); 1826 jtab.render($('#offscreen-jtab-chord-F') ,'F'); 1827 jtab.render($('#offscreen-jtab-chord-Fs'),'F#'); 1828 jtab.render($('#offscreen-jtab-chord-Gb'),'Gb'); 1829 jtab.render($('#offscreen-jtab-chord-G') ,'G'); 1830 jtab.render($('#offscreen-jtab-chord-Gs'),'G#'); 1831 jtab.render($('#offscreen-jtab-chord-Ab'),'Ab'); 1832 jtab.render($('#offscreen-jtab-chord-A') ,'A'); 1833 jtab.render($('#offscreen-jtab-chord-As'),'A#'); 1834 jtab.render($('#offscreen-jtab-chord-Bb'),'Bb'); 1835 jtab.render($('#offscreen-jtab-chord-B') ,'B'); 1836 1837 $('#scaled-mytab').append($('#offscreen-jtab-chord-lineup')); 1838 1839 }); 1840 </gsf:script> 1841 </div> 1842 1661 1843 <div style="clear: both;"><xsl:comment>clear floats</xsl:comment></div> 1662 1663 1844 1664 1845 </div>
Note:
See TracChangeset
for help on using the changeset viewer.