-- Leo's gemini proxy
-- Connecting to git.thebackupbox.net:1965...
-- Connected
-- Sending request
-- Meta line: 20 text/gemini
repo: janusweb action: commit revision: path_from: revision_from: 7bc8753ad951c1de01283b3828e9c5daf8488da8: path_to: revision_to:
commit 7bc8753ad951c1de01283b3828e9c5daf8488da8 Author: James Baicoianu <james_github@baicoianu.com> Date: Sat Jun 13 00:16:17 2020 -0700 Support `video` parameter when defining new video assets diff --git a/scripts/room.js b/scripts/room.js
--- a/scripts/room.js +++ b/scripts/room.js @@ -1213,18 +1213,32 @@ elation.require([ }); } } else if (type == 'video') { - var src = (args.src.match(/^file:/) ? args.src.replace(/^file:/, datapath) : args.src); - assetlist.push({ - assettype:'video', - name:args.id, - src: src, - loop: args.loop, - sbs3d: args.sbs3d, - ou3d: args.ou3d, - hasalpha: args.hasalpha, - auto_play: args.auto_play, - baseurl: this.baseurl - }); + if (args.src) { + var src = (args.src.match(/^file:/) ? args.src.replace(/^file:/, datapath) : args.src); + assetlist.push({ + assettype:'video', + name:args.id, + src: src, + loop: args.loop, + sbs3d: args.sbs3d, + ou3d: args.ou3d, + hasalpha: args.hasalpha, + auto_play: args.auto_play, + baseurl: this.baseurl + }); + } else if (args.video) { + assetlist.push({ + assettype:'video', + name:args.id, + video: args.video, + loop: args.loop, + sbs3d: args.sbs3d, + ou3d: args.ou3d, + hasalpha: args.hasalpha, + auto_play: args.auto_play, + baseurl: this.baseurl + }); + } } else if (type == 'sound') { var src = (args.src && args.src.match(/^file:/) ? args.src.replace(/^file:/, datapath) : args.src); assetlist.push({
-----END OF PAGE-----
-- Response ended
-- Page fetched on Sun Jun 2 16:29:55 2024