From 9f030376b5bc42be6059f33a7f6e6033dbbeb2d3 Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Sun, 5 Jul 2015 13:50:34 -0700
Subject: [PATCH] Fix VideoJS volume

---
 player/update.coffee  |  5 ++++-
 player/videojs.coffee |  3 ++-
 www/js/player.js      | 10 ++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/player/update.coffee b/player/update.coffee
index 92fdb2ec..6231c4c1 100644
--- a/player/update.coffee
+++ b/player/update.coffee
@@ -17,7 +17,10 @@ TYPE_MAP =
 
 window.loadMediaPlayer = (data) ->
     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
         try
             window.PLAYER = TYPE_MAP[data.type](data)
diff --git a/player/videojs.coffee b/player/videojs.coffee
index 5e18059d..bd932af0 100644
--- a/player/videojs.coffee
+++ b/player/videojs.coffee
@@ -77,6 +77,7 @@ window.VideoJSPlayer = class VideoJSPlayer extends Player
 
             @player = videojs(video[0], autoplay: true, controls: true)
             @player.ready(=>
+                @setVolume(VOLUME)
                 @player.on('ended', ->
                     if CLIENT.leader
                         socket.emit('playNext')
@@ -125,7 +126,7 @@ window.VideoJSPlayer = class VideoJSPlayer extends Player
             @player.currentTime(time)
 
     setVolume: (volume) ->
-        if @player and @player.readyState() > 0
+        if @player
             @player.volume(volume)
 
     getTime: (cb) ->
diff --git a/www/js/player.js b/www/js/player.js
index bf5f96b3..ad3b6a17 100644
--- a/www/js/player.js
+++ b/www/js/player.js
@@ -538,6 +538,7 @@
             controls: true
           });
           return _this.player.ready(function() {
+            _this.setVolume(VOLUME);
             _this.player.on('ended', function() {
               if (CLIENT.leader) {
                 return socket.emit('playNext');
@@ -589,7 +590,7 @@
     };
 
     VideoJSPlayer.prototype.setVolume = function(volume) {
-      if (this.player && this.player.readyState() > 0) {
+      if (this.player) {
         return this.player.volume(volume);
       }
     };
@@ -1100,7 +1101,12 @@
   window.loadMediaPlayer = function(data) {
     var e;
     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) {
       try {
         return window.PLAYER = TYPE_MAP[data.type](data);