|
7 | 7 | * http://opensource.org/licenses/MIT |
8 | 8 | * |
9 | 9 | * Author: Mark J Panaghiston |
10 | | - * Version: 1.1.1 |
11 | | - * Date: 5th June 2013 |
| 10 | + * Version: 1.1.2 |
| 11 | + * Date: 7th November 2013 |
12 | 12 | * |
13 | 13 | * For Popcorn Version: 1.3 |
14 | | - * For jPlayer Version: 2.4.0 |
15 | | - * Requires: jQuery 1.3.2+ |
| 14 | + * For jPlayer Version: 2.5.0 |
| 15 | + * Requires: jQuery 1.7+ |
16 | 16 | * Note: jQuery dependancy cannot be removed since jPlayer 2 is a jQuery plugin. Use of jQuery will be kept to a minimum. |
17 | 17 | */ |
18 | 18 |
|
|
22 | 22 |
|
23 | 23 | (function(Popcorn) { |
24 | 24 |
|
25 | | - var JQUERY_SCRIPT = 'http://ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.min.js', // Used if jQuery not already present. |
26 | | - JPLAYER_SCRIPT = 'http://www.jplayer.org/2.4.0/js/jquery.jplayer.min.js', // Used if jPlayer not already present. |
27 | | - JPLAYER_SWFPATH = 'http://www.jplayer.org/2.4.0/js/Jplayer.swf', // Used if not specified in jPlayer options via SRC Object. |
| 25 | + var JQUERY_SCRIPT = '//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js', // Used if jQuery not already present. |
| 26 | + JPLAYER_SCRIPT = '//www.jplayer.org/2.5.0/js/jquery.jplayer.min.js', // Used if jPlayer not already present. |
| 27 | + JPLAYER_SWFPATH = '//www.jplayer.org/2.5.0/js/Jplayer.swf', // Used if not specified in jPlayer options via SRC Object. |
28 | 28 | SOLUTION = 'html,flash', // The default solution option. |
29 | 29 | DEBUG = false, // Decided to leave the debugging option and console output in for the time being. Overhead is trivial. |
30 | 30 | jQueryDownloading = false, // Flag to stop multiple instances from each pulling in jQuery, thus corrupting it. |
31 | 31 | jPlayerDownloading = false, // Flag to stop multiple instances from each pulling in jPlayer, thus corrupting it. |
32 | | - format = { // Duplicate of jPlayer 2.4.0 object, to avoid always requiring jQuery and jPlayer to be loaded before performing the _canPlayType() test. |
| 32 | + format = { // Duplicate of jPlayer 2.5.0 object, to avoid always requiring jQuery and jPlayer to be loaded before performing the _canPlayType() test. |
33 | 33 | mp3: { |
34 | 34 | codec: 'audio/mpeg; codecs="mp3"', |
35 | 35 | flashCanPlay: true, |
|
40 | 40 | flashCanPlay: true, |
41 | 41 | media: 'audio' |
42 | 42 | }, |
| 43 | + m3u8a: { // AAC / MP4 / Apple HLS |
| 44 | + codec: 'application/vnd.apple.mpegurl; codecs="mp4a.40.2"', |
| 45 | + flashCanPlay: false, |
| 46 | + media: 'audio' |
| 47 | + }, |
| 48 | + m3ua: { // M3U |
| 49 | + codec: 'audio/mpegurl', |
| 50 | + flashCanPlay: false, |
| 51 | + media: 'audio' |
| 52 | + }, |
43 | 53 | oga: { // OGG |
44 | | - codec: 'audio/ogg; codecs="vorbis"', |
| 54 | + codec: 'audio/ogg; codecs="vorbis, opus"', |
| 55 | + flashCanPlay: false, |
| 56 | + media: 'audio' |
| 57 | + }, |
| 58 | + flac: { // FLAC |
| 59 | + codec: 'audio/x-flac', |
45 | 60 | flashCanPlay: false, |
46 | 61 | media: 'audio' |
47 | 62 | }, |
|
70 | 85 | flashCanPlay: true, |
71 | 86 | media: 'video' |
72 | 87 | }, |
| 88 | + m3u8v: { // H.264 / AAC / MP4 / Apple HLS |
| 89 | + codec: 'application/vnd.apple.mpegurl; codecs="avc1.42E01E, mp4a.40.2"', |
| 90 | + flashCanPlay: false, |
| 91 | + media: 'video' |
| 92 | + }, |
| 93 | + m3uv: { // M3U |
| 94 | + codec: 'audio/mpegurl', |
| 95 | + flashCanPlay: false, |
| 96 | + media: 'video' |
| 97 | + }, |
73 | 98 | ogv: { // OGG |
74 | 99 | codec: 'video/ogg; codecs="theora, vorbis"', |
75 | 100 | flashCanPlay: false, |
|
0 commit comments