moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix vimeo workaround

This commit is contained in:
Calvin Montgomery 2014-05-20 20:56:42 -07:00
parent 39090fbe40
commit 705b8ce10a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/channel/playlist.js
View File

@ -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);
}
});

6
www/js/callbacks.js
View File

@ -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") {