10562674 by jrivera

Update contrib-media-sources so that this will build

Also fixes a missing webworkify library that was causing build errors
Closes #558
1 parent 941e5b0d
1 sudo: false 1 sudo: false
2 language: node_js 2 language: node_js
3 addons:
4 firefox: "latest"
3 node_js: 5 node_js:
4 - 'node' 6 - "stable"
5 - '4.2'
6 - '0.12'
7 - '0.10'
8 notifications: 7 notifications:
9 hipchat: 8 hipchat:
10 rooms: 9 rooms:
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
91 "dependencies": { 91 "dependencies": {
92 "pkcs7": "^0.2.2", 92 "pkcs7": "^0.2.2",
93 "video.js": "^5.2.1", 93 "video.js": "^5.2.1",
94 "videojs-contrib-media-sources": "^2.4.4", 94 "videojs-contrib-media-sources": "^3.0.0",
95 "videojs-swf": "^5.0.0" 95 "videojs-swf": "^5.0.0"
96 }, 96 },
97 "devDependencies": { 97 "devDependencies": {
...@@ -124,6 +124,7 @@ ...@@ -124,6 +124,7 @@
124 "sinon": "1.10.2", 124 "sinon": "1.10.2",
125 "uglify-js": "^2.5.0", 125 "uglify-js": "^2.5.0",
126 "videojs-standard": "^4.0.0", 126 "videojs-standard": "^4.0.0",
127 "watchify": "^3.6.0" 127 "watchify": "^3.6.0",
128 "webworkify": "^1.1.0"
128 } 129 }
129 } 130 }
......
...@@ -311,6 +311,10 @@ QUnit.test('starts playing if autoplay is specified', function() { ...@@ -311,6 +311,10 @@ QUnit.test('starts playing if autoplay is specified', function() {
311 type: 'application/vnd.apple.mpegurl' 311 type: 'application/vnd.apple.mpegurl'
312 }); 312 });
313 313
314 // REMOVEME workaround https://github.com/videojs/video.js/issues/2326
315 this.player.tech_.triggerReady();
316 this.clock.tick(1);
317
314 // make sure play() is called *after* the media source opens 318 // make sure play() is called *after* the media source opens
315 this.player.tech_.hls.play = function() { 319 this.player.tech_.hls.play = function() {
316 plays++; 320 plays++;
......