From 705b8ce10ac4fe0aa6a2fef15d61e3558cbcf879 Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Tue, 20 May 2014 20:56:42 -0700
Subject: [PATCH] Fix vimeo workaround

---
 lib/channel/playlist.js | 4 ++--
 www/js/callbacks.js     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/channel/playlist.js b/lib/channel/playlist.js
index 67b5f5f8..9077a9d4 100644
--- a/lib/channel/playlist.js
+++ b/lib/channel/playlist.js
@@ -888,12 +888,12 @@ PlaylistModule.prototype.startPlayback = function (time) {
     var media = self.current.media;
     media.reset();
 
-    if (media.type === "vi" && !media.direct && Config.get("vimeo-workaround")) {
+    if (media.type === "vi" && !media.meta.direct && Config.get("vimeo-workaround")) {
         self.channel.activeLock.lock();
         vimeoWorkaround(media.id, function (direct) {
             self.channel.activeLock.release();
             if (self.current && self.current.media === media) {
-                self.current.media.direct = direct;
+                self.current.media.meta.direct = direct;
                 self.startPlayback(time);
             }
         });
diff --git a/www/js/callbacks.js b/www/js/callbacks.js
index 435812fa..87ee3771 100644
--- a/www/js/callbacks.js
+++ b/www/js/callbacks.js
@@ -851,7 +851,7 @@ Callbacks = {
             domains every time one gets blocked.  No thanks to Vimeo, who were of no help
             and unwilling to compromise on the issue.
         */
-        if (NO_VIMEO && data.type === "vi" && data.direct && data.direct.sd) {
+        if (NO_VIMEO && data.type === "vi" && data.meta.direct) {
             // For browsers that don't support native h264 playback
             if (USEROPTS.no_h264) {
                 data.type = "fl";
@@ -875,7 +875,7 @@ Callbacks = {
                 mobile: false
             };
 
-            while (!(q in data.direct) && q != false) {
+            while (!(q in data.meta.direct) && q != false) {
                 q = fallback[q];
             }
 
@@ -883,7 +883,7 @@ Callbacks = {
                 q = "sd";
             }
 
-            data.url = data.direct[q].url;
+            data.url = data.meta.direct[q].url;
         }
 
         if (data.type === "rt") {