From f8a1db0e217538d075f39a23cb71308095d00be0 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Fri, 4 Apr 2025 02:09:18 +1300
Subject: [PATCH] Fix quality changes

---
 materialious/src/lib/components/Player.svelte | 51 +++++++++++++------
 .../src/lib/css/shaka-player-theme.css        | 13 ++---
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/materialious/src/lib/components/Player.svelte b/materialious/src/lib/components/Player.svelte
index 83ab9c47..3511fe8d 100644
--- a/materialious/src/lib/components/Player.svelte
+++ b/materialious/src/lib/components/Player.svelte
@@ -9,6 +9,7 @@
 	import { NavigationBar } from '@hugotomazi/capacitor-navigation-bar';
 	import { type Page } from '@sveltejs/kit';
 	import { GoogleVideo, Protos } from 'googlevideo';
+	import ISO6391 from 'iso-639-1';
 	import 'shaka-player/dist/controls.css';
 	import shaka from 'shaka-player/dist/shaka-player.ui';
 	import { SponsorBlock, type Category, type Segment } from 'sponsorblock-api';
@@ -77,10 +78,10 @@
 	function restorePreferences() {
 		const savedQuality =
 			localStorage.getItem(STORAGE_KEY_QUALITY) ??
-			(import.meta.env.VITE_DEFAULT_DASH_BITRATE as string);
+			(import.meta.env.VITE_DEFAULT_DASH_BITRATE as string | undefined);
 
 		if (savedQuality) {
-			const qualityBandwidth = parseInt(savedQuality, 10);
+			const qualityBandwidth = parseInt(savedQuality);
 			const tracks = player.getVariantTracks();
 
 			let preferredTrack = tracks.find((track) => track.bandwidth === qualityBandwidth);
@@ -94,7 +95,6 @@
 
 			if (preferredTrack) {
 				player.selectVariantTrack(preferredTrack, true);
-				player.configure({ abr: { enabled: false } });
 			}
 		}
 
@@ -136,9 +136,6 @@
 			playerElement
 		);
 
-		player.addEventListener('adaptation', () => setTimeout(saveQualityPreference, 10000));
-		playerElement.addEventListener('volumechange', saveVolumePreference);
-
 		shakaUi.configure({
 			controlPanelElements: [
 				'play_pause',
@@ -146,10 +143,22 @@
 				'spacer',
 				'chapter',
 				'time_and_duration',
+				'captions',
 				'overflow_menu',
 				'fullscreen'
 			],
-			overflowMenuButtons: ['cast', 'airplay', 'captions', 'quality', 'loop', 'language']
+			overflowMenuButtons: [
+				'cast',
+				'airplay',
+				'captions',
+				'quality',
+				'playback_rate',
+				'loop',
+				'language',
+				'save_video_frame',
+				'statistics'
+			],
+			enableTooltips: true
 		});
 
 		player.configure({
@@ -399,14 +408,6 @@
 
 			await loadPlayerPos();
 
-			const defaultLanguage = get(playerDefaultLanguage);
-			if (defaultLanguage) {
-				const audioLanguages = player.getAudioLanguages();
-				if (audioLanguages.includes(defaultLanguage)) {
-					player.selectAudioLanguage(defaultLanguage);
-				}
-			}
-
 			if (Capacitor.getPlatform() === 'android' && data.video.adaptiveFormats.length > 0) {
 				const videoFormats = data.video.adaptiveFormats.filter((format) =>
 					format.type.startsWith('video/')
@@ -463,7 +464,25 @@
 			ui('#snackbar-alert');
 		}
 
-		restorePreferences();
+		player.addEventListener('buffering', saveQualityPreference);
+		playerElement.addEventListener('volumechange', saveVolumePreference);
+
+		player.addEventListener('loaded', () => {
+			restorePreferences();
+
+			const defaultLanguage = get(playerDefaultLanguage);
+			if (defaultLanguage) {
+				const audioLanguages = player.getAudioLanguages();
+				const langCode = ISO6391.getCode(defaultLanguage);
+
+				for (const audioLanguage of audioLanguages) {
+					if (audioLanguage.startsWith(langCode)) {
+						player.selectAudioLanguage(audioLanguage);
+						break;
+					}
+				}
+			}
+		});
 
 		const overflowMenuButton = document.querySelector('.shaka-overflow-menu-button');
 		if (overflowMenuButton) {
diff --git a/materialious/src/lib/css/shaka-player-theme.css b/materialious/src/lib/css/shaka-player-theme.css
index 8eb6d9ce..a2194644 100644
--- a/materialious/src/lib/css/shaka-player-theme.css
+++ b/materialious/src/lib/css/shaka-player-theme.css
@@ -25,11 +25,6 @@
   order: 1;
 }
 
-.youtube-theme > .shaka-controls-container button {
-  width: 60px;
-  height: 50px;
-}
-
 .youtube-theme .shaka-controls-button-panel {
   -webkit-box-ordinal-group: 3;
   -ms-flex-order: 2;
@@ -58,8 +53,9 @@
 .youtube-theme .shaka-controls-button-panel>* {
   margin: 0;
   padding: 3px 8px;
-  color: var(--white-text);
-  height: 50px;
+  color: #fff;
+  height: 40px;
+  font-size: 2em;
 }
 
 .youtube-theme .shaka-controls-button-panel>*:hover {
@@ -84,7 +80,6 @@
 .youtube-theme .shaka-controls-button-panel .shaka-volume-bar-container:hover,
 .youtube-theme .shaka-controls-button-panel .shaka-volume-bar-container:focus {
   display: block;
-  width: 50px;
   opacity: 1;
   padding: 0 6px;
 }
@@ -303,4 +298,4 @@
   font-size: 25px;
   -webkit-transition: font-size 0.1s cubic-bezier(0, 0, 0.2, 1);
   transition: font-size 0.1s cubic-bezier(0, 0, 0.2, 1);
-}
+}
\ No newline at end of file