fixed errors in AnnotationsController + added support for timeRange for PopCorn player (youtube etc) + fix slight mistake in timerange code
--- a/server/src/remie/static/remie/metadataplayer/AnnotationsController.js Mon Aug 03 14:17:30 2015 +0200
+++ b/server/src/remie/static/remie/metadataplayer/AnnotationsController.js Wed Aug 05 15:04:30 2015 +0200
@@ -84,7 +84,12 @@
_timeRange = typeof _timeRange !== 'undefined' ? _timeRange : false ;
if (this.hide_without_segment){
- if (!_timeRange){
+ if (!_timeRange && !this.media.getTimeRange()){
+ if(!_timeRange){
+ if (this.media.getTimeRange()){
+ _timeRange = this.media.getTimeRange();
+ }
+ }
_currentTime = this.media.getCurrentTime()
_currentSegments = this.segments.filter(function(_segment){
return (_currentTime >= _segment.begin && _currentTime <= _segment.end)
--- a/server/src/remie/static/remie/metadataplayer/LdtPlayer-core.js Mon Aug 03 14:17:30 2015 +0200
+++ b/server/src/remie/static/remie/metadataplayer/LdtPlayer-core.js Wed Aug 05 15:04:30 2015 +0200
@@ -836,7 +836,7 @@
};
Playable.prototype.setTimeRange = function(_timeBegin, _timeEnd) {
- if ((_timeBegin < _timeEnd)&&(_timeBegin > 0)&&(_timeEnd>0)){
+ if ((_timeBegin < _timeEnd)&&(_timeBegin >= 0)&&(_timeEnd>0)){
return this.trigger("settimerange", [_timeBegin, _timeEnd]);
}
}
--- a/server/src/remie/static/remie/metadataplayer/PopcornPlayer.js Mon Aug 03 14:17:30 2015 +0200
+++ b/server/src/remie/static/remie/metadataplayer/PopcornPlayer.js Wed Aug 05 15:04:30 2015 +0200
@@ -101,6 +101,20 @@
_popcorn.pause();
});
+ _media.on("settimerange", function(_timeRange){
+ _media.timeRange = _timeRange;
+ try {
+ if (_media.getCurrentTime() > _timeRange[0] || _media.getCurrentTime() < _timeRange){
+ _popcorn.currentTime(_timeRange[0] / 1000);
+ }
+ } catch (err) {
+ }
+ })
+
+ _media.on("resettimerange", function(){
+ _media.timeRange = false;
+ })
+
// Binding Popcorn events to media
function getVolume() {