diff --git a/html5/Caddyfile b/html5/Caddyfile new file mode 100644 index 0000000..03c445a --- /dev/null +++ b/html5/Caddyfile @@ -0,0 +1,5 @@ +localhost:2020 +gzip +log caddy.log +# The root of the site +root . diff --git a/html5/caddy.log b/html5/caddy.log new file mode 100644 index 0000000..6ce2c39 --- /dev/null +++ b/html5/caddy.log @@ -0,0 +1,4 @@ +127.0.0.1 - [14/Jun/2015:21:16:02 -0700] "GET / HTTP/1.1" 304 0 +127.0.0.1 - [14/Jun/2015:21:16:02 -0700] "GET /cdgmagic_cdgplayer.js HTTP/1.1" 304 0 +127.0.0.1 - [14/Jun/2015:21:16:02 -0700] "GET /cdgmagic_cdgdecoder_lowresource.js HTTP/1.1" 304 0 +127.0.0.1 - [14/Jun/2015:21:16:05 -0700] "GET /media/Coldplay%20-%20Sky%20Full%20Of%20Stars.ogg HTTP/1.1" 200 0 diff --git a/html5/cdgmagic_cdgplayer.js b/html5/cdgmagic_cdgplayer.js index b970820..85789b5 100644 --- a/html5/cdgmagic_cdgplayer.js +++ b/html5/cdgmagic_cdgplayer.js @@ -64,9 +64,9 @@ function set_file_prefix(file_url_prefixes) // Ignore this call if we weren't given a file name. if (file_url_prefixes == "") { return; }; // Construct the file paths. - // Ensure the subfolder below: karaoke/ has the cdg/mp3 media files - var audio_file_prefix = "karaoke/" + file_url_prefixes.split(":", 2)[0]; - var cdg_file_prefix = "karaoke/" + file_url_prefixes.split(":", 2)[1]; + // Ensure the subfolder below: media/ has the cdg/mp3 media files + var audio_file_prefix = "media/" + file_url_prefixes.split(":", 2)[0]; + var cdg_file_prefix = "media/" + file_url_prefixes.split(":", 2)[1]; // Prepend the media files source directoy. // file_url_prefix = "media/" + file_url_prefix; // Stop, reset, and blank all the CD+G related stuff. diff --git a/html5/HTML5-CDGPlayer.htm b/html5/index.htm similarity index 97% rename from html5/HTML5-CDGPlayer.htm rename to html5/index.htm index 9d3d754..67145ac 100644 --- a/html5/HTML5-CDGPlayer.htm +++ b/html5/index.htm @@ -98,6 +98,7 @@ function toggle_2x_mode() +

This JavaScript based player should work in most HTML5 compatible browsers supporting both the <canvas> and <audio> (note: "Sample Project" 01-04 are silent) tags, including many mobile and embedded devices. @@ -115,10 +116,5 @@ function toggle_2x_mode() - - - -