summaryrefslogtreecommitdiff
path: root/www/js/api.js
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2013-09-02 14:27:24 -0400
committerAlex Xu <alex_y_xu@yahoo.ca>2013-09-02 14:27:24 -0400
commit97c92555b8a7bf8c53c9f41fd23dcb70b55c7c8a (patch)
tree713210d19da1ea1584b364a9242c849f081c7c59 /www/js/api.js
parenta80c468ec5fbc48c34f502ef5546e6a85edcb1f6 (diff)
downloadhtml5ks-97c92555b8a7bf8c53c9f41fd23dcb70b55c7c8a.tar.xz
html5ks-97c92555b8a7bf8c53c9f41fd23dcb70b55c7c8a.zip
update *encode.sh, add opus support
Diffstat (limited to 'www/js/api.js')
-rw-r--r--www/js/api.js19
1 files changed, 17 insertions, 2 deletions
diff --git a/www/js/api.js b/www/js/api.js
index 580de6a..ed5b387 100644
--- a/www/js/api.js
+++ b/www/js/api.js
@@ -39,7 +39,20 @@ window.html5ks.api = {
audio.loop = true;
}
html5ks.elements.audio[channel] = audio;
- audio.src = "dump/" + (channel === "music" ? "bgm/" + html5ks.data.music[name] + ".ogg" : html5ks.data.sfx[name]);
+
+ var src = "dump/" + channel === "music" ? html5ks.data.music[name] : html5ks.data.sfx[name];
+ if (Modernizr.audio.opus) {
+ audio.src = src + ".opus";
+ } else if (Modernizr.audio.ogg) {
+ audio.src = src + ".ogg";
+ } else if (Modernizr.audio.aac) {
+ audio.src = src + ".m4a";
+ } else if (Modernizr.audio.wav) {
+ audio.src = src + ".wav";
+ } else {
+ console.error("wtf, no audio formats");
+ }
+
audio.load();
var volume = html5ks.persistent[channel + "Volume"];
audio.volume = fade ? 0 : volume;
@@ -90,9 +103,11 @@ window.html5ks.api = {
if (Modernizr.video.webm) {
video.src = src + "webm";
} else if (Modernizr.video.ogg) {
- video.src = src + "ogg";
+ video.src = src + "ogv";
} else if (Modernizr.video.h264) {
video.src = src + "mp4";
+ } else {
+ console.error("wtf is this, no video formats");
}
video.load();