rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Fix VideoJS volume

Browse source
This commit is contained in:
Calvin Montgomery 2015-07-05 13:50:34 -07:00
parent 62ed922c73
commit 9f030376b5
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
player/update.coffee
View file

@ -17,7 +17,10 @@ TYPE_MAP =
window.loadMediaPlayer = (data) -> window.loadMediaPlayer = (data) ->
if data.meta.direct if data.meta.direct
window.PLAYER = new VideoJSPlayer(data) try
window.PLAYER = new VideoJSPlayer(data)
catch e
console.error e
else if data.type of TYPE_MAP else if data.type of TYPE_MAP
try try
window.PLAYER = TYPE_MAP[data.type](data) window.PLAYER = TYPE_MAP[data.type](data)

3
player/videojs.coffee
View file

@ -77,6 +77,7 @@ window.VideoJSPlayer = class VideoJSPlayer extends Player
@player = videojs(video[0], autoplay: true, controls: true) @player = videojs(video[0], autoplay: true, controls: true)
@player.ready(=> @player.ready(=>
@setVolume(VOLUME)
@player.on('ended', -> @player.on('ended', ->
if CLIENT.leader if CLIENT.leader
socket.emit('playNext') socket.emit('playNext')
@ -125,7 +126,7 @@ window.VideoJSPlayer = class VideoJSPlayer extends Player
@player.currentTime(time) @player.currentTime(time)
setVolume: (volume) -> setVolume: (volume) ->
if @player and @player.readyState() > 0 if @player
@player.volume(volume) @player.volume(volume)
getTime: (cb) -> getTime: (cb) ->

10
www/js/player.js
View file

@ -538,6 +538,7 @@
controls: true controls: true
}); });
return _this.player.ready(function() { return _this.player.ready(function() {
_this.setVolume(VOLUME);
_this.player.on('ended', function() { _this.player.on('ended', function() {
if (CLIENT.leader) { if (CLIENT.leader) {
return socket.emit('playNext'); return socket.emit('playNext');
@ -589,7 +590,7 @@
}; };
VideoJSPlayer.prototype.setVolume = function(volume) { VideoJSPlayer.prototype.setVolume = function(volume) {
if (this.player && this.player.readyState() > 0) { if (this.player) {
return this.player.volume(volume); return this.player.volume(volume);
} }
}; };
@ -1100,7 +1101,12 @@
window.loadMediaPlayer = function(data) { window.loadMediaPlayer = function(data) {
var e; var e;
if (data.meta.direct) { if (data.meta.direct) {
return window.PLAYER = new VideoJSPlayer(data); try {
return window.PLAYER = new VideoJSPlayer(data);
} catch (_error) {
e = _error;
return console.error(e);
}
} else if (data.type in TYPE_MAP) { } else if (data.type in TYPE_MAP) {
try { try {
return window.PLAYER = TYPE_MAP[data.type](data); return window.PLAYER = TYPE_MAP[data.type](data);