Commit 722dbdeb authored by Mukul's avatar Mukul Committed by Xiaowu Zhang

[erp5_multimedia] Add clickable progress bar feature in officejs media player

parent 385c4c30
...@@ -119,6 +119,27 @@ ...@@ -119,6 +119,27 @@
controller_fallback: false controller_fallback: false
}; };
}) })
.declareService(function () {
var gadget = this,
progress_bar = gadget.element.querySelector('progress');
return loopEventListener(
progress_bar,
'click',
false,
function (event) {
return gadget.getDeclaredGadget(gadget.params.scope)
.push(function (controller) {
var percentage = event.offsetX / progress_bar.offsetWidth;
return controller.updateAudioElementCurrentTime(percentage * progress_bar.max, progress_bar.max)
.push(function () {
return gadget.togglePlayPause(gadget.state.play);
});
});
},
true
);
})
.declareService(function () { .declareService(function () {
var gadget = this; var gadget = this;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
.declareMethod('getAudioChunk', function () { .declareMethod('getAudioChunk', function () {
var gadget = this, start, end; var gadget = this, start, end;
start = gadget.params.index; start = gadget.params.index;
if (gadget.params.end) { if (gadget.params.end || gadget.params.mediaSource.sourceBuffers.length === 0) {
return; return;
} }
...@@ -56,6 +56,35 @@ ...@@ -56,6 +56,35 @@
}); });
}); });
}) })
.declareMethod('updateAudioElementCurrentTime', function (time, max) {
var gadget = this;
// If there is no data in sourceBuffer return from here.
if (gadget.params.sourceBuffer.buffered.length === 0) {
return;
}
// If time is in range of buffered data, just update the current time of audio.
if (time > gadget.params.sourceBuffer.buffered.start(0) && time < gadget.params.sourceBuffer.buffered.end(0)) {
gadget.element.querySelector('audio').currentTime = time;
return gadget.updateCurrentTime(time);
}
gadget.params.index = Math.floor((gadget.params.index / max) * time) - 1000;
return new RSVP.Queue()
.push(function () {
gadget.params.sourceBuffer.abort();
gadget.params.sourceBuffer.timestampOffset = time;
gadget.params.sourceBuffer.remove(
gadget.params.sourceBuffer.buffered.start(0),
gadget.params.sourceBuffer.buffered.end(0)
);
return gadget.setUpdateEvent();
})
.push(function () {
gadget.element.querySelector('audio').currentTime = time;
return gadget.updateCurrentTime(time);
});
})
.declareMethod('handlePlayPause', function (play) { .declareMethod('handlePlayPause', function (play) {
var audio = this.element.querySelector('audio'); var audio = this.element.querySelector('audio');
...@@ -81,17 +110,19 @@ ...@@ -81,17 +110,19 @@
.push(function (buffer) { .push(function (buffer) {
if (buffer instanceof ArrayBuffer && !gadget.params.sourceBuffer.updating) { if (buffer instanceof ArrayBuffer && !gadget.params.sourceBuffer.updating) {
gadget.params.sourceBuffer.appendBuffer(buffer); gadget.params.sourceBuffer.appendBuffer(buffer);
gadget.params.sourceBuffer.onupdateend = function () { return new RSVP.Queue()
this.updateTotalTime(this.params.sourceBuffer.timestampOffset); .push(function () {
}.bind(gadget); return promiseEventListener(gadget.params.sourceBuffer, 'updateend', false);
})
.push(function () {
gadget.params.max_progress_time = gadget.params.max_progress_time > gadget.params.sourceBuffer.timestampOffset ?
gadget.params.max_progress_time : gadget.params.sourceBuffer.timestampOffset;
return gadget.updateTotalTime(gadget.params.max_progress_time);
});
} }
if (buffer === undefined && gadget.params.mediaSource.readyState === 'open') { if (buffer === undefined && gadget.params.mediaSource.readyState === 'open') {
gadget.params.mediaSource.endOfStream(); gadget.params.mediaSource.endOfStream();
} }
if (gadget.params.replay) {
gadget.element.querySelector('audio').play();
gadget.params.replay = false;
}
}); });
}) })
...@@ -103,7 +134,7 @@ ...@@ -103,7 +134,7 @@
gadget.params.name = params.name; gadget.params.name = params.name;
gadget.params.end = false; gadget.params.end = false;
gadget.params.index = 0; gadget.params.index = 0;
gadget.time_offset = 0; gadget.params.max_progress_time = 0;
gadget.params.mediaSource = new MediaSource(); gadget.params.mediaSource = new MediaSource();
audio.src = URL.createObjectURL(gadget.params.mediaSource); audio.src = URL.createObjectURL(gadget.params.mediaSource);
...@@ -161,7 +192,12 @@ ...@@ -161,7 +192,12 @@
} }
}) })
.push(function () { .push(function () {
return gadget.changeState({ currentTime: gadget.element.querySelector('audio').currentTime }); return promiseEventListener( gadget.params.sourceBuffer, 'updateend', false);
})
.push(function () {
gadget.params.max_progress_time = gadget.params.max_progress_time > gadget.params.sourceBuffer.timestampOffset ?
gadget.params.max_progress_time : gadget.params.sourceBuffer.timestampOffset;
return gadget.updateTotalTime(gadget.params.max_progress_time);
}); });
}) })
...@@ -174,11 +210,17 @@ ...@@ -174,11 +210,17 @@
'timeupdate', 'timeupdate',
false, false,
function () { function () {
if (((gadget.params.sourceBuffer.timestampOffset + gadget.params.time_offset) - audio.currentTime) < 10 && !gadget.params.requested) { return new RSVP.Queue()
gadget.params.requested = true; .push(function () {
return gadget.requestChunk(); if ((gadget.params.sourceBuffer.timestampOffset - audio.currentTime) < 10 &&
} !gadget.params.requested) {
return gadget.changeState({ currentTime: audio.currentTime }); gadget.params.requested = true;
return gadget.requestChunk();
}
})
.push(function () {
return gadget.changeState({ currentTime: audio.currentTime });
});
}, },
true true
); );
......
...@@ -39,6 +39,10 @@ ...@@ -39,6 +39,10 @@
throw error; throw error;
}); });
}) })
.declareMethod('updateAudioElementCurrentTime', function (time) {
this.element.querySelector('audio').currentTime = time;
})
.declareMethod('handlePlayPause', function (play) { .declareMethod('handlePlayPause', function (play) {
var audio = this.element.querySelector('audio'); var audio = this.element.querySelector('audio');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment