stremiok 2.1.0 → 2.2.1

package/js/player-core.js

@@ -299,15 +299,29 @@ var PlayerParts = {};
         } catch (er2) {}
         return out;
     }
+    // An IPTV channel's TV guide (js/epg.js): { now, next } or null.
+    function guideNow() { return (typeof EPG !== 'undefined' && S.ctx && /^iptv:/.test(S.ctx.id || '')) ? EPG.now(S.ctx.id) : null; }
+    function clock(sec) { var d = new Date(sec * 1000); return (d.getHours() < 10 ? '0' : '') + d.getHours() + ':' + (d.getMinutes() < 10 ? '0' : '') + d.getMinutes(); }
+    if (typeof EPG !== 'undefined' && EPG.onChange) { EPG.onChange(function () { if (S.active && S.isLive) { renderOSD(); } }); }
     function renderOSD() {
         U.byId('osd-title').textContent = S.ctx ? S.ctx.name : '';
+        var ck = U.byId('osd-clock');   // (the time of day, top right while the bar is on screen)
+        if (ck) { ck.textContent = clock(Date.now() / 1000); }
         renderTags();
         renderChapters();
         if (S.isLive) {
+            var cur = U.byId('osd-cur'), g = guideNow();
+            cur.className = 'live';
+            if (g && g.now) {   // an IPTV channel with a TV guide: what's on, how far along, and next
+                var t = Date.now() / 1000;
+                U.byId('osd-bar').style.display = '';
+                U.byId('osd-progress').style.width = Math.max(0, Math.min(100, Math.round((t - g.now.start) / (g.now.stop - g.now.start) * 100))) + '%';
+                cur.textContent = '● LIVE   ' + clock(g.now.start) + '–' + clock(g.now.stop) + '   ' + g.now.title;
+                U.byId('osd-dur').textContent = g.next ? 'Next  ' + clock(g.next.start) + '   ' + g.next.title : '';
+                return;
+            }
             U.byId('osd-bar').style.display = 'none';
-            var cur = U.byId('osd-cur');
             cur.textContent = '● LIVE';
-            cur.className = 'live';
             U.byId('osd-dur').textContent = '';
             return;
         }
@@ -331,6 +345,41 @@ var PlayerParts = {};
             yt: page, ytLang: lang, type: 'YouTube', id: 'yt_id:' + link.id, parent: 'yt_id:' + link.id, name: link.title || 'YouTube',
             poster: 'https://i.ytimg.com/vi/' + link.id + '/hqdefault.jpg', streams: [], private: !!(S.ctx && S.ctx.private) || undefined }, _onExit);   // (from a private one: private too)
     }
+    // ---------- a live Xtream channel's format ----------
+    // An Xtream server sends a channel as MPEG-TS (…/live/USER/PASS/123.ts) or as HLS (….m3u8).
+    // The menu's Format plays it the other way and keeps that for the channel (FORMAT_KEY, by its
+    // id, the last FORMAT_KEEP), so it starts that way next time; its playlist's own way isn't
+    // kept. ctx._ownUrl: the link as its playlist gives it.
+    var FORMAT_KEY = 'stremiok.liveformat', FORMAT_KEEP = 300;
+    var XT_LIVE = /^(https?:\/\/[^?#]+\/live\/[^\/?#]+\/[^\/?#]+\/[^\/?#.]+)\.(ts|m3u8)([?#].*)?$/i;
+    function liveFormat(url) { var m = XT_LIVE.exec(url || ''); return m ? (m[2].toLowerCase() === 'm3u8' ? 'hls' : 'ts') : ''; }
+    function withFormat(url, fmt) { var m = XT_LIVE.exec(url || ''); return m ? m[1] + '.' + (fmt === 'hls' ? 'm3u8' : 'ts') + (m[3] || '') : url; }
+    function formatStart(ctx) {
+        if (!S.isLive || !ctx.id || !liveFormat(ctx._ownUrl || ctx.url)) { return; }
+        if (!ctx._ownUrl) { ctx._ownUrl = ctx.url; }
+        var want = (U.store.get(FORMAT_KEY, {}) || {})[ctx.id];
+        ctx.url = (want === 'ts' || want === 'hls') ? withFormat(ctx._ownUrl, want) : ctx._ownUrl;
+    }
+    function setLiveFormat(fmt) {
+        var old = S.ctx;
+        if (!S.active || !old || !old._ownUrl || !liveFormat(old.url) || liveFormat(old.url) === fmt) { return; }
+        var all = U.store.get(FORMAT_KEY, {}) || {};
+        delete all[old.id];
+        if (fmt !== liveFormat(old._ownUrl)) {
+            all[old.id] = fmt;
+            var keys = Object.keys(all);
+            keys.slice(0, Math.max(0, keys.length - FORMAT_KEEP)).forEach(function (k) { delete all[k]; });   // (the oldest picked)
+        }
+        U.store.set(FORMAT_KEY, all);
+        var ctx = {};   // (the channel again, without what was learned from the other link: its relay, its look)
+        Object.keys(old).forEach(function (k) { if (!/^_(relay|relayFor|relayCc|ccOffer|liveChecked)$/.test(k)) { ctx[k] = old[k]; } });
+        ctx.switching = true;
+        play(ctx, _onExit);
+        U.spinner(true, 'Opening it as ' + (fmt === 'hls' ? 'HLS' : 'MPEG-TS') + '…');
+    }
+    P.liveFormat = function () { return S.active && S.ctx && S.isLive && S.ctx._ownUrl ? liveFormat(S.ctx.url) : ''; };
+    P.setLiveFormat = setLiveFormat;
+
     // Another source of what's playing (the player's source list): played in its place, at
     // the same point, as a playback of its own — its quality ladder, YouTube details,
     // captions, SponsorBlock sections, headers and file details are the new source's, and so
@@ -375,6 +424,7 @@ var PlayerParts = {};
         S.active = true; S.cur = 0; S.dur = 0; _bg = null; S.actual = null;
         // Stremio "tv" and "radio" types are strong live hints; refined after prepare.
         S.isLive = (ctx.type === 'tv' || ctx.type === 'radio') || /^iptv:/.test(ctx.id || '') || !!ctx.isLive;   // (an IPTV channel: live, a sports one too)
+        formatStart(ctx);
         S.ctx.resumeSec = (ctx.trailer || ctx.fromStart) ? 0 : (ctx.resumeSec || getResume(ctx.type, ctx.id));   // (Play from start: 0:00)
 
         // reset subtitle + audio + quality + on-screen controls state
@@ -1041,6 +1091,11 @@ var PlayerParts = {};
     // cut that way, the channel restarts through the service's relay, which repacks the sound.
     // The answer is kept per link (LIVE_KEY, LIVE_DAYS): a channel known to need it starts
     // through the relay (startLive), one known not to isn't asked about again.
+    // The same look says which closed-caption channels (CC1–CC4) are in its picture (cc, kept
+    // with it once sure). They're offered in the subtitle menu (ctx._ccOffer); turned on (picked
+    // there, remembered for the channel, or in your default subtitle language), the channel plays
+    // through the relay with them as subtitle tracks (ctx._relayCc), the sound as it is unless it
+    // needs repacking too.
     var LIVE_KEY = 'stremiok.livefix', LIVE_KEEP = 300, LIVE_DAYS = 14;
     function liveFixable(ctx) {
         return useAV && S.isLive && !!ctx && !ctx.yt && !ctx.trailer && /^https?:\/\//i.test(ctx.url || '') &&
@@ -1050,22 +1105,45 @@ var PlayerParts = {};
         var k = (U.store.get(LIVE_KEY, {}) || {})[url];
         return (k && Date.now() - k.at < LIVE_DAYS * 86400000) ? k : null;
     }
-    function liveKeep(url, fix) {
+    // The caption channels kept for a link: [{ ch: 'CC1', lang: 'en' }], or null (not known yet).
+    function ccOf(k) {
+        if (!k || !Array.isArray(k.cc)) { return null; }
+        return k.cc.filter(function (c) { return c && /^CC[1-4]$/.test(c.ch) && (!c.lang || /^[a-z]{2,3}$/.test(c.lang)); }).slice(0, 4);
+    }
+    function liveKeep(url, fix, cc) {
         var all = U.store.get(LIVE_KEY, {}) || {};
         all[url] = { fix: fix ? 1 : 0, at: Date.now() };
+        if (cc) { all[url].cc = cc; }
         var keys = Object.keys(all);
         if (keys.length > LIVE_KEEP) {
             keys.sort(function (a, b) { return all[a].at - all[b].at; }).slice(0, keys.length - LIVE_KEEP).forEach(function (k) { delete all[k]; });
         }
         U.store.set(LIVE_KEY, all);
     }
+    // Captions on from the start: your choice for this channel (a closed-caption track picked
+    // there last), else one in your default subtitle language (or second choice).
+    function ccWanted(ctx, cc) {
+        if (!cc || !cc.length) { return false; }
+        var mem = P.recallSub(ctx.id);
+        if (mem) { return !!mem.embedded; }
+        var cfg = P.getSubCfg(), langs = [cfg.lang, cfg.lang2].filter(function (l) { return l && l !== 'off' && l !== 'none'; });
+        return cc.some(function (c) { return c.lang && langs.some(function (l) { return P.langMatches(l, c.lang); }); });
+    }
+    function ccIndex(cc, w) { for (var i = 0; i < cc.length; i++) { if (cc[i].ch === w.ch) { return i; } } return 0; }
+    function relayed(ctx, r, cc) {
+        if (!r || typeof r.url !== 'string' || !/^http:\/\/localhost:\d+\/live\//.test(r.url)) { return false; }
+        ctx._relay = r.url; ctx._relayFor = ctx.url; ctx._relayCc = cc || null; ctx._ccOffer = cc ? null : ctx._ccOffer;
+        return true;
+    }
     function startLive(ctx, settle) {
-        var known = liveFixable(ctx) ? liveKnown(ctx.url) : null;
-        if (!known || !known.fix) { startAV(ctx.url, settle); return; }
-        ctx._liveChecked = true;
-        YTPlay.liveOpen(ctx.url, ctx._headers, true).then(function (r) {
+        var known = liveFixable(ctx) ? liveKnown(ctx.url) : null, cc = ccOf(known);
+        if (cc && cc.length) { ctx._ccOffer = cc; }
+        var withCc = ccWanted(ctx, cc) ? cc : null;
+        if (cc) { ctx._liveChecked = true; }   // (both answers in: not asked again)
+        if (!known || (!known.fix && !withCc)) { startAV(ctx.url, settle); return; }
+        YTPlay.liveOpen(ctx.url, ctx._headers, true, { fix: !!known.fix, cc: withCc }).then(function (r) {
             if (S.ctx !== ctx || !S.active) { return; }
-            if (r && typeof r.url === 'string' && /^http:\/\/localhost:\d+\/live\//.test(r.url)) { ctx._relay = r.url; ctx._relayFor = ctx.url; }
+            relayed(ctx, r, withCc);
             startAV(ctx.url, settle);
         }, function () { if (S.ctx === ctx && S.active) { startAV(ctx.url, settle); } });
     }
@@ -1073,17 +1151,37 @@ var PlayerParts = {};
         var ctx = S.ctx;
         if (!ctx || ctx._liveChecked || !liveFixable(ctx)) { return; }
         ctx._liveChecked = true;
-        if (liveKnown(ctx.url)) { return; }
+        var known = liveKnown(ctx.url);
+        if (known && ccOf(known)) { return; }
         var url = ctx.url;
         YTPlay.liveOpen(url, ctx._headers, false).then(function (r) {
             if (!r || !r.sure) { return; }   // (couldn't tell: asked again next time)
-            liveKeep(url, !!r.fix);
-            if (!r.fix || typeof r.url !== 'string' || !/^http:\/\/localhost:\d+\/live\//.test(r.url) || S.ctx !== ctx || !S.active || ctx.url !== url) { return; }
-            ctx._relay = r.url; ctx._relayFor = url;
+            var cc = (r.ccSure || r.cc === undefined) ? (ccOf(r) || []) : null, fix = known ? !!known.fix : !!r.fix;   // (captions with no text yet: asked again next time; the sound's answer: as first found)
+            liveKeep(url, fix, cc);
+            if (S.ctx !== ctx || !S.active || ctx.url !== url) { return; }
+            if (cc && cc.length && !ctx._relayCc) { ctx._ccOffer = cc; }
+            if (cc && cc.length && ccWanted(ctx, cc)) { ccOn(ctx, 'Adding this channel’s captions…'); return; }
+            if (known || !fix || ctx._relay || !relayed(ctx, r, null)) { return; }   // (the sound: restarted for on its first look only)
             U.log('player', 'Live sound repacked by StremioK\'s service (' + (r.why || '') + ')');
             reopen('Fixing this channel’s sound…');
         }, function () {});
     }
+    // The channel again through the relay with its closed captions as subtitle tracks (the sound
+    // repacked too when it needs it); then: true once it's reopening. want: a caption track to
+    // select once it plays ({ ch, lang }).
+    function ccOn(ctx, message, want) {
+        var known = liveKnown(ctx.url), cc = ccOf(known) || ctx._ccOffer;
+        if (!cc || !cc.length || !liveFixable(ctx)) { return Promise.resolve(false); }
+        return YTPlay.liveOpen(ctx.url, ctx._headers, true, { fix: !!(known && known.fix), cc: cc }).then(function (r) {
+            if (S.ctx !== ctx || !S.active || !relayed(ctx, r, cc)) { return false; }
+            var w = want || cc.filter(function (c) { return ccWanted(ctx, [c]); })[0] || null;
+            U.log('player', 'Live captions through StremioK\'s service (' + cc.map(function (c) { return c.ch; }).join(', ') + ')');
+            reopen(message);
+            if (w && P.wantEmbedded) { P.wantEmbedded({ nth: ccIndex(cc, w), lang: w.lang }); }   // (after the reopen: on its tracks)
+            return true;
+        }, function () { return false; });
+    }
+    P.ccOn = function (want) { return S.ctx ? ccOn(S.ctx, 'Adding this channel’s captions…', want) : Promise.resolve(false); };
     // The relay didn't start (StremioK's service gone): the channel as it is.
     function relayFailed() {
         if (S.playStarted || !S.ctx || !S.ctx._relay) { return false; }
@@ -1181,6 +1279,7 @@ var PlayerParts = {};
     function exit() {
         if (!S.active) { return; }
         if (U.crumb) { U.crumb('player closed'); }
+        if (P.sleepClear) { P.sleepClear(); }   // (the sleep timer: this playback's)
         saveProgress();
         // Record partial progress to Trakt (unfinished VOD) so it shows in Continue Watching. Past
         // 85% (Trakt connected): finished, Trakt's way (it marks it watched), and here as at the credits.
@@ -1227,4 +1326,5 @@ var PlayerParts = {};
     P.sponsorHighlight = sponsorHighlight;
     P.chapters = chapters; P.chapterAt = chapterAt; P.chapterLabel = chapterLabel;
     P.seekTo = seekTo; P.doAVSeek = doAVSeek; P.seekBy = seekBy; P.exit = exit;
+    P.reload = function () { if (S.active && S.ctx) { reopen(S.isLive ? 'Reloading the channel…' : 'Reloading…'); } };   // (the menu's Reload)
 })(PlayerParts);

package/js/player-lang.js

@@ -34,7 +34,7 @@
         fre: ['fre', 'fra', 'fr', 'french', 'français', 'francais'],
         ger: ['ger', 'deu', 'de', 'german', 'deutsch'],
         ita: ['ita', 'it', 'italian', 'italiano'],
-        por: ['por', 'pob', 'pt', 'portuguese', 'português', 'portugues'],
+        por: ['por', 'pob', 'pom', 'pt', 'portuguese', 'português', 'portugues'],
         dut: ['dut', 'nld', 'nl', 'dutch', 'nederlands'],
         rus: ['rus', 'ru', 'russian'],
         ara: ['ara', 'ar', 'arabic'],
@@ -42,7 +42,7 @@
         pol: ['pol', 'pl', 'polish', 'polski'],
         jpn: ['jpn', 'ja', 'japanese', '日本語'],
         kor: ['kor', 'ko', 'korean', '한국어'],
-        chi: ['chi', 'zho', 'zh', 'cmn', 'chinese', 'mandarin', '中文'],
+        chi: ['chi', 'zho', 'zh', 'cmn', 'zht', 'zhe', 'chinese', 'mandarin', '中文'],   // (zht / zhe: OpenSubtitles' traditional and bilingual)
         hin: ['hin', 'hi', 'hindi'],
         swe: ['swe', 'sv', 'swedish', 'svenska'],
         nor: ['nor', 'nob', 'nno', 'nb', 'nn', 'norwegian', 'norsk'],
@@ -58,7 +58,7 @@
         ukr: ['ukr', 'uk', 'ukrainian'],
         tha: ['tha', 'th', 'thai'],
         vie: ['vie', 'vi', 'vietnamese'],
-        ind: ['ind', 'id', 'indonesian'],
+        ind: ['ind', 'id', 'indonesian', 'indonesia'],   // ("Bahasa Indonesia": its last word)
         may: ['may', 'msa', 'ms', 'malay'],
         fil: ['fil', 'tgl', 'tl', 'filipino', 'tagalog'],
         cat: ['cat', 'ca', 'catalan', 'català'],
@@ -66,7 +66,7 @@
         glg: ['glg', 'gl', 'galician', 'galego'],
         bul: ['bul', 'bg', 'bulgarian'],
         hrv: ['hrv', 'hr', 'croatian', 'hrvatski'],
-        srp: ['srp', 'sr', 'serbian'],
+        srp: ['srp', 'scc', 'sr', 'serbian'],
         per: ['per', 'fas', 'fa', 'persian', 'farsi'],
         est: ['est', 'et', 'estonian'],
         lav: ['lav', 'lv', 'latvian'],
@@ -74,7 +74,57 @@
         ice: ['ice', 'isl', 'is', 'icelandic'],
         tam: ['tam', 'ta', 'tamil'],
         tel: ['tel', 'te', 'telugu'],
-        ben: ['ben', 'bn', 'bengali']
+        ben: ['ben', 'bn', 'bengali'],
+        // (2.2.0.2) the rest of OpenSubtitles' languages; two-letter codes that are also everyday
+        // words or labels (my, be, or, so, an, se, si, ne, mr, SD, BR…) left out
+        afr: ['afr', 'af', 'afrikaans'],
+        alb: ['alb', 'sqi', 'sq', 'albanian', 'shqip'],
+        arg: ['arg', 'aragonese'],
+        arm: ['arm', 'hye', 'hy', 'armenian'],
+        ast: ['ast', 'asturian'],
+        aze: ['aze', 'az', 'azerbaijani'],
+        bel: ['bel', 'belarusian'],
+        bos: ['bos', 'bs', 'bosnian'],
+        bre: ['bre', 'breton'],
+        bur: ['bur', 'mya', 'burmese'],
+        prs: ['prs', 'dari'],
+        epo: ['epo', 'eo', 'esperanto'],
+        ext: ['ext', 'extremaduran'],
+        gla: ['gla', 'gd', 'gaelic'],
+        geo: ['geo', 'kat', 'ka', 'georgian'],
+        ibo: ['ibo', 'ig', 'igbo'],
+        ina: ['ina', 'interlingua'],
+        gle: ['gle', 'ga', 'irish'],
+        kan: ['kan', 'kn', 'kannada'],
+        kaz: ['kaz', 'kk', 'kazakh'],
+        khm: ['khm', 'km', 'khmer'],
+        kur: ['kur', 'ku', 'kurdish'],
+        ltz: ['ltz', 'lb', 'luxembourgish'],
+        mac: ['mac', 'mkd', 'mk', 'macedonian'],
+        mal: ['mal', 'ml', 'malayalam'],
+        mni: ['mni', 'manipuri'],
+        mar: ['mar', 'marathi'],
+        mon: ['mon', 'mn', 'mongolian'],
+        mne: ['mne', 'montenegrin'],
+        nav: ['nav', 'nv', 'navajo'],
+        nep: ['nep', 'nepali'],
+        sme: ['sme', 'sami'],
+        oci: ['oci', 'oc', 'occitan'],
+        ori: ['ori', 'odia', 'oriya'],
+        pan: ['pan', 'pa', 'punjabi', 'panjabi'],
+        pus: ['pus', 'pashto'],
+        sat: ['sat', 'santali'],
+        snd: ['snd', 'sindhi'],
+        sin: ['sin', 'sinhala', 'sinhalese'],
+        som: ['som', 'somali'],
+        swa: ['swa', 'sw', 'swahili'],
+        syr: ['syr', 'syriac'],
+        tat: ['tat', 'tt', 'tatar'],
+        tok: ['tok', 'toki'],
+        tuk: ['tuk', 'tk', 'turkmen'],
+        urd: ['urd', 'ur', 'urdu'],
+        uzb: ['uzb', 'uz', 'uzbek'],
+        wel: ['wel', 'cym', 'cy', 'welsh']
     };
     function langMatches(pref, lang) {
         var names = LANG_ALIASES[pref] || [pref];
@@ -97,6 +147,14 @@
         per: 'Persian', fas: 'Persian', fa: 'Persian', slo: 'Slovak', slv: 'Slovenian', may: 'Malay', fil: 'Filipino',
         baq: 'Basque', glg: 'Galician', est: 'Estonian', lav: 'Latvian', lit: 'Lithuanian', ice: 'Icelandic',
         tam: 'Tamil', tel: 'Telugu', ben: 'Bengali', mul: 'Multiple languages', zxx: 'No language',
+        afr: 'Afrikaans', alb: 'Albanian', arg: 'Aragonese', arm: 'Armenian', ast: 'Asturian', aze: 'Azerbaijani',
+        bel: 'Belarusian', bos: 'Bosnian', bre: 'Breton', bur: 'Burmese', prs: 'Dari', epo: 'Esperanto', ext:
+        'Extremaduran', gla: 'Scottish Gaelic', geo: 'Georgian', ibo: 'Igbo', ina: 'Interlingua', gle: 'Irish', kan:
+        'Kannada', kaz: 'Kazakh', khm: 'Khmer', kur: 'Kurdish', ltz: 'Luxembourgish', mac: 'Macedonian', mal:
+        'Malayalam', mni: 'Manipuri', mar: 'Marathi', mon: 'Mongolian', mne: 'Montenegrin', nav: 'Navajo', nep:
+        'Nepali', sme: 'Northern Sami', oci: 'Occitan', ori: 'Odia', pan: 'Punjabi', pus: 'Pashto', sat: 'Santali',
+        snd: 'Sindhi', sin: 'Sinhala', som: 'Somali', swa: 'Swahili', syr: 'Syriac', tat: 'Tatar', tok: 'Toki Pona',
+        tuk: 'Turkmen', urd: 'Urdu', uzb: 'Uzbek', wel: 'Welsh',
         und: 'Unknown language', '': 'Unknown language' };
     function langName(lang) {
         var k = langKey(lang);
@@ -122,6 +180,9 @@
     // ----- for the other parts (and js/player.js) -----
     P.trackInfo = trackInfo; P.infoLang = infoLang; P.trackLang = trackLang; P.langMatches = langMatches;
     P.langName = langName; P.langRank = langRank; P.langKey = langKey;
+    // A track that doesn't say its language (by its key): none, "und", "unknown"…, or no letters.
+    // (A language StremioK has no name for is still a language.)
+    P.langUnstated = function (k) { k = ('' + (k || '')).trim(); return !/[a-zà-ÿ]/i.test(k) || /^(und|unk|unknown|unknown language|mul|zxx|n\/a|none)$/i.test(k); };
     // A language code's two-letter form (ISO 639-1: "spa" -> "es"), or '' (TMDB asks by it).
     P.lang2 = function (key) { var a = LANG_ALIASES[key] || []; for (var i = 0; i < a.length; i++) { if (/^[a-z]{2}$/.test(a[i])) { return a[i]; } } return ''; };
 })(PlayerParts);

package/js/player-store.js

@@ -85,7 +85,8 @@
             edge: pick3(SUB_EDGES, d.edge)[0], pos: pick3(SUB_POSITIONS, d.pos || 'bottom')[0],   // (Bottom unless chosen: Lower comes first in the list)
             font: subFontFamily(d.font) ? d.font : 'default',   // an unknown font -> TV default
             skip: skipWords(d.skip),   // lines with one of these aren't shown (none by default: see player-subs' skipLines)
-            second: typeof d.second === 'string' && /^[a-z]{2,3}$/.test(d.second) ? d.second : 'off' };   // a second subtitle at the top (player-subs; Off by default)
+            second: typeof d.second === 'string' && /^[a-z]{2,3}$/.test(d.second) ? d.second : 'off',   // a second subtitle at the top (player-subs; Off by default)
+            only: d.only === 'on' ? 'on' : 'off' };   // the subtitle menu: only your languages (player-subs' langMenu; Off by default)
     }
     // Settings › Subtitles › Skip lines with: words (or bits, ".srt"), capitals or not; at most 20.
     function skipWords(x) {
@@ -255,6 +256,26 @@
         U.store.set(PLAYERCFG_KEY, d);
     }
     function aspectDef(id) { for (var i = 0; i < ASPECTS.length; i++) { if (ASPECTS[i][0] === id) { return ASPECTS[i]; } } return ASPECTS[0]; }
+    // A live channel's own picture mode (picked while it played): { channel id: mode }, the last
+    // ASPECTS_KEEP; one set back to the usual mode isn't kept apart. Anything else: the usual one.
+    var ASPECTS_KEY = 'stremiok.aspects', ASPECTS_KEEP = 300;
+    function aspectChannel() { var S = P.S; return (S && S.isLive && S.ctx && S.ctx.id) ? S.ctx.id : ''; }
+    function aspectNow() {
+        var ch = aspectChannel(), own = ch ? (U.store.get(ASPECTS_KEY, {}) || {})[ch] : '';
+        return own && aspectDef(own)[0] === own ? own : playerCfg().aspect;
+    }
+    function setAspectNow(mode) {
+        var ch = aspectChannel();
+        if (!ch) { setPlayerCfg({ aspect: mode }); return; }
+        var all = U.store.get(ASPECTS_KEY, {}) || {};
+        delete all[ch];
+        if (mode !== playerCfg().aspect) {
+            all[ch] = mode;
+            var keys = Object.keys(all);
+            keys.slice(0, Math.max(0, keys.length - ASPECTS_KEEP)).forEach(function (k) { delete all[k]; });   // (the oldest picked)
+        }
+        U.store.set(ASPECTS_KEY, all);
+    }
 
     // ----- for the other parts (and js/player.js) -----
     P.watchedState = watchedState; P.isWatched = isWatched; P.watchedAt = watchedAt; P.watchedSince = watchedSince;
@@ -265,7 +286,7 @@
     P.getResume = getResume; P.removeProgress = removeProgress; P.continueList = continueList;
     P.rememberSub = rememberSub; P.recallSub = recallSub; P.rememberAudio = rememberAudio;
     P.recallAudio = recallAudio; P.playerCfg = playerCfg; P.setPlayerCfg = setPlayerCfg;
-    P.aspectDef = aspectDef; P.SUB_FONTS = SUB_FONTS; P.SUB_COLORS = SUB_COLORS; P.SUB_BGS = SUB_BGS;
+    P.aspectDef = aspectDef; P.aspectNow = aspectNow; P.setAspectNow = setAspectNow; P.SUB_FONTS = SUB_FONTS; P.SUB_COLORS = SUB_COLORS; P.SUB_BGS = SUB_BGS;
     P.SUB_EDGES = SUB_EDGES; P.SUB_POSITIONS = SUB_POSITIONS; P.ASPECTS = ASPECTS;
     P.isPrivate = isPrivate; P.setPrivate = setPrivate; P.privateNow = privateNow; P.subCfgVersion = subCfgVersion;
 })(PlayerParts);

package/js/player-subs.js

@@ -113,7 +113,7 @@
                 if (mem.off) { return true; }
                 if (mem.embedded) {
                     if (partial) { return false; }
-                    wantEmbedded({ index: mem.index, lang: mem.lang }); _embDelay = Math.max(0, +mem.delay || 0); return true;
+                    wantEmbedded({ index: mem.index, lang: mem.lang, nth: mem.nth }); _embDelay = Math.max(0, +mem.delay || 0); return true;
                 }
                 var exact =
                     (mem.trackId != null ? _subTracks.find(function (t) { return t.id === mem.trackId; }) : null) ||
@@ -202,6 +202,21 @@
     var WEBVTT_ASIDE = /^(NOTE|STYLE|REGION)([ \t]|$)/;
     // Character codes (& > — …) as the characters they stand for.
     var CHAR_CODES = { amp: '&', lt: '<', gt: '>', quot: '"', apos: "'", nbsp: '\u00a0', lrm: '\u200e', rlm: '\u200f' };
+    // A subtitle's tags taken out, a stray < with them: one pass, in time with the text's length
+    // however it's made (a run of < with no > after it used to hold the remote for seconds).
+    // Its text is only ever shown as text (textContent): this is for how it reads.
+    function noTags(t) {
+        var out = '', i = 0, n = t.length;
+        while (i < n) {
+            var lt = t.indexOf('<', i);
+            if (lt === -1) { out += t.slice(i); break; }
+            out += t.slice(i, lt);
+            var gt = t.indexOf('>', lt + 1);
+            if (gt === -1) { out += t.slice(lt + 1).split('<').join(''); break; }   // (no tag ends after it: the rest, its < gone)
+            i = gt + 1;
+        }
+        return out;
+    }
     function charCodes(t) {
         if (t.indexOf('&') === -1) { return t; }
         return t.replace(/&(#[xX][0-9a-fA-F]{1,6}|#[0-9]{1,7}|[a-zA-Z]+);/g, function (all, c) {
@@ -213,13 +228,16 @@
             return CHAR_CODES.hasOwnProperty(c) ? CHAR_CODES[c] : all;
         });
     }
+    // A file's cues: CUES_MAX at most, CUE_TEXT_MAX characters of text each (a broken or hostile
+    // file can't hold the remote: the whole parse stays in time with the file's length).
+    var CUES_MAX = 20000, CUE_TEXT_MAX = 1000;
     function parseCues(text) {
         text = ('' + text).replace(/\r/g, '');
         var blocks = text.split(/\n\n+/);
         var cues = [], skip = skipper();   // (Skip lines with: your words)
         var re = /(?:(\d{1,3}):)?(\d{2}):(\d{2})[,.](\d{1,3})\s*-->\s*(?:(\d{1,3}):)?(\d{2}):(\d{2})[,.](\d{1,3})/;
         function ms(x) { return +((x + '00').slice(0, 3)) / 1000; }   // (".5" is half a second)
-        for (var i = 0; i < blocks.length; i++) {
+        for (var i = 0; i < blocks.length && cues.length < CUES_MAX; i++) {
             var lines = blocks[i].replace(/^\n+/, '').split('\n');
             if (WEBVTT_ASIDE.test(lines[0])) { continue; }   // (a WebVTT comment, style or region: not shown)
             var ti = -1;
@@ -229,7 +247,9 @@
             if (!m) { continue; }
             var start = (+(m[1] || 0)) * 3600 + (+m[2]) * 60 + (+m[3]) + ms(m[4]);
             var end = (+(m[5] || 0)) * 3600 + (+m[6]) * 60 + (+m[7]) + ms(m[8]);
-            var txt = skip(charCodes(lines.slice(ti + 1).join('\n').replace(/<[^>]+>/g, '').replace(/\{[^}]+\}/g, '')).replace(/\s+$/, ''));
+            // (tags out, a stray < with them, in one pass; then entities read: one written as &lt; is the file's own text,
+            // "<b>" shown as written. Never a tag: subtitles reach the screen as text only, textContent)
+            var txt = skip(charCodes(noTags(lines.slice(ti + 1).join('\n').slice(0, CUE_TEXT_MAX)).replace(/\{[^}]+\}/g, '')).replace(/\s+$/, ''));
             if (txt) { cues.push({ start: start, end: end, text: txt }); }
         }
         cues.sort(function (a, b) { return a.start - b.start; });
@@ -384,6 +404,7 @@
             pick = tracks.find(function (t) { return t.index === w.index && (!key || langKey(textLang(t)) === key); }) || null;
         }
         if (!pick && key) { pick = tracks.find(function (t) { return langMatches(key, textLang(t)); }) || null; }
+        if (!pick && w.nth != null && S.ctx && S.ctx._relayCc) { pick = tracks[w.nth] || null; }   // (a live channel's closed captions: in the order asked for)
         if (!pick && w.lang2) {   // nothing in the default language anywhere: the second choice, a track to download first
             var key2 = langKey(w.lang2);
             var dl = _subTracks.find(function (t) { return langMatches(key2, t.lang); });
@@ -398,7 +419,7 @@
         try { avplay.setSelectTrack('TEXT', tr.index); }
         catch (e2) { try { avplay.setSelectTrack('TEXT', '' + tr.index); } catch (e3) {} }
         _embSub = tr.index; _embLang = textLang(tr);
-        U.toast('Subtitles: ' + (_embLang || 'on') + ' (built-in)', 1800);
+        U.toast('Subtitles: ' + (_embLang || 'on') + (S.ctx && S.ctx._relayCc ? ' (closed captions)' : ' (built-in)'), 1800);
     }
     function embOff() {
         if (_embSub != null) { try { avplay.setSilentSubtitle(true); } catch (e) {} }
@@ -446,7 +467,7 @@
     function drawEmbedded(text, duration) {
         if (_embSub == null || _subOn) { return; }
         if (_embTimer) { clearTimeout(_embTimer); _embTimer = null; }
-        var t = ('' + (text || '')).replace(/<br\s*\/?>/gi, '\n').replace(/<[^>]+>/g, '').replace(/\{[^}]+\}/g, '').trim();
+        var t = noTags(('' + (text || '')).replace(/<br\s*\/?>/gi, '\n')).replace(/\{[^}]+\}/g, '').trim();
         if (!t) { S.subsEl.className = 'hidden'; return; }
         S.subsEl.className = '';
         var span = S.subsEl.firstChild;
