# HG changeset patch # User veltr # Date 1352223913 -3600 # Node ID 8fd1b95f04efcae4084415d8a1d08dd37a48b5fd # Parent fc6f9b50a326f2b937873ff9ebaea48f16b39d19 AutoPlayer/AdaptivePlayer bugfix diff -r fc6f9b50a326 -r 8fd1b95f04ef src/ldt/ldt/static/ldt/metadataplayer/AutoPlayer.js --- a/src/ldt/ldt/static/ldt/metadataplayer/AutoPlayer.js Tue Nov 06 18:00:21 2012 +0100 +++ b/src/ldt/ldt/static/ldt/metadataplayer/AutoPlayer.js Tue Nov 06 18:45:13 2012 +0100 @@ -55,6 +55,11 @@ _opts.type = this.default_type } + if (_opts.type === "AdaptivePlayer") { + var _canPlayType = document.createElement('video').canPlayType("video/mp4"); + _opts.type = (_canPlayType == "maybe" || _canPlayType == "probably") ? "PopcornPlayer" : "JwpPlayer"; + } + if (_rtmprgx.test(this.video)) { _opts.provider = "rtmp"; _opts.live = true; diff -r fc6f9b50a326 -r 8fd1b95f04ef src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js --- a/src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js Tue Nov 06 18:00:21 2012 +0100 +++ b/src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js Tue Nov 06 18:45:13 2012 +0100 @@ -1290,6 +1290,9 @@ noCss: true, requires: [ "swfObject" ] }, + AdaptivePlayer: { + noCss: true + }, AutoPlayer: { noCss: true },