stremiok 2.4.1 → 2.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/js/lang/ko.js CHANGED
@@ -135,6 +135,7 @@ I18N.add("ko", {
135
135
  "After 15 seconds": "15초 후",
136
136
  "After 30 seconds": "30초 후",
137
137
  "After 5 seconds": "5초 후",
138
+ "After a jump (more than 5)": "점프 후(5개 초과)",
138
139
  "Aired {when}": "{when} 방영",
139
140
  "Airs {when}": "{when} 방영 예정",
140
141
  "Albanian": "알바니아어",
@@ -151,6 +152,7 @@ I18N.add("ko", {
151
152
  "Already straight from the server": "이미 서버에서 직접 받는 중",
152
153
  "Also show {n} hidden (system) app": "숨겨진 (시스템) 앱 {n}개도 표시",
153
154
  "Also show {n} hidden (system) apps": "숨겨진 (시스템) 앱 {n}개도 표시",
155
+ "Always": "항상",
154
156
  "Always “{name}”": "항상 “{name}”",
155
157
  "Amber": "호박색",
156
158
  "An XMLTV guide (.xml or .xml.gz), then Confirm. Empty uses the playlist’s own (the one it names, or an Xtream playlist’s). RETURN cancels.": "XMLTV 편성표(.xml 또는 .xml.gz)를 입력하고 확인을 누르세요. 비워 두면 재생목록 자체의 편성표(재생목록이 지정한 것 또는 Xtream 재생목록의 것)를 사용합니다. RETURN은 취소.",
@@ -708,6 +710,7 @@ I18N.add("ko", {
708
710
  "Latvia": "라트비아",
709
711
  "Latvian": "라트비아어",
710
712
  "Launch before: {steps}": "실행 전: {steps}",
713
+ "Leave out other subtitle tracks": "다른 자막 트랙 제외",
711
714
  "Left out (torrents, links it can’t open): direct links only; where-to-watch apps stay": "제외(토렌트, 열 수 없는 링크): 직접 링크만, 시청 가능 앱은 유지",
712
715
  "Let them go (not sent to Trakt)": "보내지 않음(Trakt에 전송 안 함)",
713
716
  "Light": "밝게",
@@ -798,6 +801,7 @@ I18N.add("ko", {
798
801
  "Montenegrin": "몬테네그로어",
799
802
  "More": "더 보기",
800
803
  "More like this": "비슷한 콘텐츠",
804
+ "More than 5 subtitle tracks": "자막 트랙이 5개 초과",
801
805
  "Most": "최대",
802
806
  "Most per hour": "시간당 최대",
803
807
  "Most recent first": "최근 항목 먼저",
@@ -817,6 +821,7 @@ I18N.add("ko", {
817
821
  "Network folder: password": "네트워크 폴더: 비밀번호",
818
822
  "Network folder: user name": "네트워크 폴더: 사용자 이름",
819
823
  "Network folders": "네트워크 폴더",
824
+ "Never": "안 함",
820
825
  "New Zealand": "뉴질랜드",
821
826
  "New episode: {code}": "새 에피소드: {code}",
822
827
  "New episode: {list}": "새 에피소드: {list}",
@@ -1544,6 +1549,7 @@ I18N.add("ko", {
1544
1549
  "This stream’s qualities couldn’t be read: it plays on Auto": "이 스트림의 화질을 읽을 수 없어 자동으로 재생됩니다",
1545
1550
  "Thriller": "스릴러",
1546
1551
  "Through StremioK’s service: the sound repacked": "StremioK 서비스 경유: 소리 재포장",
1552
+ "Through StremioK’s service: {n} subtitle tracks left out": "StremioK 서비스 경유: 자막 트랙 {n}개 제외",
1547
1553
  "Through YouTube’s service (on the TV)": "YouTube 서비스 경유(TV에서)",
1548
1554
  "Thu": "목",
1549
1555
  "Tick what to export": "내보낼 항목을 선택하세요",
package/js/lang/pl.js CHANGED
@@ -135,6 +135,7 @@ I18N.add("pl", {
135
135
  "After 15 seconds": "Po 15 sekundach",
136
136
  "After 30 seconds": "Po 30 sekundach",
137
137
  "After 5 seconds": "Po 5 sekundach",
138
+ "After a jump (more than 5)": "Po przeskoku (więcej niż 5)",
138
139
  "Aired {when}": "Wyemitowano {when}",
139
140
  "Airs {when}": "Emisja {when}",
140
141
  "Albanian": "Albański",
@@ -151,6 +152,7 @@ I18N.add("pl", {
151
152
  "Already straight from the server": "Już bezpośrednio z serwera",
152
153
  "Also show {n} hidden (system) app": "Pokaż też {n} ukrytą aplikację (systemową)",
153
154
  "Also show {n} hidden (system) apps": { "few": "Pokaż też {n} ukryte aplikacje (systemowe)", "many": "Pokaż też {n} ukrytych aplikacji (systemowych)" },
155
+ "Always": "Zawsze",
154
156
  "Always “{name}”": "Zawsze „{name}”",
155
157
  "Amber": "Bursztynowy",
156
158
  "An XMLTV guide (.xml or .xml.gz), then Confirm. Empty uses the playlist’s own (the one it names, or an Xtream playlist’s). RETURN cancels.": "Program XMLTV (.xml lub .xml.gz), potem Potwierdź. Puste pole używa programu playlisty (wskazanego w niej lub z playlisty Xtream). WSTECZ anuluje.",
@@ -708,6 +710,7 @@ I18N.add("pl", {
708
710
  "Latvia": "Łotwa",
709
711
  "Latvian": "Łotewski",
710
712
  "Launch before: {steps}": "Uruchom wcześniej: {steps}",
713
+ "Leave out other subtitle tracks": "Pomijaj inne ścieżki napisów",
711
714
  "Left out (torrents, links it can’t open): direct links only; where-to-watch apps stay": "Pominięte (torrenty, linki, których nie otworzy): tylko linki bezpośrednie; aplikacje „gdzie obejrzeć” zostają",
712
715
  "Let them go (not sent to Trakt)": "Odpuść (nie wysyłane do Trakt)",
713
716
  "Light": "Jasny",
@@ -798,6 +801,7 @@ I18N.add("pl", {
798
801
  "Montenegrin": "Czarnogórski",
799
802
  "More": "Więcej",
800
803
  "More like this": "Podobne",
804
+ "More than 5 subtitle tracks": "Więcej niż 5 ścieżek napisów",
801
805
  "Most": "Maksymalnie",
802
806
  "Most per hour": "Maksymalnie na godzinę",
803
807
  "Most recent first": "Najnowsze najpierw",
@@ -817,6 +821,7 @@ I18N.add("pl", {
817
821
  "Network folder: password": "Folder sieciowy: hasło",
818
822
  "Network folder: user name": "Folder sieciowy: nazwa użytkownika",
819
823
  "Network folders": "Foldery sieciowe",
824
+ "Never": "Nigdy",
820
825
  "New Zealand": "Nowa Zelandia",
821
826
  "New episode: {code}": "Nowy odcinek: {code}",
822
827
  "New episode: {list}": "Nowy odcinek: {list}",
@@ -1544,6 +1549,7 @@ I18N.add("pl", {
1544
1549
  "This stream’s qualities couldn’t be read: it plays on Auto": "Nie udało się odczytać jakości tego strumienia: odtwarzanie w trybie Auto",
1545
1550
  "Thriller": "Thriller",
1546
1551
  "Through StremioK’s service: the sound repacked": "Przez usługę StremioK: dźwięk przepakowany",
1552
+ "Through StremioK’s service: {n} subtitle tracks left out": "Przez usługę StremioK: pominięto ścieżki napisów: {n}",
1547
1553
  "Through YouTube’s service (on the TV)": "Przez usługę YouTube (na telewizorze)",
1548
1554
  "Thu": "czw.",
1549
1555
  "Tick what to export": "Zaznacz, co wyeksportować",
package/js/lang/pt-BR.js CHANGED
@@ -135,6 +135,7 @@ I18N.add("pt-BR", {
135
135
  "After 15 seconds": "Após 15 segundos",
136
136
  "After 30 seconds": "Após 30 segundos",
137
137
  "After 5 seconds": "Após 5 segundos",
138
+ "After a jump (more than 5)": "Depois de um salto (mais de 5)",
138
139
  "Aired {when}": "Exibido {when}",
139
140
  "Airs {when}": "Estreia {when}",
140
141
  "Albanian": "Albanês",
@@ -151,6 +152,7 @@ I18N.add("pt-BR", {
151
152
  "Already straight from the server": "Já direto do servidor",
152
153
  "Also show {n} hidden (system) app": "Mostrar também {n} app oculto (do sistema)",
153
154
  "Also show {n} hidden (system) apps": "Mostrar também {n} apps ocultos (do sistema)",
155
+ "Always": "Sempre",
154
156
  "Always “{name}”": "Sempre “{name}”",
155
157
  "Amber": "Âmbar",
156
158
  "An XMLTV guide (.xml or .xml.gz), then Confirm. Empty uses the playlist’s own (the one it names, or an Xtream playlist’s). RETURN cancels.": "Um guia XMLTV (.xml ou .xml.gz) e depois Confirmar. Vazio usa o da própria lista (o que ela indica, ou o de uma lista Xtream). RETURN cancela.",
@@ -708,6 +710,7 @@ I18N.add("pt-BR", {
708
710
  "Latvia": "Letônia",
709
711
  "Latvian": "Letão",
710
712
  "Launch before: {steps}": "Início anterior: {steps}",
713
+ "Leave out other subtitle tracks": "Deixar de fora as outras faixas de legendas",
711
714
  "Left out (torrents, links it can’t open): direct links only; where-to-watch apps stay": "Deixadas de fora (torrents, links que ela não abre): só links diretos; os apps de onde assistir ficam",
712
715
  "Let them go (not sent to Trakt)": "Deixar para lá (não enviar ao Trakt)",
713
716
  "Light": "Claro",
@@ -798,6 +801,7 @@ I18N.add("pt-BR", {
798
801
  "Montenegrin": "Montenegrino",
799
802
  "More": "Mais",
800
803
  "More like this": "Parecidos",
804
+ "More than 5 subtitle tracks": "Mais de 5 faixas de legendas",
801
805
  "Most": "Máximo",
802
806
  "Most per hour": "Máximo por hora",
803
807
  "Most recent first": "Mais recentes primeiro",
@@ -817,6 +821,7 @@ I18N.add("pt-BR", {
817
821
  "Network folder: password": "Pasta de rede: senha",
818
822
  "Network folder: user name": "Pasta de rede: usuário",
819
823
  "Network folders": "Pastas de rede",
824
+ "Never": "Nunca",
820
825
  "New Zealand": "Nova Zelândia",
821
826
  "New episode: {code}": "Episódio novo: {code}",
822
827
  "New episode: {list}": "Episódio novo: {list}",
@@ -1544,6 +1549,7 @@ I18N.add("pt-BR", {
1544
1549
  "This stream’s qualities couldn’t be read: it plays on Auto": "Não deu para ler as qualidades deste stream: toca no Automático",
1545
1550
  "Thriller": "Suspense",
1546
1551
  "Through StremioK’s service: the sound repacked": "Pelo serviço do StremioK: som reempacotado",
1552
+ "Through StremioK’s service: {n} subtitle tracks left out": "Pelo serviço do StremioK: {n} faixas de legendas deixadas de fora",
1547
1553
  "Through YouTube’s service (on the TV)": "Pelo serviço do YouTube (na TV)",
1548
1554
  "Thu": "qui",
1549
1555
  "Tick what to export": "Marque o que exportar",
package/js/lang/ru.js CHANGED
@@ -135,6 +135,7 @@ I18N.add("ru", {
135
135
  "After 15 seconds": "Через 15 секунд",
136
136
  "After 30 seconds": "Через 30 секунд",
137
137
  "After 5 seconds": "Через 5 секунд",
138
+ "After a jump (more than 5)": "После перехода (больше 5)",
138
139
  "Aired {when}": "Вышло {when}",
139
140
  "Airs {when}": "Выходит {when}",
140
141
  "Albanian": "Албанский",
@@ -151,6 +152,7 @@ I18N.add("ru", {
151
152
  "Already straight from the server": "Уже напрямую с сервера",
152
153
  "Also show {n} hidden (system) app": "Показать также {n} скрытое (системное) приложение",
153
154
  "Also show {n} hidden (system) apps": { "few": "Показать также {n} скрытых (системных) приложения", "many": "Показать также {n} скрытых (системных) приложений" },
155
+ "Always": "Всегда",
154
156
  "Always “{name}”": "Всегда «{name}»",
155
157
  "Amber": "Янтарный",
156
158
  "An XMLTV guide (.xml or .xml.gz), then Confirm. Empty uses the playlist’s own (the one it names, or an Xtream playlist’s). RETURN cancels.": "Телегид XMLTV (.xml или .xml.gz), затем «Подтвердить». Пустое поле — телегид самого плейлиста (указанный в нём или от плейлиста Xtream). RETURN — отмена.",
@@ -708,6 +710,7 @@ I18N.add("ru", {
708
710
  "Latvia": "Латвия",
709
711
  "Latvian": "Латышский",
710
712
  "Launch before: {steps}": "Предыдущий запуск: {steps}",
713
+ "Leave out other subtitle tracks": "Исключать другие дорожки субтитров",
711
714
  "Left out (torrents, links it can’t open): direct links only; where-to-watch apps stay": "Исключены (торренты, ссылки, которые он не может открыть): только прямые ссылки; приложения «Где смотреть» остаются",
712
715
  "Let them go (not sent to Trakt)": "Пропустить (не отправлять в Trakt)",
713
716
  "Light": "Светлая",
@@ -798,6 +801,7 @@ I18N.add("ru", {
798
801
  "Montenegrin": "Черногорский",
799
802
  "More": "Ещё",
800
803
  "More like this": "Похожие",
804
+ "More than 5 subtitle tracks": "Больше 5 дорожек субтитров",
801
805
  "Most": "Максимум",
802
806
  "Most per hour": "Максимум в час",
803
807
  "Most recent first": "Сначала последние",
@@ -817,6 +821,7 @@ I18N.add("ru", {
817
821
  "Network folder: password": "Сетевая папка: пароль",
818
822
  "Network folder: user name": "Сетевая папка: имя пользователя",
819
823
  "Network folders": "Сетевые папки",
824
+ "Never": "Никогда",
820
825
  "New Zealand": "Новая Зеландия",
821
826
  "New episode: {code}": "Новый эпизод: {code}",
822
827
  "New episode: {list}": "Новый эпизод: {list}",
@@ -1544,6 +1549,7 @@ I18N.add("ru", {
1544
1549
  "This stream’s qualities couldn’t be read: it plays on Auto": "Не удалось прочитать качества потока: воспроизводится в режиме «Авто»",
1545
1550
  "Thriller": "Триллер",
1546
1551
  "Through StremioK’s service: the sound repacked": "Через сервис StremioK: звук перепакован",
1552
+ "Through StremioK’s service: {n} subtitle tracks left out": "Через сервис StremioK: исключено дорожек субтитров: {n}",
1547
1553
  "Through YouTube’s service (on the TV)": "Через YouTube-сервис (на телевизоре)",
1548
1554
  "Thu": "чт",
1549
1555
  "Tick what to export": "Отметьте, что экспортировать",
package/js/lang/tr.js CHANGED
@@ -135,6 +135,7 @@ I18N.add("tr", {
135
135
  "After 15 seconds": "15 saniye sonra",
136
136
  "After 30 seconds": "30 saniye sonra",
137
137
  "After 5 seconds": "5 saniye sonra",
138
+ "After a jump (more than 5)": "Bir atlamadan sonra (5’ten fazla)",
138
139
  "Aired {when}": "Yayınlandı: {when}",
139
140
  "Airs {when}": "Yayın: {when}",
140
141
  "Albanian": "Arnavutça",
@@ -151,6 +152,7 @@ I18N.add("tr", {
151
152
  "Already straight from the server": "Zaten doğrudan sunucudan",
152
153
  "Also show {n} hidden (system) app": "{n} gizli (sistem) uygulamasını da göster",
153
154
  "Also show {n} hidden (system) apps": "{n} gizli (sistem) uygulamasını da göster",
155
+ "Always": "Her zaman",
154
156
  "Always “{name}”": "Her zaman “{name}”",
155
157
  "Amber": "Kehribar",
156
158
  "An XMLTV guide (.xml or .xml.gz), then Confirm. Empty uses the playlist’s own (the one it names, or an Xtream playlist’s). RETURN cancels.": "Bir XMLTV rehberi (.xml veya .xml.gz), ardından Onayla. Boş bırakılırsa listenin kendi rehberi kullanılır (belirttiği veya Xtream listesininki). RETURN iptal eder.",
@@ -708,6 +710,7 @@ I18N.add("tr", {
708
710
  "Latvia": "Letonya",
709
711
  "Latvian": "Letonca",
710
712
  "Launch before: {steps}": "Önce başlat: {steps}",
713
+ "Leave out other subtitle tracks": "Diğer altyazı parçalarını dışarıda bırak",
711
714
  "Left out (torrents, links it can’t open): direct links only; where-to-watch apps stay": "Dışarıda bırakılır (torrentler, açamadığı bağlantılar): yalnızca doğrudan bağlantılar; nerede izlenir uygulamaları kalır",
712
715
  "Let them go (not sent to Trakt)": "Bırak gitsin (Trakt’a gönderilmez)",
713
716
  "Light": "Açık",
@@ -798,6 +801,7 @@ I18N.add("tr", {
798
801
  "Montenegrin": "Karadağca",
799
802
  "More": "Daha fazla",
800
803
  "More like this": "Benzerleri",
804
+ "More than 5 subtitle tracks": "5’ten fazla altyazı parçası",
801
805
  "Most": "En çok",
802
806
  "Most per hour": "Saatte en çok",
803
807
  "Most recent first": "En yeniler önce",
@@ -817,6 +821,7 @@ I18N.add("tr", {
817
821
  "Network folder: password": "Ağ klasörü: şifre",
818
822
  "Network folder: user name": "Ağ klasörü: kullanıcı adı",
819
823
  "Network folders": "Ağ klasörleri",
824
+ "Never": "Asla",
820
825
  "New Zealand": "Yeni Zelanda",
821
826
  "New episode: {code}": "Yeni bölüm: {code}",
822
827
  "New episode: {list}": "Yeni bölüm: {list}",
@@ -1544,6 +1549,7 @@ I18N.add("tr", {
1544
1549
  "This stream’s qualities couldn’t be read: it plays on Auto": "Bu yayının kaliteleri okunamadı: Otomatik oynatılıyor",
1545
1550
  "Thriller": "Gerilim",
1546
1551
  "Through StremioK’s service: the sound repacked": "StremioK hizmeti üzerinden: ses yeniden paketlendi",
1552
+ "Through StremioK’s service: {n} subtitle tracks left out": "StremioK hizmeti üzerinden: {n} altyazı parçası dışarıda bırakıldı",
1547
1553
  "Through YouTube’s service (on the TV)": "YouTube hizmeti üzerinden (TV’de)",
1548
1554
  "Thu": "Per",
1549
1555
  "Tick what to export": "Dışa aktarılacakları işaretleyin",
package/js/lang/zh-CN.js CHANGED
@@ -135,6 +135,7 @@ I18N.add("zh-CN", {
135
135
  "After 15 seconds": "15 秒后",
136
136
  "After 30 seconds": "30 秒后",
137
137
  "After 5 seconds": "5 秒后",
138
+ "After a jump (more than 5)": "跳转之后(多于 5 条)",
138
139
  "Aired {when}": "{when}播出",
139
140
  "Airs {when}": "{when}播出",
140
141
  "Albanian": "阿尔巴尼亚语",
@@ -151,6 +152,7 @@ I18N.add("zh-CN", {
151
152
  "Already straight from the server": "已直接来自服务器",
152
153
  "Also show {n} hidden (system) app": "同时显示 {n} 个隐藏(系统)应用",
153
154
  "Also show {n} hidden (system) apps": "同时显示 {n} 个隐藏(系统)应用",
155
+ "Always": "始终",
154
156
  "Always “{name}”": "始终“{name}”",
155
157
  "Amber": "琥珀色",
156
158
  "An XMLTV guide (.xml or .xml.gz), then Confirm. Empty uses the playlist’s own (the one it names, or an Xtream playlist’s). RETURN cancels.": "输入 XMLTV 节目单(.xml 或 .xml.gz),然后确认。留空则使用播放列表自带的节目单(其指定的节目单,或 Xtream 播放列表的节目单)。按 RETURN 取消。",
@@ -708,6 +710,7 @@ I18N.add("zh-CN", {
708
710
  "Latvia": "拉脱维亚",
709
711
  "Latvian": "拉脱维亚语",
710
712
  "Launch before: {steps}": "上次启动:{steps}",
713
+ "Leave out other subtitle tracks": "略去其他字幕轨道",
711
714
  "Left out (torrents, links it can’t open): direct links only; where-to-watch apps stay": "不显示(种子、无法打开的链接):仅显示直链;观看渠道应用保留",
712
715
  "Let them go (not sent to Trakt)": "放弃(不发送到 Trakt)",
713
716
  "Light": "浅色",
@@ -798,6 +801,7 @@ I18N.add("zh-CN", {
798
801
  "Montenegrin": "黑山语",
799
802
  "More": "更多",
800
803
  "More like this": "相似内容",
804
+ "More than 5 subtitle tracks": "字幕轨道多于 5 条时",
801
805
  "Most": "最多",
802
806
  "Most per hour": "每小时最多",
803
807
  "Most recent first": "最近的在前",
@@ -817,6 +821,7 @@ I18N.add("zh-CN", {
817
821
  "Network folder: password": "网络文件夹:密码",
818
822
  "Network folder: user name": "网络文件夹:用户名",
819
823
  "Network folders": "网络文件夹",
824
+ "Never": "从不",
820
825
  "New Zealand": "新西兰",
821
826
  "New episode: {code}": "新一集:{code}",
822
827
  "New episode: {list}": "新一集:{list}",
@@ -1544,6 +1549,7 @@ I18N.add("zh-CN", {
1544
1549
  "This stream’s qualities couldn’t be read: it plays on Auto": "无法读取此视频流的画质:将以自动画质播放",
1545
1550
  "Thriller": "惊悚",
1546
1551
  "Through StremioK’s service: the sound repacked": "经由 StremioK 服务:重新封装声音",
1552
+ "Through StremioK’s service: {n} subtitle tracks left out": "经由 StremioK 服务:已略去 {n} 条字幕轨道",
1547
1553
  "Through YouTube’s service (on the TV)": "经由 YouTube 服务(在电视上)",
1548
1554
  "Thu": "周四",
1549
1555
  "Tick what to export": "勾选要导出的内容",
@@ -911,12 +911,15 @@
911
911
  lines.push([U.t('In the file'), parts.filter(Boolean).join(' · ')]);
912
912
  if (v && v.dv) { lines.push([U.t('Dolby Vision'), dvNote(v.dv)]); }
913
913
  if (mi.audio && mi.audio.length) { lines.push([U.t('Audio tracks'), trackList(mi.audio)]); }
914
- if (mi.subs && mi.subs.length) { lines.push([U.t('Subtitle tracks'), trackList(mi.subs)]); }
914
+ var subs = mi.subs || [], bl = S.ctx && S.ctx._relay && S.ctx._blank;
915
+ if (bl) { subs = subs.filter(function (t, i) { return bl.indexOf(i) !== -1; }); } // (the others left out: "Plays" says how many)
916
+ if (subs.length) { lines.push([U.t('Subtitle tracks'), trackList(subs)]); }
915
917
  }
916
918
  // How it reaches the player (no link): straight from its server, or through StremioK's service.
917
919
  function howItPlays() {
918
920
  var c = S.ctx;
919
921
  if (c.yt) { return U.t('Through YouTube’s service (on the TV)'); }
922
+ if (c._relay && c._blank) { return U.t('Through StremioK’s service: {n} subtitle tracks left out', { n: c._blankOf - c._blank.length }); }
920
923
  if (c._relay) { return U.t('Through StremioK’s service: the sound repacked'); }
921
924
  if (c.localFile && c.localFile.dav) { return U.t('From your network folder'); }
922
925
  if (c.localFile) { return /^http:\/\/localhost/.test(typeof LocalMedia !== 'undefined' && LocalMedia.openUrl ? LocalMedia.openUrl(c.url, c.localFile.size) : '') ? U.t('From the USB drive, through StremioK’s service (over 2 GB)') : U.t('From the USB drive'); }
package/js/player-core.js CHANGED
@@ -435,12 +435,13 @@ var PlayerParts = {};
435
435
  // S.mi: the answer for what's playing, else null (not asked yet, not read, or not a file:
436
436
  // HLS, DASH, YouTube, a live channel, a trailer).
437
437
  var MI_KEEP = 40, _miSeen = U.lru(MI_KEEP), _miLook = null;
438
- function fileInfoAsk(ctx) {
438
+ function fileInfoAsk(ctx, force) {
439
439
  if (!ctx || ctx.yt || ctx.trailer || S.isLive) { return null; }
440
440
  // (Settings › Playback › Seeking & buffering › Read the file's details: a USB drive's only
441
- // unless All files — the others are more requests to their server as playback starts)
441
+ // unless All files — the others are more requests to their server as playback starts;
442
+ // force: asked whatever it says, for a jump in an MKV, see blankFirst)
442
443
  var want = P.playerCfg().fileInfo;
443
- if (want === 'off' || (want !== 'all' && !(ctx.localFile && !ctx.localFile.dav))) { return null; }
444
+ if (!force && (want === 'off' || (want !== 'all' && !(ctx.localFile && !ctx.localFile.dav)))) { return null; }
444
445
  var url = '' + (ctx.url || ''), size = ctx.stream && ctx.stream.behaviorHints ? +ctx.stream.behaviorHints.videoSize || 0 : 0;
445
446
  if (ctx.localFile) {
446
447
  if (typeof LocalMedia === 'undefined' || !LocalMedia.fileInfo) { return null; }
@@ -531,10 +532,12 @@ var PlayerParts = {};
531
532
 
532
533
  engineFor(ctx); // (the TV's player, or a ClearKey channel's own: see startShaka)
533
534
  // (a TorrServer torrent that doesn't say which of its files: its file list asked for first)
534
- var go = function () {
535
+ var go = function () { blankBefore(ctx, function () {
536
+ var bj = !ctx._blank && fileInfoAsk(ctx, true), bmi = bj && _miSeen.get(bj.key); // (its tracks known: see blankFits)
537
+ if (bmi && blankFits(ctx, bmi)) { setBlank(ctx, bmi); }
535
538
  if (fileViaService(ctx)) { startFileRelay(ctx, settle); return; }
536
539
  if (useAV) { startLive(ctx, settle); } else { startHTML5(ctx.url); }
537
- };
540
+ }); };
538
541
  // (a network folder's file that plays through the service — Digest sign-in: its ticket
539
542
  // first, LocalMedia.prepare; asked or not, it then plays)
540
543
  var prep = ctx.localFile && typeof LocalMedia !== 'undefined' && LocalMedia.prepare ? LocalMedia.prepare(ctx.url) : null;
@@ -1274,7 +1277,7 @@ var PlayerParts = {};
1274
1277
  if (useAV) {
1275
1278
  // Don't seek while buffering — queue it until buffering completes.
1276
1279
  if (S.buffering) { S.pendingSeek = target; U.spinner(true); return; }
1277
- doAVSeek(target, 0);
1280
+ if (!blankFirst(target)) { doAVSeek(target, 0); }
1278
1281
  } else {
1279
1282
  try { S.videoEl.currentTime = target; } catch (e2) {}
1280
1283
  }
@@ -1295,6 +1298,84 @@ var PlayerParts = {};
1295
1298
 
1296
1299
  function seekBy(delta) { seekTo(S.cur + delta); }
1297
1300
 
1301
+ // ---------- an MKV with dozens of subtitle tracks ----------
1302
+ // The 2017 TV's player breaks after a forward jump in one (the picture stutters and loses
1303
+ // frames, subtitles on or off), and plays the same file clean with only its video and audio.
1304
+ // So such a file plays through the service's file relay with its other subtitle tracks blanked
1305
+ // (the service's mkvBlanker: nothing moves, seeking stays the file's). When (Settings ›
1306
+ // Playback › Seeking & buffering › Leave out other subtitle tracks): Always, or with more than
1307
+ // BLANK_MIN, from the start (its tracks read first, BLANK_ASK_MS at most); After a jump (the
1308
+ // default: more than BLANK_MIN, from the first jump, which reads them and reopens there);
1309
+ // Never. A file whose tracks are known plays through it from the start in the first three.
1310
+ // Kept: your subtitle languages' tracks (a choice made for the title first), BLANK_KEEP at
1311
+ // most. Not USB files, network folders, YouTube, DRM or live.
1312
+ var BLANK_MIN = 5, BLANK_KEEP = 4, BLANK_ASK_MS = 6000, _blankAsk = null;
1313
+ function blankKeep(ctx, mi) {
1314
+ var cfg = P.getSubCfg(), mine = P.recallSub ? P.recallSub(ctx.id) : null;
1315
+ var keys = [mine && mine.lang, cfg.lang, cfg.lang2].filter(function (l) { return l && l !== 'off' && l !== 'none'; }).map(P.langKey);
1316
+ var keep = [];
1317
+ (mi.subs || []).forEach(function (t, i) { if (keep.length < BLANK_KEEP && keys.some(function (k) { return P.langMatches(k, t.lang || ''); })) { keep.push(i); } });
1318
+ return keep;
1319
+ }
1320
+ function blankFits(ctx, mi) {
1321
+ var mode = P.playerCfg().blank;
1322
+ if (mode === 'never' || !useAV || !ctx || !mi || mi.container !== 'mkv' || !mi.subs || mi.subs.length <= (mode === 'always' ? 0 : BLANK_MIN)) { return false; }
1323
+ if (ctx.localFile || ctx.yt || ctx.trailer || S.isLive || (ctx.stream && ctx.stream._drm)) { return false; }
1324
+ var url = ctx.url || '';
1325
+ if (!/^https?:\/\//i.test(url) || /^http:\/\/(localhost|127\.0\.0\.1)[:\/]/i.test(url)) { return false; }
1326
+ if (blankKeep(ctx, mi).length >= mi.subs.length) { return false; } // (every one kept: nothing to leave out)
1327
+ return typeof YTPlay !== 'undefined' && !!YTPlay.fileOpen && YTPlay.installMode() !== 'browser';
1328
+ }
1329
+ function setBlank(ctx, mi) { ctx._blank = blankKeep(ctx, mi); ctx._blankOf = mi.subs.length; }
1330
+ // Always / More than 5: an MKV's tracks read before it starts (when not known yet); then(): on.
1331
+ function blankBefore(ctx, then) {
1332
+ var mode = P.playerCfg().blank;
1333
+ if ((mode !== 'always' && mode !== 'many') || ctx._blank || ctx._blankChecked || !useAV || !maybeMkv(ctx)) { then(); return; }
1334
+ var job = fileInfoAsk(ctx, true);
1335
+ if (!job || _miSeen.get(job.key)) { then(); return; }
1336
+ ctx._blankChecked = true;
1337
+ var done = false, look = U.cancelToken();
1338
+ function on(m) { if (done) { return; } done = true; if (m && m.container) { _miSeen.set(job.key, m); } if (S.ctx === ctx && S.active) { then(); } }
1339
+ job.ask(look).then(on, function () { on(null); });
1340
+ setTimeout(function () { look.cancel(); on(null); }, BLANK_ASK_MS);
1341
+ }
1342
+ function maybeMkv(ctx) {
1343
+ var bh = (ctx.stream && ctx.stream.behaviorHints) || {};
1344
+ return /\.mkv(?:[?#]|$)/i.test(ctx.url || '') || /\.mkv$/i.test(bh.filename || '') || !!(ctx.formatInfo && /mkv/i.test(ctx.formatInfo.container || '')) || !!(S.mi && S.mi.container === 'mkv');
1345
+ }
1346
+ // A jump: true when it's taken care of here (reopened through the relay, or once its tracks
1347
+ // are read); false: seek as usual. Asked once a playback.
1348
+ function blankFirst(target) {
1349
+ var ctx = S.ctx;
1350
+ if (!ctx || ctx._blank || ctx._blankChecked || P.playerCfg().blank === 'never' || !maybeMkv(ctx)) { return false; }
1351
+ if (_blankAsk) { _blankAsk.target = target; return true; }
1352
+ var job = fileInfoAsk(ctx, true), mi = S.mi || (job && _miSeen.get(job.key)) || null;
1353
+ if (mi || !job) { ctx._blankChecked = true; if (mi && blankFits(ctx, mi)) { reopenBlank(ctx, mi, target); return true; } return false; }
1354
+ var ask = _blankAsk = { target: target, done: false }, tok = _playToken, look = U.cancelToken();
1355
+ U.spinner(true);
1356
+ function finish(m) {
1357
+ if (ask.done) { return; }
1358
+ ask.done = true; _blankAsk = null; ctx._blankChecked = true;
1359
+ if (!S.active || S.ctx !== ctx || tok !== _playToken) { return; }
1360
+ if (m && blankFits(ctx, m)) { reopenBlank(ctx, m, ask.target); return; }
1361
+ U.spinner(false); doAVSeek(ask.target, 0);
1362
+ }
1363
+ job.ask(look).then(function (m) {
1364
+ if (m && typeof m === 'object' && m.container) { _miSeen.set(job.key, m); if (!S.mi && S.ctx === ctx) { fileInfoIn(ctx, m); } finish(m); } else { finish(null); }
1365
+ }, function () { finish(null); });
1366
+ setTimeout(function () { look.cancel(); finish(null); }, BLANK_ASK_MS);
1367
+ return true;
1368
+ }
1369
+ function reopenBlank(ctx, mi, target) {
1370
+ setBlank(ctx, mi);
1371
+ ctx._relay = null; ctx._relayFor = null;
1372
+ ctx.resumeSec = Math.floor(target); S.cur = target;
1373
+ _stall.t = -1; _stall.since = 0; _stall.bufSince = 0;
1374
+ clearStartNote();
1375
+ U.spinner(true);
1376
+ startFileRelay(ctx, false);
1377
+ }
1378
+
1298
1379
  // ---------- jumps ahead on its own ----------
1299
1380
  // At normal speed, play time can't move ahead faster than the clock. After pauses, this
1300
1381
  // TV's player sometimes jumps forward at the next buffering, to where it would be had it
@@ -1569,7 +1650,7 @@ var PlayerParts = {};
1569
1650
  var url = ctx.url || '';
1570
1651
  if (!/^https?:\/\//i.test(url) || /^http:\/\/(localhost|127\.0\.0\.1)[:\/]/i.test(url)) { return false; }
1571
1652
  if (HLS_LINK.test(url) || (ctx.formatInfo && ctx.formatInfo.container === 'hls') || /\.mpd(?:[?#]|$)/i.test(url)) { return false; }
1572
- if (ctx.viaService) { return true; }
1653
+ if (ctx.viaService || ctx._blank) { return true; } // (its other subtitle tracks blanked: blankFits)
1573
1654
  var h = U.sanitizeHeaders(ctx._headers);
1574
1655
  return !!h && (!useAV || !!(h.origin || h.accept || h.lang));
1575
1656
  }
@@ -1579,8 +1660,10 @@ var PlayerParts = {};
1579
1660
  if (S.ctx !== ctx || !S.active) { return; }
1580
1661
  if (useAV) { startLive(ctx, settle); } else { startHTML5(ctx._relay && ctx._relayFor === ctx.url ? ctx._relay : ctx.url); }
1581
1662
  }
1582
- YTPlay.fileOpen(ctx.url, U.sanitizeHeaders(ctx._headers), lan).then(function (r) {
1583
- if (S.ctx === ctx && S.active && relayed(ctx, r, null, false)) { U.log('player', 'Through StremioK\'s service, with the source\'s headers (' + where(ctx.url) + ')'); }
1663
+ YTPlay.fileOpen(ctx.url, U.sanitizeHeaders(ctx._headers), lan, ctx._blank || null).then(function (r) {
1664
+ if (S.ctx === ctx && S.active && relayed(ctx, r, null, false)) {
1665
+ U.log('player', ctx._blank ? 'Through StremioK\'s service: ' + ctx._blankOf + ' subtitle tracks, ' + ctx._blank.length + ' kept, the others left out (jumps stay clean; ' + where(ctx.url) + ')' : 'Through StremioK\'s service, with the source\'s headers (' + where(ctx.url) + ')');
1666
+ }
1584
1667
  go();
1585
1668
  }, go);
1586
1669
  }
package/js/player-lang.js CHANGED
@@ -178,17 +178,63 @@
178
178
  }
179
179
 
180
180
  // The file's own track (its header's, S.mi: see player-core's startFileInfo) for each of the
181
- // TV player's tracks of a kind ('audio' | 'subs'): by position, when the header lists as many
182
- // and every language it states agrees with the player's; else null (an odd file: the player's
183
- // list as it is).
181
+ // TV player's tracks of a kind ('audio' | 'subs'), in the TV's order; else null (the player's
182
+ // list as it is). As many in both, every language either states agreeing: by position. The
183
+ // file listing more (the TV leaves some out, often picture subtitles): its text ones only, if
184
+ // that makes as many; else matched in order by language, each of the TV's tracks to the next
185
+ // of the file's in its language (every one stating one). Not matched: said once in
186
+ // Diagnostics › Logs, with how many each lists.
187
+ function agrees(tr, ft) {
188
+ var tv = langKey(trackLang(tr)), fl = langKey(ft.lang || '');
189
+ if (!tv || !fl || P.langUnstated(tv) || P.langUnstated(fl)) { return null; } // (one says nothing)
190
+ return tv === fl || langKey(('' + ft.lang).split('-')[0]) === tv;
191
+ }
192
+ function byPosition(list, tracks) {
193
+ if (list.length !== tracks.length) { return null; }
194
+ for (var i = 0; i < list.length; i++) { if (agrees(tracks[i], list[i]) === false) { return null; } }
195
+ return list;
196
+ }
197
+ function inOrder(list, tracks) {
198
+ var out = [], j = 0;
199
+ for (var i = 0; i < tracks.length; i++) {
200
+ while (j < list.length && agrees(tracks[i], list[j]) !== true) {
201
+ if (agrees(tracks[i], list[j]) === null) { return null; } // (a language unstated: too unsure)
202
+ j++;
203
+ }
204
+ if (j >= list.length) { return null; }
205
+ out.push(list[j++]);
206
+ }
207
+ return out;
208
+ }
209
+ // The 2017 TV with an MKV's many subtitle tracks: it lists the first 30 only (32 tracks in all),
210
+ // states no language for any, and numbers them in the file's order, on from its video and audio
211
+ // (2, 3, 4…). Those: the file's first ones, in order. Anything else stays unmatched.
212
+ function firstOnes(list, tracks) {
213
+ var mi = P.S.mi, before = (mi && mi.video ? 1 : 0) + ((mi && mi.audio) || []).length;
214
+ for (var i = 0; i < tracks.length; i++) {
215
+ if (agrees(tracks[i], list[i]) !== null || +tracks[i].index !== before + i) { return null; }
216
+ }
217
+ return list.slice(0, tracks.length);
218
+ }
219
+ var _ftMemo = { mi: null, said: {} };
184
220
  function fileTracks(kind, tracks) {
185
221
  var list = P.S.mi && P.S.mi[kind];
186
- if (!list || !tracks || list.length !== tracks.length || !list.length) { return null; }
187
- for (var i = 0; i < list.length; i++) {
188
- var tv = langKey(trackLang(tracks[i])), fl = langKey(list[i].lang || '');
189
- if (tv && fl && !P.langUnstated(tv) && !P.langUnstated(fl) && tv !== fl && langKey(('' + list[i].lang).split('-')[0]) !== tv) { return null; }
222
+ if (!list || !tracks || !list.length || !tracks.length) { return null; }
223
+ var bl = kind === 'subs' && P.S.ctx && P.S.ctx._relay && P.S.ctx._blank; // (the others blanked by the service: the kept ones, in order)
224
+ if (bl) { list = list.filter(function (t, i) { return bl.indexOf(i) !== -1; }); }
225
+ var got = byPosition(list, tracks);
226
+ if (!got && list.length > tracks.length) {
227
+ got = byPosition(list.filter(function (t) { return t.text !== false; }), tracks) || inOrder(list, tracks) || firstOnes(list, tracks);
190
228
  }
191
- return list;
229
+ if (!got) {
230
+ if (_ftMemo.mi !== P.S.mi) { _ftMemo = { mi: P.S.mi, said: {} }; }
231
+ if (!_ftMemo.said[kind]) {
232
+ _ftMemo.said[kind] = 1;
233
+ U.log('player', (kind === 'audio' ? 'Audio' : 'Subtitle') + ' tracks: the TV lists ' + tracks.length + ', the file ' + list.length + ' (' +
234
+ tracks.map(function (t) { return trackLang(t) || '?'; }).join(' ') + ' / ' + list.map(function (t) { return t.lang || '?'; }).join(' ') + '): not matched, the TV\'s names shown');
235
+ }
236
+ }
237
+ return got;
192
238
  }
193
239
  function fileTrack(kind, tracks, pos) { var l = fileTracks(kind, tracks); return l ? l[pos] || null : null; }
194
240
  P.fileTracks = fileTracks; P.fileTrack = fileTrack;
@@ -270,7 +270,9 @@
270
270
  // (the file's details read from its start: player-core's fileInfoAsk. A USB drive's by
271
271
  // default, read off the drive itself; a link's or a network folder's are more requests
272
272
  // as it starts, so only when chosen)
273
- fileInfo: d.fileInfo === 'all' || d.fileInfo === 'off' ? d.fileInfo : 'usb' };
273
+ fileInfo: d.fileInfo === 'all' || d.fileInfo === 'off' ? d.fileInfo : 'usb',
274
+ // (an MKV's other subtitle tracks left out through the service: player-core's blankFits)
275
+ blank: d.blank === 'always' || d.blank === 'many' || d.blank === 'never' ? d.blank : 'jump' };
274
276
  }
275
277
  function setPlayerCfg(cfg) { // (what's given changes; the rest stays)
276
278
  var d = U.store.get(PLAYERCFG_KEY, {}) || {};
package/js/player-subs.js CHANGED
@@ -673,21 +673,31 @@
673
673
  return out;
674
674
  } catch (e) { return []; }
675
675
  }
676
- function textLang(tr) { return trackLang(tr); }
676
+ // A built-in track's language: the TV's, else the file's own for it (the 2017 TV states none
677
+ // for an MKV's subtitle tracks: P.fileTrack).
678
+ function textLang(tr) {
679
+ var l = trackLang(tr);
680
+ if (l && !P.langUnstated(l)) { return l; }
681
+ var tracks = getTextTracks(), i = -1;
682
+ for (var k = 0; k < tracks.length; k++) { if (tracks[k].index === tr.index) { i = k; break; } }
683
+ var own = i >= 0 && P.fileTrack ? P.fileTrack('subs', tracks, i) : null;
684
+ return own && own.lang ? own.lang : l;
685
+ }
677
686
 
678
687
  function wantEmbedded(w) { _embWant = w; if (_ticked) { applyEmbeddedWant(); } }
679
688
  function applyEmbeddedWant() {
680
689
  var w = _embWant; _embWant = null;
681
690
  if (!w || _subOn) { return; } // an addon track was chosen meanwhile
682
691
  var tracks = getTextTracks(), pick = null, key = w.lang ? langKey(w.lang) : '';
683
- // (of a language's tracks, by the file's header: a full one in text, then any in text — a
684
- // picture one, PGS, shows nothing here — then a forced one)
692
+ // (of a language's tracks, by the file's header: a plain one in text, then SDH, then a
693
+ // forced one — a picture one, PGS, shows nothing here, so last)
685
694
  var own = P.fileTracks ? P.fileTracks('subs', tracks) : null;
686
695
  function best(match) {
687
696
  var c = tracks.filter(match);
688
697
  if (!own || c.length < 2) { return c[0] || null; }
689
698
  var o = function (t) { return own[tracks.indexOf(t)] || {}; };
690
- return c.filter(function (t) { return o(t).text !== false && !o(t).forced; })[0] || c.filter(function (t) { return o(t).text !== false; })[0] || c[0];
699
+ var rank = function (t) { var f = o(t); return f.text === false ? 3 : f.forced ? 2 : f.hi ? 1 : 0; };
700
+ return c.slice().sort(function (x, y) { return rank(x) - rank(y) || c.indexOf(x) - c.indexOf(y); })[0];
691
701
  }
692
702
  if (w.index != null) {
693
703
  pick = tracks.find(function (t) { return t.index === w.index && (!key || langKey(textLang(t)) === key); }) || null;
@@ -936,7 +946,8 @@
936
946
  if (x.emb) {
937
947
  var tr = x.emb, l = textLang(tr), own = P.fileTrack ? P.fileTrack('subs', getTextTracks(), x.n) : null;
938
948
  if (_embSub === tr.index) { idx = i; }
939
- return { label: (S.ctx && S.ctx._relayCc ? U.t('Closed captions') : U.t('Built into the file')) + (l ? ' (' + l + ')' : ' · ' + U.t('track {n}', { n: x.n + 1 })), sel: _embSub === tr.index,
949
+ var named = l && !P.langUnstated(l) ? langName(langKey(l)) : ''; // ("English", as the audio list says it)
950
+ return { label: (S.ctx && S.ctx._relayCc ? U.t('Closed captions') : U.t('Built into the file')) + (named ? ' · ' + named : l ? ' (' + l + ')' : ' · ' + U.t('track {n}', { n: x.n + 1 })), sel: _embSub === tr.index,
940
951
  detail: own && P.fileTrackNote ? P.fileTrackNote(own) || undefined : undefined, // (its own name and marks, from the file's header)
941
952
  run: function () {
942
953
  _embDelay = 0; _embQueue = []; _embNudge = null; selectEmbeddedSub(tr); rememberSub(S.ctx.id, { embedded: true, index: tr.index, lang: l });
@@ -2475,15 +2475,18 @@
2475
2475
  // (an HLS source through the service, with its own headers on every piece: see player-core's viaService)
2476
2476
  var HLS_ROUTES = [['off', U.t('Off')], ['headers', U.t('Sources that need headers')], ['all', U.t('All HLS sources')]];
2477
2477
  var FILE_INFOS = [['usb', U.t('USB drives only')], ['all', U.t('All files')], ['off', U.t('Off')]];
2478
+ // (an MKV's other subtitle tracks left out through the service: player-core's blankFits)
2479
+ var BLANKS = [['always', U.t('Always')], ['many', U.t('More than 5 subtitle tracks')], ['jump', U.t('After a jump (more than 5)')], ['never', U.t('Never')]];
2478
2480
  function settingsSeeking(wrap) {
2479
2481
  wrap.appendChild(U.el('h2', null, U.t('Seeking & buffering')));
2480
- var store = { get: function () { var c = Player.playerCfg(); return { seek: '' + c.seek, buffer: c.buffer, reconnect: c.reconnect, hls: c.hls, fileInfo: c.fileInfo }; },
2481
- set: function (cfg) { Player.setPlayerCfg({ seek: +cfg.seek || 10, buffer: cfg.buffer, reconnect: cfg.reconnect, hls: cfg.hls, fileInfo: cfg.fileInfo }); } };
2482
+ var store = { get: function () { var c = Player.playerCfg(); return { seek: '' + c.seek, buffer: c.buffer, reconnect: c.reconnect, hls: c.hls, fileInfo: c.fileInfo, blank: c.blank }; },
2483
+ set: function (cfg) { Player.setPlayerCfg({ seek: +cfg.seek || 10, buffer: cfg.buffer, reconnect: cfg.reconnect, hls: cfg.hls, fileInfo: cfg.fileInfo, blank: cfg.blank }); } };
2482
2484
  wrap.appendChild(subPickRow(U.t('Seek step'), [['5', '5 s'], ['10', '10 s'], ['15', '15 s'], ['30', '30 s']], 'seek', store));
2483
2485
  wrap.appendChild(subPickRow(U.t('Buffer'), [['normal', U.t('Normal (the TV’s own)')], ['more', U.t('More')], ['most', U.t('Most')]], 'buffer', store));
2484
2486
  wrap.appendChild(subPickRow(U.t('Reconnect live channels'), RECONNECTS, 'reconnect', store));
2485
2487
  wrap.appendChild(subPickRow(U.t('HLS through StremioK’s service'), HLS_ROUTES, 'hls', store));
2486
2488
  wrap.appendChild(subPickRow(U.t('Read the file’s details'), FILE_INFOS, 'fileInfo', store)); // (its codec, HDR, tracks and their names: player-core's fileInfoAsk)
2489
+ wrap.appendChild(subPickRow(U.t('Leave out other subtitle tracks'), BLANKS, 'blank', store));
2487
2490
  wrap.appendChild(U.el('div', 'hint', 'Seek step: FF / REW jump three. Buffer: More or Most starts slower but stops less on a slow connection. Reconnect: a live channel that drops opens again (BACK stops it). HLS through StremioK’s service: for a host that wants headers the TV’s player can’t send; a step more before it starts.'));
2488
2491
  focusSettings();
2489
2492
  }