Merge branch 'main' into fix/add-api-prefix-to-manifesturl

This commit is contained in:
goodtube4u
2024-07-16 22:51:47 +10:00
committed by GitHub
2 changed files with 50 additions and 22 deletions

File diff suppressed because one or more lines are too long

View File

@@ -384,7 +384,6 @@
let goodTube_youtube_syncing = true;
let goodTube_youtube_previousSyncTime = 0;
function goodTube_youtube_syncPlayers() {
console.log('SYNC');
let youtubeVideo = document.querySelector('#movie_player video');
// If the youtube player exists, our player is loaded and we're viewing a video
@@ -1995,10 +1994,11 @@
manifestType = 'application/dash+xml';
}
// check if the manifestUrl starts with a slash, if so, add the api url
if (manifestUrl && manifestUrl[0] === '/') {
manifestUrl = goodTube_api_url + manifestUrl;
}
// Does the manifest URL start with a slash?
if (manifestUrl && manifestUrl[0] === '/') {
// If this happens, prepend the API url to make the link whole.
manifestUrl = goodTube_api_url+manifestUrl;
}
// Add the HLS or DASH source
goodTube_videojs_player.src({
@@ -2033,6 +2033,12 @@
manifestType = 'application/dash+xml';
}
// Does the manifest URL start with a slash?
if (manifestUrl && manifestUrl[0] === '/') {
// If this happens, prepend the API url to make the link whole.
manifestUrl = goodTube_api_url+manifestUrl;
}
// Add the HLS or DASH source
goodTube_videojs_player.src({
src: manifestUrl,
@@ -5219,18 +5225,25 @@
},
// FAST
{
'name': 'Sphynx (JP)',
'name': 'Hades (DE)',
'type': 3,
'proxy': true,
'url': 'https://pipedapi.dedyn.io'
},
// FAST
{
'name': 'Rain (DE)',
'type': 3,
'proxy': true,
'url': 'https://pipedapi.andreafortuna.org'
},
// FAST
{
'name': 'Serpent (US)',
'type': 2,
'proxy': true,
'url': 'https://invidious.jing.rocks'
'url': 'https://invidious.darkness.services'
},
// // FAST
// {
// 'name': 'Obsidian (AT)',
// 'type': 3,
// 'proxy': true,
// 'url': 'https://pipedapi.leptons.xyz'
// },
// FAST
{
'name': 'Acid (US)',
@@ -5239,6 +5252,21 @@
'url': 'https://invidious.incogniweb.net'
},
// FAST
{
'name': 'Sphynx (JP)',
'type': 2,
'proxy': true,
'url': 'https://invidious.jing.rocks'
},
// // FAST
// {
// 'name': 'Obsidian (AT)',
// 'type': 3,
// 'proxy': true,
// 'url': 'https://pipedapi.leptons.xyz'
// },
// FAST
{
'name': 'Sphere (US)',
'type': 3,
@@ -5308,13 +5336,13 @@
'proxy': true,
'url': 'https://iv.datura.network'
},
// // MEDIUM
// {
// 'name': 'Andromeda (FI)',
// 'type': 3,
// 'proxy': true,
// 'url': 'https://pipedapi-libre.kavin.rocks'
// },
// MEDIUM
{
'name': 'Andromeda (FI)',
'type': 3,
'proxy': true,
'url': 'https://pipedapi-libre.kavin.rocks'
},
// // MEDIUM
// {
// 'name': 'Lilith (INT)',