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

in video editor, pass muted/volume options downwards and muted/volume events upwards

Browse source
This commit is contained in:
rlx 2011-11-05 15:01:18 +00:00
parent 730712e9ba
commit 49adfa57ae
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -28,6 +28,7 @@ Ox.VideoEditor = function(options, self) {
'in': 0, 'in': 0,
height: 0, height: 0,
layers: [], layers: [],
muted: false,
out: 0, out: 0,
position: 0, position: 0,
posterFrame: 0, posterFrame: 0,
@ -39,6 +40,7 @@ Ox.VideoEditor = function(options, self) {
videoRatio: 16/9, videoRatio: 16/9,
videoSize: 'small', videoSize: 'small',
video: '', video: '',
volume: 1,
width: 0 width: 0
}) })
.options(options || {}) .options(options || {})
@ -180,6 +182,7 @@ Ox.VideoEditor = function(options, self) {
height: self.sizes.player[i].height, height: self.sizes.player[i].height,
id: 'player' + Ox.toTitleCase(type), id: 'player' + Ox.toTitleCase(type),
'in': self.options['in'], 'in': self.options['in'],
muted: self.options.muted,
out: self.options.out, out: self.options.out,
paused: true, paused: true,
position: type == 'play' ? self.options.position : self.options[type], position: type == 'play' ? self.options.position : self.options[type],
@ -190,6 +193,7 @@ Ox.VideoEditor = function(options, self) {
subtitles: self.options.subtitles, subtitles: self.options.subtitles,
type: type, type: type,
video: type == 'play' ? self.options.video : self.options.getFrameURL, video: type == 'play' ? self.options.video : self.options.getFrameURL,
volume: self.options.volume,
width: self.sizes.player[i].width width: self.sizes.player[i].width
}) })
.css({ .css({
@ -197,8 +201,14 @@ Ox.VideoEditor = function(options, self) {
top: self.sizes.player[i].top + 'px' top: self.sizes.player[i].top + 'px'
}) })
.bindEvent(type == 'play' ? { .bindEvent(type == 'play' ? {
muted: function(data) {
that.triggerEvent('muted', data);
},
position: changePlayer, position: changePlayer,
size: toggleSize size: toggleSize,
volume: function(data) {
that.triggerEvent('volume', data);
}
} : { } : {
gotopoint: function() { gotopoint: function() {
goToPoint(type); goToPoint(type);