milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Migration of htmlAudioPlayer to ES6 module

Browse source
This commit is contained in:
Cameron 2020-08-03 20:57:54 +01:00
parent 0ef8f3d038
commit 36f389e8f9
2 changed files with 173 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -155,6 +155,7 @@
"src/components/refreshdialog/refreshdialog.js",
"src/components/sanatizefilename.js",
"src/components/scrollManager.js",
"src/plugins/htmlAudioPlayer/plugin.js",
"src/plugins/htmlVideoPlayer/plugin.js",
"src/components/search/searchfields.js",
"src/components/search/searchresults.js",

194
src/plugins/htmlAudioPlayer/plugin.js
View file

@ -1,21 +1,23 @@
define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelper'], function (events, browser, require, appHost, appSettings, htmlMediaHelper) {
'use strict';
import events from 'events';
import browser from 'browser';
import appHost from 'apphost';
import * as htmlMediaHelper from 'htmlMediaHelper';
function getDefaultProfile() {
return new Promise(function (resolve, reject) {
require(['browserdeviceprofile'], function (profileBuilder) {
import('browserdeviceprofile').then(({default: profileBuilder}) => {
resolve(profileBuilder({}));
});
});
}
var fadeTimeout;
let fadeTimeout;
function fade(instance, elem, startingVolume) {
instance._isFadingOut = true;
// Need to record the starting volume on each pass rather than querying elem.volume
// This is due to iOS safari not allowing volume changes and always returning the system volume value
var newVolume = Math.max(0, startingVolume - 0.15);
const newVolume = Math.max(0, startingVolume - 0.15);
console.debug('fading volume to ' + newVolume);
elem.volume = newVolume;
@ -33,7 +35,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
}
function cancelFadeTimeout() {
var timeout = fadeTimeout;
const timeout = fadeTimeout;
if (timeout) {
clearTimeout(timeout);
fadeTimeout = null;
@ -51,7 +53,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
}
function requireHlsPlayer(callback) {
require(['hlsjs'], function (hls) {
import('hlsjs').then(({default: hls}) => {
window.Hls = hls;
callback();
});
@ -68,12 +70,12 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
// issue head request to get content type
return new Promise(function (resolve, reject) {
require(['fetchHelper'], function (fetchHelper) {
import('fetchHelper').then(({default: fetchHelper}) => {
fetchHelper.ajax({
url: url,
type: 'HEAD'
}).then(function (response) {
var contentType = (response.headers.get('Content-Type') || '').toLowerCase();
const contentType = (response.headers.get('Content-Type') || '').toLowerCase();
if (contentType === 'application/x-mpegurl') {
resolve();
} else {
@ -84,8 +86,9 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
});
}
function HtmlAudioPlayer() {
var self = this;
class HtmlAudioPlayer {
constructor() {
const self = this;
self.name = 'Html Audio Player';
self.type = 'mediaplayer';
@ -99,7 +102,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
self._timeUpdated = false;
self._currentTime = null;
var elem = createMediaElement();
const elem = createMediaElement();
return setCurrentSrc(elem, options);
};
@ -109,11 +112,11 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
unBindEvents(elem);
bindEvents(elem);
var val = options.url;
let val = options.url;
console.debug('playing url: ' + val);
// Convert to seconds
var seconds = (options.playerStartPositionTicks || 0) / 10000000;
const seconds = (options.playerStartPositionTicks || 0) / 10000000;
if (seconds) {
val += '#t=' + seconds;
}
@ -122,7 +125,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
self._currentPlayOptions = options;
var crossOrigin = htmlMediaHelper.getCrossOriginValue(options.mediaSource);
const crossOrigin = htmlMediaHelper.getCrossOriginValue(options.mediaSource);
if (crossOrigin) {
elem.crossOrigin = crossOrigin;
}
@ -130,7 +133,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
return enableHlsPlayer(val, options.item, options.mediaSource, 'Audio').then(function () {
return new Promise(function (resolve, reject) {
requireHlsPlayer(function () {
var hls = new Hls({
const hls = new Hls({
manifestLoadingTimeOut: 20000,
xhrSetup: function (xhr, url) {
xhr.withCredentials = true;
@ -183,8 +186,8 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
self.stop = function (destroyPlayer) {
cancelFadeTimeout();
var elem = self._mediaElement;
var src = self._currentSrc;
const elem = self._mediaElement;
const src = self._currentSrc;
if (elem && src) {
if (!destroyPlayer || !supportsFade()) {
@ -198,7 +201,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
return Promise.resolve();
}
var originalVolume = elem.volume;
const originalVolume = elem.volume;
return fade(self, elem, elem.volume).then(function () {
elem.pause();
@ -219,7 +222,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
};
function createMediaElement() {
var elem = self._mediaElement;
let elem = self._mediaElement;
if (elem) {
return elem;
@ -248,7 +251,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
function onTimeUpdate() {
// Get the player position + the transcoding offset
var time = this.currentTime;
const time = this.currentTime;
// Don't trigger events after user stop
if (!self._isFadingOut) {
@ -287,11 +290,11 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
}
function onError() {
var errorCode = this.error ? (this.error.code || 0) : 0;
var errorMessage = this.error ? (this.error.message || '') : '';
const errorCode = this.error ? (this.error.code || 0) : 0;
const errorMessage = this.error ? (this.error.message || '') : '';
console.error('media element error: ' + errorCode.toString() + ' ' + errorMessage);
var type;
let type;
switch (errorCode) {
case 1:
@ -325,59 +328,59 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
}
}
HtmlAudioPlayer.prototype.currentSrc = function () {
currentSrc() {
return this._currentSrc;
};
}
HtmlAudioPlayer.prototype.canPlayMediaType = function (mediaType) {
canPlayMediaType(mediaType) {
return (mediaType || '').toLowerCase() === 'audio';
};
}
HtmlAudioPlayer.prototype.getDeviceProfile = function (item) {
getDeviceProfile(item) {
if (appHost.getDeviceProfile) {
return appHost.getDeviceProfile(item);
}
return getDefaultProfile();
};
}
// Save this for when playback stops, because querying the time at that point might return 0
HtmlAudioPlayer.prototype.currentTime = function (val) {
var mediaElement = this._mediaElement;
currentTime(val) {
const mediaElement = this._mediaElement;
if (mediaElement) {
if (val != null) {
mediaElement.currentTime = val / 1000;
return;
}
var currentTime = this._currentTime;
const currentTime = this._currentTime;
if (currentTime) {
return currentTime * 1000;
}
return (mediaElement.currentTime || 0) * 1000;
}
};
}
HtmlAudioPlayer.prototype.duration = function (val) {
var mediaElement = this._mediaElement;
duration(val) {
const mediaElement = this._mediaElement;
if (mediaElement) {
var duration = mediaElement.duration;
const duration = mediaElement.duration;
if (htmlMediaHelper.isValidDuration(duration)) {
return duration * 1000;
}
}
return null;
};
}
HtmlAudioPlayer.prototype.seekable = function () {
var mediaElement = this._mediaElement;
seekable() {
const mediaElement = this._mediaElement;
if (mediaElement) {
var seekable = mediaElement.seekable;
const seekable = mediaElement.seekable;
if (seekable && seekable.length) {
var start = seekable.start(0);
var end = seekable.end(0);
let start = seekable.start(0);
let end = seekable.end(0);
if (!htmlMediaHelper.isValidDuration(start)) {
start = 0;
@ -391,109 +394,117 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
return false;
}
};
}
HtmlAudioPlayer.prototype.getBufferedRanges = function () {
var mediaElement = this._mediaElement;
getBufferedRanges() {
const mediaElement = this._mediaElement;
if (mediaElement) {
return htmlMediaHelper.getBufferedRanges(this, mediaElement);
}
return [];
};
}
HtmlAudioPlayer.prototype.pause = function () {
var mediaElement = this._mediaElement;
pause() {
const mediaElement = this._mediaElement;
if (mediaElement) {
mediaElement.pause();
}
};
}
// This is a retry after error
HtmlAudioPlayer.prototype.resume = function () {
var mediaElement = this._mediaElement;
resume() {
const mediaElement = this._mediaElement;
if (mediaElement) {
mediaElement.play();
}
};
}
HtmlAudioPlayer.prototype.unpause = function () {
var mediaElement = this._mediaElement;
unpause() {
const mediaElement = this._mediaElement;
if (mediaElement) {
mediaElement.play();
}
};
}
HtmlAudioPlayer.prototype.paused = function () {
var mediaElement = this._mediaElement;
paused() {
const mediaElement = this._mediaElement;
if (mediaElement) {
return mediaElement.paused;
}
return false;
};
}
HtmlAudioPlayer.prototype.setPlaybackRate = function (value) {
var mediaElement = this._mediaElement;
setPlaybackRate(value) {
const mediaElement = this._mediaElement;
if (mediaElement) {
mediaElement.playbackRate = value;
}
};
}
HtmlAudioPlayer.prototype.getPlaybackRate = function () {
var mediaElement = this._mediaElement;
getPlaybackRate() {
const mediaElement = this._mediaElement;
if (mediaElement) {
return mediaElement.playbackRate;
}
return null;
};
}
HtmlAudioPlayer.prototype.setVolume = function (val) {
var mediaElement = this._mediaElement;
setVolume(val) {
const mediaElement = this._mediaElement;
if (mediaElement) {
mediaElement.volume = val / 100;
}
};
}
HtmlAudioPlayer.prototype.getVolume = function () {
var mediaElement = this._mediaElement;
getVolume() {
const mediaElement = this._mediaElement;
if (mediaElement) {
return Math.min(Math.round(mediaElement.volume * 100), 100);
}
};
}
HtmlAudioPlayer.prototype.volumeUp = function () {
volumeUp() {
this.setVolume(Math.min(this.getVolume() + 2, 100));
};
}
HtmlAudioPlayer.prototype.volumeDown = function () {
volumeDown() {
this.setVolume(Math.max(this.getVolume() - 2, 0));
};
}
HtmlAudioPlayer.prototype.setMute = function (mute) {
var mediaElement = this._mediaElement;
setMute(mute) {
const mediaElement = this._mediaElement;
if (mediaElement) {
mediaElement.muted = mute;
}
};
}
HtmlAudioPlayer.prototype.isMuted = function () {
var mediaElement = this._mediaElement;
isMuted() {
const mediaElement = this._mediaElement;
if (mediaElement) {
return mediaElement.muted;
}
return false;
};
}
HtmlAudioPlayer.prototype.destroy = function () {
destroy() {
}
};
supports(feature) {
if (!supportedFeatures) {
supportedFeatures = getSupportedFeatures();
}
var supportedFeatures;
return supportedFeatures.indexOf(feature) !== -1;
}
}
let supportedFeatures;
function getSupportedFeatures() {
var list = [];
var audio = document.createElement('audio');
const list = [];
const audio = document.createElement('audio');
if (typeof audio.playbackRate === 'number') {
list.push('PlaybackRate');
@ -502,13 +513,4 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
return list;
}
HtmlAudioPlayer.prototype.supports = function (feature) {
if (!supportedFeatures) {
supportedFeatures = getSupportedFeatures();
}
return supportedFeatures.indexOf(feature) !== -1;
};
return HtmlAudioPlayer;
});
export default HtmlAudioPlayer;