load subtitles/censor data in embeded player
This commit is contained in:
j
parent
81748afa2d
commit
7190568714
3 changed files with 90 additions and 40 deletions
|
|
@ -15,18 +15,13 @@ Ox.load('UI', {
|
|||
user: data.user.level == 'guest' ? Ox.clone(data.site.user) : data.user,
|
||||
ui: {},
|
||||
clip: function(options) {
|
||||
var that = Ox.Element();
|
||||
pandora.api.get({id: options.item, keys: []}, function(result) {
|
||||
var video = {};
|
||||
pandora.site.video.resolutions.forEach(function(resolution) {
|
||||
video[resolution] = Ox.range(result.data.parts).map(function(i) {
|
||||
var part = (i + 1),
|
||||
prefix = pandora.site.site.videoprefix.replace('PART', part);
|
||||
return prefix + '/' + options.item + '/'
|
||||
+ resolution + 'p' + part + '.' + pandora.user.videoFormat;
|
||||
});
|
||||
});
|
||||
var that = Ox.Element(),
|
||||
keys = [ 'duration', 'layers', 'parts', 'posterFrame', 'rightslevel', 'size', 'title', 'videoRatio' ];
|
||||
pandora.user.ui.item = options.item;
|
||||
pandora.api.get({id: options.item, keys: keys}, function(result) {
|
||||
var videoOptions = getVideoOptions(result.data);
|
||||
that.append(pandora.player = Ox.VideoPlayer({
|
||||
censored: videoOptions.censored,
|
||||
controlsBottom: ['play', 'volume', 'scale', 'timeline', 'position', 'settings'],
|
||||
enableFind: false,
|
||||
enableFullscreen: true,
|
||||
|
|
@ -40,13 +35,14 @@ Ox.load('UI', {
|
|||
out: options.out,
|
||||
paused: options.paused,
|
||||
position: options['in'],
|
||||
poster: '/' + options.item + '/' + '128p' + options['in'] +'.jpg',
|
||||
poster: '/' + options.item + '/' + '96p' + options['in'] +'.jpg',
|
||||
resolution: pandora.user.ui.videoResolution,
|
||||
showMarkers: false,
|
||||
showMilliseconds: 0,
|
||||
subtitles: videoOptions.subtitles,
|
||||
timeline: '/' + options.item + '/' + 'timeline16p.png',
|
||||
title: result.data.title,
|
||||
video: video,
|
||||
video: videoOptions.video,
|
||||
width: document.width
|
||||
})
|
||||
.bindEvent({
|
||||
|
|
@ -60,13 +56,13 @@ Ox.load('UI', {
|
|||
Ox.UI.hideLoadingScreen();
|
||||
|
||||
function checkRange(data) {
|
||||
if(data.position < options['in']
|
||||
if(data.position < options['in'] - 0.04
|
||||
|| data.position > options.out) {
|
||||
if(!pandora.player.options('paused')) {
|
||||
pandora.player.togglePaused();
|
||||
}
|
||||
pandora.player.options({
|
||||
position: options['in'],
|
||||
position: options['in']
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -77,28 +73,6 @@ Ox.load('UI', {
|
|||
Ox.extend(pandora.user, {
|
||||
videoFormat: Ox.UI.getVideoFormat(pandora.site.video.formats)
|
||||
});
|
||||
|
||||
function parseQuery() {
|
||||
var vars = window.location.search.length
|
||||
? window.location.search.substring(1).split('&')
|
||||
: [],
|
||||
query = {
|
||||
item: window.location.pathname.substring(1).split('/')[0]
|
||||
},
|
||||
defaults = {
|
||||
view: 'video',
|
||||
'in': 0,
|
||||
out: 10,
|
||||
paused: true,
|
||||
item: ''
|
||||
};
|
||||
vars.forEach(function(v) {
|
||||
v= v.split('=');
|
||||
query[v[0]] = decodeURIComponent(v[1]);
|
||||
});
|
||||
|
||||
return Ox.extend({}, defaults, query);
|
||||
}
|
||||
var options = parseQuery();
|
||||
if (options.view == 'video') {
|
||||
pandora.ui.info = pandora.clip(options)
|
||||
|
|
@ -107,4 +81,79 @@ Ox.load('UI', {
|
|||
}
|
||||
}
|
||||
});
|
||||
|
||||
function getVideoOptions(data) {
|
||||
var canPlayClips = data.editable || pandora.site.capabilities.canPlayClips[pandora.user.level] >= data.rightslevel,
|
||||
canPlayVideo = data.editable || pandora.site.capabilities.canPlayVideo[pandora.user.level] >= data.rightslevel,
|
||||
options = {};
|
||||
options.subtitles = data.layers.subtitles
|
||||
? data.layers.subtitles.map(function(subtitle) {
|
||||
return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value};
|
||||
})
|
||||
: [];
|
||||
options.censored = canPlayVideo ? []
|
||||
: canPlayClips ? (
|
||||
options.subtitles.length
|
||||
? Ox.merge(
|
||||
options.subtitles.map(function(subtitle, i) {
|
||||
return {
|
||||
'in': i == 0 ? 0 : options.subtitles[i - 1].out,
|
||||
out: subtitle['in']
|
||||
};
|
||||
}),
|
||||
[{'in': Ox.last(options.subtitles).out, out: data.duration}]
|
||||
)
|
||||
: Ox.range(0, data.duration - 5, 60).map(function(position) {
|
||||
return {
|
||||
'in': position + 5,
|
||||
out: Math.min(position + 60, data.duration)
|
||||
};
|
||||
})
|
||||
)
|
||||
: [{'in': 0, out: data.duration}];
|
||||
options.video = {};
|
||||
pandora.site.video.resolutions.forEach(function(resolution) {
|
||||
options.video[resolution] = Ox.range(data.parts).map(function(i) {
|
||||
var part = (i + 1),
|
||||
prefix = pandora.site.site.videoprefix.replace('{part}', part);
|
||||
return prefix + '/' + (data.item || pandora.user.ui.item) + '/'
|
||||
+ resolution + 'p' + part + '.' + pandora.user.videoFormat;
|
||||
});
|
||||
});
|
||||
options.layers = [];
|
||||
pandora.site.layers.forEach(function(layer, i) {
|
||||
options.layers[i] = Ox.extend({}, layer, {
|
||||
items: data.layers[layer.id].map(function(annotation) {
|
||||
annotation.duration = Math.abs(annotation.out - annotation['in']);
|
||||
annotation.editable = annotation.editable
|
||||
|| annotation.user == pandora.user.username
|
||||
|| pandora.site.capabilities['canEditAnnotations'][pandora.user.level];
|
||||
return annotation;
|
||||
})
|
||||
});
|
||||
});
|
||||
return options;
|
||||
}
|
||||
|
||||
function parseQuery() {
|
||||
var vars = window.location.search.length
|
||||
? window.location.search.substring(1).split('&')
|
||||
: [],
|
||||
query = {
|
||||
item: window.location.pathname.substring(1).split('/')[0]
|
||||
},
|
||||
defaults = {
|
||||
view: 'video',
|
||||
'in': 0,
|
||||
out: 10,
|
||||
paused: true,
|
||||
item: ''
|
||||
};
|
||||
vars.forEach(function(v) {
|
||||
v= v.split('=');
|
||||
query[v[0]] = decodeURIComponent(v[1]);
|
||||
});
|
||||
|
||||
return Ox.extend({}, defaults, query);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
|
||||
pandora.ui.item = function() {
|
||||
|
||||
var that = Ox.Element();
|
||||
var that = Ox.Element(),
|
||||
videoOptions;
|
||||
|
||||
pandora.api.get({
|
||||
id: pandora.user.ui.item,
|
||||
|
|
@ -42,7 +43,7 @@ pandora.ui.item = function() {
|
|||
|
||||
if (['video', 'timeline'].indexOf(pandora.user.ui.itemView) > -1) {
|
||||
// fixme: layers have value, subtitles has text?
|
||||
var videoOptions = pandora.getVideoOptions(result.data);
|
||||
videoOptions = pandora.getVideoOptions(result.data);
|
||||
}
|
||||
|
||||
if (!result.data.rendered && [
|
||||
|
|
|
|||
|
|
@ -794,7 +794,7 @@ pandora.getVideoOptions = function(data) {
|
|||
pandora.site.video.resolutions.forEach(function(resolution) {
|
||||
options.video[resolution] = Ox.range(data.parts).map(function(i) {
|
||||
var part = (i + 1),
|
||||
prefix = pandora.site.site.videoprefix.replace('PART', part); // fixme: '{part}' would be more consistent
|
||||
prefix = pandora.site.site.videoprefix.replace('{part}', part);
|
||||
return prefix + '/' + (data.item || pandora.user.ui.item) + '/'
|
||||
+ resolution + 'p' + part + '.' + pandora.user.videoFormat;
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue