1 files changed, 19 insertions, 13 deletions

diff --git a/youtube/static/js/watch.hls.js b/youtube/static/js/watch.hls.js
index cedfbf3..a924fdb 100644
--- a/youtube/static/js/watch.hls.js
+++ b/youtube/static/js/watch.hls.js
@@ -149,17 +149,11 @@ document.addEventListener('DOMContentLoaded', function() {
 
     if (audioTrackSelect) {
         audioTrackSelect.addEventListener('change', function() {
-            const trackId = this.value;
+            const trackIdx = parseInt(this.value);
 
-            if (hls && hls.audioTracks) {
-                const index = hls.audioTracks.findIndex(t =>
-                    t.lang === trackId || t.name === trackId
-                );
-
-                if (index !== -1) {
-                    hls.audioTrack = index;
-                    console.log('Audio track changed to:', index);
-                }
+            if (!isNaN(trackIdx) && hls && hls.audioTracks && trackIdx >= 0 && trackIdx < hls.audioTracks.length) {
+                hls.audioTrack = trackIdx;
+                console.log('Audio track changed to:', hls.audioTracks[trackIdx].name || trackIdx);
             }
         });
     }
@@ -171,13 +165,25 @@ document.addEventListener('DOMContentLoaded', function() {
             // Populate audio track select if needed
             if (audioTrackSelect && data.audioTracks.length > 0) {
                 audioTrackSelect.innerHTML = '<option value="">Select audio track</option>';
-                data.audioTracks.forEach(track => {
+                let originalIdx = -1;
+                data.audioTracks.forEach((track, idx) => {
+                    // Find "original" track
+                    if (originalIdx === -1 && (track.name || '').toLowerCase().includes('original')) {
+                        originalIdx = idx;
+                    }
                     const option = document.createElement('option');
-                    option.value = track.lang || track.name;
-                    option.textContent = track.name || track.lang || `Track ${track.id}`;
+                    option.value = String(idx);
+                    option.textContent = track.name || track.lang || `Track ${idx}`;
                     audioTrackSelect.appendChild(option);
                 });
                 audioTrackSelect.disabled = false;
+
+                // Auto-select "original" audio track
+                if (originalIdx !== -1) {
+                    hls.audioTrack = originalIdx;
+                    audioTrackSelect.value = String(originalIdx);
+                    console.log('Auto-selected original audio track:', data.audioTracks[originalIdx].name);
+                }
             }
         });
     }