diff -r 5cd368dba1b9 -r 972099304059 test/mashup/moon.htm --- a/test/mashup/moon.htm Wed Jun 20 18:41:41 2012 +0200 +++ b/test/mashup/moon.htm Tue Jun 26 14:22:29 2012 +0200 @@ -52,6 +52,7 @@ url: 'moon/moon.json', format: 'ldt' }; +var _canPlayMp4 = document.createElement('video').canPlayType('video/mp4'); var _config = { gui: { width : 630, @@ -80,13 +81,17 @@ ] }, player:{ - type:'mashup-html', - live: true, + type: 'mashup-html', + url_transform: function(_url) { + if (_canPlayMp4 == "maybe" || _canPlayMp4 == "probably") { + return _url.replace(/\.webm$/i,'.mp4'); + } else { + return _url.replace(/\.mp4$/i,'.webm'); + } + + }, height: 350, - width: 630, - provider: "rtmp", - mashup_swf : "bab_files/player_bab_ldt.swf", - mashup_xml : "moon/moon.xml", + width: 630, autostart: true, metadata: _metadata }