decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

use min resolution

Browse source
This commit is contained in:
rolux 2013-03-01 11:23:35 +00:00
parent 0dbb327a97
commit 9b744ee8ce
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/js/pandora/clipPlayer.js
View file

@ -43,7 +43,7 @@ pandora.ui.clipPlayer = function() {
partsAndPoints = pandora.getVideoPartsAndPoints(result.data.durations, points); partsAndPoints = pandora.getVideoPartsAndPoints(result.data.durations, points);
data[i] = { data[i] = {
parts: partsAndPoints.parts.map(function(i) { parts: partsAndPoints.parts.map(function(i) {
return pandora.getVideoUrl(item, 96, i + 1); return pandora.getVideoURL(item, Ox.min(pandora.site.video.resolutions), i + 1);
}), }),
points: partsAndPoints.points points: partsAndPoints.points
}; };

2
static/js/pandora/itemClips.js
View file

@ -106,7 +106,7 @@ pandora.ui.itemClips = function(options) {
poster: '/' + self.options.id + '/' + self.height + 'p' + points[0] + '.jpg', poster: '/' + self.options.id + '/' + self.height + 'p' + points[0] + '.jpg',
rewind: true, rewind: true,
video: partsAndPoints.parts.map(function(i) { video: partsAndPoints.parts.map(function(i) {
return pandora.getVideoUrl(self.options.id, 96, i + 1); return pandora.getVideoURL(self.options.id, Ox.min(pandora.site.video.resolutions), i + 1);
}), }),
width: self.width width: self.width
}) })

2
static/js/pandora/timeline.js
View file

@ -31,7 +31,7 @@ pandora.ui.timeline = function(data) {
layers: data.annotations, layers: data.annotations,
muted: ui.videoMuted, muted: ui.videoMuted,
position: ui.videoPoints[ui.item].position, position: ui.videoPoints[ui.item].position,
resolution: pandora.site.video.resolutions[0], resolution: Ox.min(pandora.site.video.resolutions),
selected: ui.videoPoints[ui.item].annotation selected: ui.videoPoints[ui.item].annotation
? ui.item + '/' + ui.videoPoints[ui.item].annotation ? ui.item + '/' + ui.videoPoints[ui.item].annotation
: '', : '',