Mercurial > dottes
changeset 383:8d574b900e36 build-default-171
Automated merge with ssh://hg.cryhavoc.org.uk/dottes
author | Jim Hague <jim.hague@acm.org> |
---|---|
date | Fri, 30 Aug 2013 23:55:28 +0100 (2013-08-30) |
parents | 64700d59ba85 (current diff) 04bd083eed29 (diff) |
children | ce5dccdd45bd |
files | |
diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/dottes.html.tune Fri Aug 30 22:10:15 2013 +0100 +++ b/dottes.html.tune Fri Aug 30 23:55:28 2013 +0100 @@ -61,10 +61,14 @@ <audio controls> <source src="../@MASTERBOOKE@/@TUNE@.mp3" type="audio/mpeg" /> <source src="../@MASTERBOOKE@/@TUNE@.ogg" type="audio/ogg" /> - <object width="300" height="30" type="audio/x-mpeg"> - <param name="URL" value="../@MASTERBOOKE@/@TUNE@.mp3" /> + <object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95"> + <param name="FileName" value="@TUNE@.mp3" /> <param name="autoStart" value="false" /> <param name="autoplay" value="false" /> + <object type="audio/mpeg" data="@TUNE@.mp3"> + <param name="controller" value="true" /> + <param name="autoplay" value="false" /> + </object> </object> </audio> </div>
--- a/makeWeb.sh Fri Aug 30 22:10:15 2013 +0100 +++ b/makeWeb.sh Fri Aug 30 23:55:28 2013 +0100 @@ -27,6 +27,7 @@ tunelist=tunelist.html booke=$1 masterbooke=$2 +masterwebdir=$dir/web/$2 title=$booke instrument=$3 @@ -63,7 +64,7 @@ # to be already generated. cp $1-*.pdf $webdir -# Now, for each tune, make the tune graphic and sound. +# Now, for each tune, make the tune page. find $bookedir -name "*.abc" | sort | while read filename do @@ -94,6 +95,12 @@ # Copy the ABC into the web. cp $filename $webdir + # If we are not the master booke, link the mp3 in from the + # master page in a desperate attempt to make IE8 work. + if [ "$booke" != "$masterbooke" ]; then + ln -s -r ${masterwebdir}/${name}.mp3 ${webdir} + fi + # Generate the tune web page. tunepage=${name}.html