@@ -515,7 +536,7 @@
         replaceTop(timingMenu(topMenu().idx));
         U.toast('Subtitles: ' + fmtDelay(_subDelay) + (_subDelay > 0 ? ' (later)' : _subDelay < 0 ? ' (earlier)' : ' (as in the file)'), 1800);
     }
-    function lineText(c) { return '“' + ('' + c.text).replace(/<[^>]+>/g, '').replace(/\s+/g, ' ').trim().slice(0, 70) + '”'; }
+    function lineText(c) { return '“' + noTags('' + c.text).replace(/\s+/g, ' ').trim().slice(0, 70) + '”'; }
     // The next line coming up (as timed now): OK the moment it's said.
     function earMenu() {
         var t = S.cur - _subDelay, next = null;
@@ -562,17 +583,32 @@
     // Level 1: one entry per language, spellings merged ("en", "eng" and "English" are one
     // group), named in full, with the file's own tracks in the same groups as the addons'.
     // Order: the language showing now, the preferred language, then by name.
-    function langMenu() {
+    // Only my languages (Settings, Off by default): just your default, second-choice and
+    // second-subtitle languages, the one showing, and tracks that don't say their language;
+    // Other languages, after them, lists the rest (all: that list).
+    function langMenu(all) {
         var groups = Object.create(null), order = [];   // (no inherited names: a language an addon calls "__proto__" is just a key)
+        function key(l) { var k = langKey(l); return P.langUnstated(k) ? '' : k; }   // (no language, "und"…: one Unknown language)
         function add(k, item) {
             if (!groups[k]) { groups[k] = []; order.push(k); }
             groups[k].push(item);
         }
-        getTextTracks().forEach(function (tr, i) { add(langKey(textLang(tr)), { emb: tr, n: i }); });
-        _subTracks.forEach(function (tr) { add(langKey(tr.lang), { track: tr }); });
-        var curKey = _subOn ? langKey(_subLabel) : (_embSub != null ? langKey(_embLang) : null);
+        getTextTracks().forEach(function (tr, i) { add(key(textLang(tr)), { emb: tr, n: i }); });
+        var offer = S.ctx && !S.ctx._relayCc ? S.ctx._ccOffer : null;   // (a live channel's closed captions, not on yet)
+        (offer || []).forEach(function (c, i) { add(key(c.lang || ''), { cc: c, n: i, emb: true }); });
+        _subTracks.forEach(function (tr) { add(key(tr.lang), { track: tr }); });
+        var curKey = _subOn ? key(_subLabel) : (_embSub != null ? key(_embLang) : null);
         var pref = getSubCfg().lang;
         var prefs = [curKey, pref].filter(function (x) { return x && x !== 'off'; });
+        var cfg = getSubCfg(), hidden = 0;
+        var mine = [cfg.lang, cfg.lang2, cfg.second].filter(function (l) { return l && l !== 'off' && l !== 'none'; });
+        if (cfg.only === 'on' && !all && mine.length) {
+            order = order.filter(function (k) {
+                var keep = k === curKey || k === '' || mine.some(function (l) { return langKey(l) === k || langMatches(l, k); });
+                if (!keep) { hidden++; }
+                return keep;
+            });
+        }
         order.sort(function (a, b) {
             var ra = langRank(a, prefs), rb = langRank(b, prefs);
             if (ra !== rb) { return ra - rb; }
@@ -583,17 +619,19 @@
         order.forEach(function (k) {
             var list = groups[k], n = list.length, emb = list.filter(function (x) { return x.emb; }).length;
             items.push({ label: langName(k),
-                detail: n + ' option' + (n > 1 ? 's' : '') + (emb ? (emb === n ? ', in the file' : ', ' + emb + ' in the file') : ''),
+                detail: n + ' option' + (n > 1 ? 's' : '') + (emb ? (emb === n ? ', ' + inFile() : ', ' + emb + ' ' + inFile()) : ''),
                 sel: (k === curKey),
                 run: function () { pushMenu(langTracksMenu(k, list)); } });
         });
+        if (hidden) { items.push({ label: 'Other languages', detail: hidden + ' more', run: function () { pushMenu(langMenu(true)); } }); }
         var sec = getSubCfg().second;
         if (_subTracks.length) { items.push({ label: 'Second subtitle: ' + (sec === 'off' ? 'Off' : langName(sec)), detail: 'At the top, at the same time', run: function () { pushMenu(secondMenu()); } }); }
         var idx = 0;
         for (var i = 0; i < items.length; i++) { if (items[i].sel) { idx = i; break; } }
-        return { title: 'Subtitle language', items: items, idx: idx, rebuild: langMenu };
+        return { title: all ? 'All subtitle languages' : 'Subtitle language', items: items, idx: idx, rebuild: function () { return langMenu(all); } };
     }
 
+    function inFile() { return S.ctx && (S.ctx._relayCc || S.ctx._ccOffer) ? 'closed captions' : 'in the file'; }
     // Level 2: the tracks in one language: the file's own first, then each addon's.
     // Picking a track keeps the menu open, the checkmark on it (an addon's once it loads), so
     // several can be tried in a row: the file's own the same as an addon's.
@@ -601,10 +639,15 @@
         var idx = 0, nAddon = 0;
         list = list.filter(function (x) { return x.emb; }).concat(list.filter(function (x) { return !x.emb; }));
         var items = list.map(function (x, i) {
+            if (x.cc) {   // (turning a live channel's closed captions on: it restarts with them)
+                var c = x.cc;
+                return { label: 'Closed captions (' + c.ch + ')', detail: 'The channel restarts with them',
+                    run: function () { closeMenu(); rememberSub(S.ctx.id, { embedded: true, nth: x.n, lang: c.lang }); P.ccOn(c); } };
+            }
             if (x.emb) {
                 var tr = x.emb, l = textLang(tr);
                 if (_embSub === tr.index) { idx = i; }
-                return { label: 'Built into the file' + (l ? '  (' + l + ')' : '  ·  track ' + (x.n + 1)), sel: _embSub === tr.index,
+                return { label: (S.ctx && S.ctx._relayCc ? 'Closed captions' : 'Built into the file') + (l ? '  (' + l + ')' : '  ·  track ' + (x.n + 1)), sel: _embSub === tr.index,
                     run: function () {
                         _embDelay = 0; _embQueue = []; _embNudge = null; selectEmbeddedSub(tr); rememberSub(S.ctx.id, { embedded: true, index: tr.index, lang: l });
                         if (menuOpen()) { replaceTop(langTracksMenu(key, list)); }
@@ -690,5 +733,6 @@
     P.fileHints = fileHints; P.parseCues = parseCues; P.loadTrack = loadTrack; P.subsOff = subsOff;
     P.resetSubs = resetSubs; P.closeSubs = closeSubs; P.startSubtitles = startSubtitles;
     P.subsBeforeOpen = subsBeforeOpen; P.subsOnTick = subsOnTick; P.subtitleSummary = subtitleSummary;
+    P.wantEmbedded = wantEmbedded;
     P.renderSubs = renderSubs; P.showEmbeddedText = showEmbeddedText; P.subConfigMenu = subConfigMenu; P.langMenu = langMenu;
 })(PlayerParts);