From fcf6964d7dc3d911c51ae3d492f8752b3d3726c7 Mon Sep 17 00:00:00 2001 From: fidoriel <49869342+fidoriel@users.noreply.github.com> Date: Sun, 19 Mar 2023 21:41:49 +0000 Subject: [PATCH 1/5] hlsurl --- client/players/LocalAudioPlayer.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/client/players/LocalAudioPlayer.js b/client/players/LocalAudioPlayer.js index 87b3c1d7..77dbb474 100644 --- a/client/players/LocalAudioPlayer.js +++ b/client/players/LocalAudioPlayer.js @@ -28,6 +28,11 @@ export default class LocalAudioPlayer extends EventEmitter { return this.audioTracks[this.currentTrackIndex] || {} } + get hslContentUrl() { + // the hls stream playlist is the same for all tracks + return this.audioTracks[0].relativeContentUrl + } + initialize() { if (document.getElementById('audio-player')) { document.getElementById('audio-player').remove() @@ -132,7 +137,7 @@ export default class LocalAudioPlayer extends EventEmitter { if (!Hls.isSupported()) { console.warn('HLS is not supported - fallback to using audio element') this.usingNativeplayer = true - this.player.src = this.currentTrack.relativeContentUrl + this.player.src = this.hslContentUrl this.player.currentTime = this.startTime return } @@ -148,7 +153,7 @@ export default class LocalAudioPlayer extends EventEmitter { this.hlsInstance.attachMedia(this.player) this.hlsInstance.on(Hls.Events.MEDIA_ATTACHED, () => { - this.hlsInstance.loadSource(this.currentTrack.relativeContentUrl) + this.hlsInstance.loadSource(this.hslContentUrl) this.hlsInstance.on(Hls.Events.MANIFEST_PARSED, () => { console.log('[HLS] Manifest Parsed') From e81238038e7a6514d37567ab8ee1cb69ed5ea9fa Mon Sep 17 00:00:00 2001 From: fidoriel <49869342+fidoriel@users.noreply.github.com> Date: Sun, 19 Mar 2023 22:26:36 +0000 Subject: [PATCH 2/5] m3u8url --- client/players/LocalAudioPlayer.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/client/players/LocalAudioPlayer.js b/client/players/LocalAudioPlayer.js index 77dbb474..5a76bc5b 100644 --- a/client/players/LocalAudioPlayer.js +++ b/client/players/LocalAudioPlayer.js @@ -28,11 +28,6 @@ export default class LocalAudioPlayer extends EventEmitter { return this.audioTracks[this.currentTrackIndex] || {} } - get hslContentUrl() { - // the hls stream playlist is the same for all tracks - return this.audioTracks[0].relativeContentUrl - } - initialize() { if (document.getElementById('audio-player')) { document.getElementById('audio-player').remove() @@ -132,12 +127,13 @@ export default class LocalAudioPlayer extends EventEmitter { setHlsStream() { this.trackStartTime = 0 + let m3u8Url = this.audioTracks[0].relativeContentUrl // iOS does not support Media Elements but allows for HLS in the native audio player if (!Hls.isSupported()) { console.warn('HLS is not supported - fallback to using audio element') this.usingNativeplayer = true - this.player.src = this.hslContentUrl + this.player.src = m3u8Url this.player.currentTime = this.startTime return } @@ -153,7 +149,7 @@ export default class LocalAudioPlayer extends EventEmitter { this.hlsInstance.attachMedia(this.player) this.hlsInstance.on(Hls.Events.MEDIA_ATTACHED, () => { - this.hlsInstance.loadSource(this.hslContentUrl) + this.hlsInstance.loadSource(m3u8Url) this.hlsInstance.on(Hls.Events.MANIFEST_PARSED, () => { console.log('[HLS] Manifest Parsed') From b283644d95978571b6f4658b28bc64949c2a18a2 Mon Sep 17 00:00:00 2001 From: advplyr <67830747+advplyr@users.noreply.github.com> Date: Mon, 20 Mar 2023 15:48:31 -0500 Subject: [PATCH 3/5] Update client/players/LocalAudioPlayer.js --- client/players/LocalAudioPlayer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/players/LocalAudioPlayer.js b/client/players/LocalAudioPlayer.js index 5a76bc5b..abe573f7 100644 --- a/client/players/LocalAudioPlayer.js +++ b/client/players/LocalAudioPlayer.js @@ -127,7 +127,7 @@ export default class LocalAudioPlayer extends EventEmitter { setHlsStream() { this.trackStartTime = 0 - let m3u8Url = this.audioTracks[0].relativeContentUrl + this.currentTrackIndex = 0 // iOS does not support Media Elements but allows for HLS in the native audio player if (!Hls.isSupported()) { From 596a03900be526ba526c0c2a9427bfa630b0170d Mon Sep 17 00:00:00 2001 From: advplyr <67830747+advplyr@users.noreply.github.com> Date: Mon, 20 Mar 2023 15:48:36 -0500 Subject: [PATCH 4/5] Update client/players/LocalAudioPlayer.js --- client/players/LocalAudioPlayer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/players/LocalAudioPlayer.js b/client/players/LocalAudioPlayer.js index abe573f7..b228dbb4 100644 --- a/client/players/LocalAudioPlayer.js +++ b/client/players/LocalAudioPlayer.js @@ -133,7 +133,7 @@ export default class LocalAudioPlayer extends EventEmitter { if (!Hls.isSupported()) { console.warn('HLS is not supported - fallback to using audio element') this.usingNativeplayer = true - this.player.src = m3u8Url + this.player.src = this.currentTrack.relativeContentUrl this.player.currentTime = this.startTime return } From 7b425e9a9de57dc1d0c6360432df48b804923389 Mon Sep 17 00:00:00 2001 From: advplyr <67830747+advplyr@users.noreply.github.com> Date: Mon, 20 Mar 2023 15:48:42 -0500 Subject: [PATCH 5/5] Update client/players/LocalAudioPlayer.js --- client/players/LocalAudioPlayer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/players/LocalAudioPlayer.js b/client/players/LocalAudioPlayer.js index b228dbb4..587a52c0 100644 --- a/client/players/LocalAudioPlayer.js +++ b/client/players/LocalAudioPlayer.js @@ -149,7 +149,7 @@ export default class LocalAudioPlayer extends EventEmitter { this.hlsInstance.attachMedia(this.player) this.hlsInstance.on(Hls.Events.MEDIA_ATTACHED, () => { - this.hlsInstance.loadSource(m3u8Url) + this.hlsInstance.loadSource(this.currentTrack.relativeContentUrl) this.hlsInstance.on(Hls.Events.MANIFEST_PARSED, () => { console.log('[HLS] Manifest Parsed')