0x2620/oxjs
2
0
Fork 2
Code Issues 172 Pull requests Releases Wiki Activity

add chapter marker, use in video edit panel

Browse source
This commit is contained in:
rolux 2014-02-06 13:31:53 +00:00
commit 55fbe25ccc
4 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
source/Ox.UI/js/Video/LargeVideoTimeline.js
View file

@ -13,6 +13,7 @@ Ox.LargeVideoTimeline = function(options, self) {
self = self || {};
var that = Ox.Element({}, self)
.defaults({
chapters: [],
cuts: [],
disabled: false,
duration: 0,
@ -95,13 +96,15 @@ Ox.LargeVideoTimeline = function(options, self) {
}
setTimeout(function() {
self.options.cuts.forEach(function(v, i) {
var chapters = self.options.chapters.slice(1);
Ox.unique(chapters.concat(self.options.cuts)).forEach(function(v, i) {
self.$cuts[i] = $('<img>')
.addClass('OxCut')
.addClass(Ox.contains(chapters, v) ? 'OxChapter' : 'OxCut')
.css({left: (v * self.fps) + 'px'})
.appendTo(self.$timeline);
});
// performs better
self.$timeline.find('.OxChapter').attr({src: Ox.UI.getImageURL('markerChapter')});
self.$timeline.find('.OxCut').attr({src: Ox.UI.getImageURL('markerCut')});
});

1
source/Ox.UI/js/Video/VideoEditPanel.js
View file

@ -460,6 +460,7 @@ Ox.VideoEditPanel = function(options, self) {
function getTimeline() {
return Ox.LargeVideoTimeline({
chapters: self.chapters,
cuts: self.cuts,
duration: self.options.duration,
getImageURL: self.options.getLargeTimelineURL,