From aebe5be0d036e2b7aac13f908ed8a49a738c9d9c Mon Sep 17 00:00:00 2001 From: rolux Date: Sat, 20 Aug 2011 09:47:56 +0000 Subject: [PATCH] player results view (experimental) --- pandora/0xdb.json | 1 + static/js/pandora/ui/list.js | 62 ++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/pandora/0xdb.json b/pandora/0xdb.json index 662787d6e..73adebf26 100644 --- a/pandora/0xdb.json +++ b/pandora/0xdb.json @@ -444,6 +444,7 @@ {"id": "maps", "title": "with Maps"}, {"id": "calendars", "title": "with Calendars"}, {"id": "clip", "title": "as Clips"}, + {"id": "player", "title": "as Player"}, {"id": "map", "title": "on Map"}, {"id": "calendar", "title": "on Calendar"} ], diff --git a/static/js/pandora/ui/list.js b/static/js/pandora/ui/list.js index f7a58f436..e4c0889e0 100644 --- a/static/js/pandora/ui/list.js +++ b/static/js/pandora/ui/list.js @@ -191,10 +191,10 @@ pandora.ui.list = function() { // fixme: remove view argument query.conditions.push({key: 'value', value: q.value, operator: q.operator}); } }); - pandora.api.findAnnotations($.extend(data, { + pandora.api.findAnnotations(Ox.extend({ query: query, itemQuery: itemQuery - }), callback); + }, data), callback); }, keys: ['id', 'value', 'in', 'out', 'videoRatio'], max: 1, @@ -245,7 +245,7 @@ pandora.ui.list = function() { // fixme: remove view argument poster: '/' + item + '/' + height + 'p' + points[0] + '.jpg', width: width, video: partsAndPoints.parts.map(function(i) { - return '/' + item + '/96p' + (i + 1) + '.' + pandora.user.videoFormat + return '/' + item + '/96p' + (i + 1) + '.' + pandora.user.videoFormat; }) }) .addClass('OxTarget') @@ -273,6 +273,62 @@ pandora.ui.list = function() { // fixme: remove view argument } } }); + } else if (view == 'player') { + that = Ox.VideoPlayer({ + controlsBottom: ['play', 'previous', 'next', 'volume'], + controlsTop: ['fullscreen', 'scale'], + enableMouse: true, + height: 384, + paused: true, + position: 0, + video: function(range, callback) { + var callback = arguments[arguments.length - 1], + range = arguments.length == 2 ? arguments[0] : null, + itemQuery = pandora.Query.toObject(), + query = {conditions:[]}; + //fixme: can this be in pandora.Query? dont just check for subtitles + itemQuery.conditions.forEach(function(q) { + if (q.key == 'subtitles') { + query.conditions.push({key: 'value', value: q.value, operator: q.operator}); + } + }); + pandora.api.findAnnotations(Ox.extend({ + query: query, + itemQuery: itemQuery + }, range ? { + keys: ['id', 'in', 'out'], + range: range, + sort: pandora.user.ui.lists[pandora.user.ui.list].sort + } : {}), function(result) { + //Ox.print('API findAnnotations range', range, 'result', result.data); + if (!range) { + callback(result.data.items); + } else { + var counter = 0, + length = range[1] - range[0], + data = []; + result.data.items.forEach(function(item, i) { + var id = item.id.split('/')[0] + pandora.api.get({id: id, keys: ['durations']}, function(result) { + //Ox.print('API get item', id, 'result', result.data); + var points = [item['in'], item.out], + partsAndPoints = pandora.getVideoPartsAndPoints(result.data.durations, points); + data[i] = { + parts: partsAndPoints.parts.map(function(i) { + return '/' + id + '/96p' + (i + 1) + '.' + pandora.user.videoFormat; + }), + points: partsAndPoints.points + } + if (++counter == length) { + callback(data); + } + }); + }); + } + }); + }, + width: 512 + }); } else if (view == 'map') { var fixedRatio = 16/9; that = Ox.SplitPanel({