From 78e285bb125b2bc5e6fe1cb4653593337235ec8c Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 24 Jul 2014 19:47:00 +0200 Subject: [PATCH] support audioTrack in VideoTimelinePanel --- source/Ox.UI/js/Video/VideoTimelinePanel.js | 3 +++ source/Ox.UI/js/Video/VideoTimelinePlayer.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/source/Ox.UI/js/Video/VideoTimelinePanel.js b/source/Ox.UI/js/Video/VideoTimelinePanel.js index 48adecd7..ec6a62e0 100644 --- a/source/Ox.UI/js/Video/VideoTimelinePanel.js +++ b/source/Ox.UI/js/Video/VideoTimelinePanel.js @@ -8,6 +8,7 @@ Ox.VideoTimelinePanel Video timeline panel annoationssize annoationssize annotationsrange annotationsrange annotationssort annotationssort + audioTrack Two-letter ISO 639-1 language code or track name censored censored follow follow info info @@ -36,6 +37,7 @@ Ox.VideoTimelinePanel = function(options, self) { annotationsSize: 256, annotationsSort: 'position', annotationsTooltip: 'annotations', + audioTrack: '', censored: [], censoredIcon: '', censoredTooltip: '', @@ -107,6 +109,7 @@ Ox.VideoTimelinePanel = function(options, self) { }); self.$player = Ox.VideoTimelinePlayer({ + audioTrack: self.options.audioTrack, censored: self.options.censored, censoredIcon: self.options.censoredIcon, censoredTooltip: self.options.censoredTooltip, diff --git a/source/Ox.UI/js/Video/VideoTimelinePlayer.js b/source/Ox.UI/js/Video/VideoTimelinePlayer.js index 6bbc2019..5904ebeb 100644 --- a/source/Ox.UI/js/Video/VideoTimelinePlayer.js +++ b/source/Ox.UI/js/Video/VideoTimelinePlayer.js @@ -18,6 +18,7 @@ Ox.VideoTimelinePlayer = function(options, self) { self = self || {}; var that = Ox.Element({}, self) .defaults({ + audioTrack: '', censored: [], censoredIcon: '', censoredTooltip: '', @@ -305,6 +306,7 @@ Ox.VideoTimelinePlayer = function(options, self) { .appendTo(self.$timelines[self.videoLines[1]][0]); self.$frame = Ox.VideoPlayer({ + audioTrack: self.options.audioTrack, censored: self.options.censored, censoredIcon: self.options.censoredIcon, censoredTooltip: self.options.censoredTooltip, @@ -347,6 +349,7 @@ Ox.VideoTimelinePlayer = function(options, self) { .appendTo(self.$timelines[self.videoLines[0]][0]); self.$video = Ox.VideoPlayer({ + audioTrack: self.options.audioTrack, censored: self.options.censored, censoredIcon: self.options.censoredIcon, censoredTooltip: self.options.censoredTooltip,