From 73235e5fbbbd85a4e6307c8c9fa0dfa906007a1d Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 7 Jan 2014 19:30:30 -0600
Subject: [PATCH] Fix some volume sync issues and another small issue

---
 lib/get-info.js            | 6 ++++++
 www/assets/js/callbacks.js | 6 ++++--
 www/assets/js/data.js      | 2 +-
 www/assets/js/player.js    | 6 +++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/get-info.js b/lib/get-info.js
index 8329b27a..46560e47 100644
--- a/lib/get-info.js
+++ b/lib/get-info.js
@@ -720,6 +720,12 @@ function VimeoIsADoucheCopter(id, cb) {
                 cb(files);
             });
         } catch (e) {
+            if (data.indexOf("crawler") !== -1) {
+                setImmediate(function () {
+                    VimeoIsADoucheCopter(id, cb);
+                });
+                return;
+            }
             Logger.errlog.log("Vimeo workaround error: ");
             Logger.errlog.log(e);
             Logger.errlog.log(data);
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 73129127..943cc388 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -1011,8 +1011,10 @@ Callbacks = {
     changeMedia: function(data) {
         if (PLAYER) {
             PLAYER.getVolume(function (v) {
-                VOLUME = v;
-                setOpt("volume", VOLUME);
+                if (typeof v === "number") {
+                    VOLUME = v;
+                    setOpt("volume", VOLUME);
+                }
             });
         }
 
diff --git a/www/assets/js/data.js b/www/assets/js/data.js
index c35eebb3..6b6ab972 100644
--- a/www/assets/js/data.js
+++ b/www/assets/js/data.js
@@ -133,7 +133,7 @@ var USEROPTS = {
     no_h264              : getOrDefault("no_h264", default_noh264())
 };
 
-var VOLUME = getOrDefault("volume", 1);
+var VOLUME = parseFloat(getOrDefault("volume", 1));
 
 var NO_WEBSOCKETS = USEROPTS.altsocket;
 
diff --git a/www/assets/js/player.js b/www/assets/js/player.js
index 514cb24d..a2d8260e 100644
--- a/www/assets/js/player.js
+++ b/www/assets/js/player.js
@@ -1048,7 +1048,11 @@ function RawVideoPlayer(data) {
 
     self.getVolume = function (cb) {
         if (self.player) {
-            cb(self.player.volume);
+            if (self.player.muted) {
+                cb(0);
+            } else {
+                cb(self.player.volume);
+            }
         }
     };