nuvio-tizen 1.4.0 → 1.6.0

package/README.md

@@ -20,8 +20,15 @@ core behaviour, targeting 2017 Samsung TVs (Tizen 3.0, ~Chromium 47).
 - **Stream aggregation** across all installed stream addons, each source showing
   **size + languages/description** (from `behaviorHints.videoSize` and the addon's own text,
   e.g. MediaFusion / Torrentio).
-- **In-player menu** (press **UP**): *Select source* (switch stream mid-playback, keeping
-  your position) and *Configure subtitles* → Language / Size / Style.
+- **In-player menu** (press **UP**):
+  - *Select source* — switch stream mid-playback (keeps your position), each source shown
+    on two lines (name + size / seeds / languages).
+  - *Audio track* — shown only when the stream has more than one audio track
+    (AVPlay `getTotalTrackInfo` / `setSelectTrack`).
+  - *Restart from beginning*, *Skip back 10 minutes*, *Skip forward 10 minutes*
+    (hidden for live streams).
+  - *Configure subtitles* → *Language* (2 levels: language → the tracks within it),
+    *Size*, *Style*.
 - **Subtitles from addons**: fetched per title/episode, SRT + VTT parsed and rendered as a
   timed overlay; press **UP** during playback to pick a track (or turn them Off).
   Configurable in Settings: **default language** (auto-loads a matching track),

package/css/style.css

@@ -116,8 +116,11 @@ html, body {
 #sub-menu { position: absolute; right: 60px; bottom: 250px; width: 560px; max-height: 620px; overflow: hidden; z-index: 30; background: rgba(20,25,36,0.98); border-radius: 12px; padding: 18px; }
 #sub-menu .sm-title { font-size: 24px; font-weight: bold; margin-bottom: 12px; color: #c7cbd4; }
 #sub-menu .sm-list { max-height: 520px; overflow: hidden; }
-#sub-menu .sm-item { padding: 12px 16px; font-size: 22px; border-radius: 8px; border: 3px solid transparent; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+#sub-menu .sm-item { padding: 12px 16px; border-radius: 8px; border: 3px solid transparent; }
+#sub-menu .sm-item .sm-main { font-size: 22px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+#sub-menu .sm-item .sm-detail { font-size: 16px; color: #9aa2b1; margin-top: 3px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
 #sub-menu .sm-item.sel { background: #818cf8; color: #0e1117; }
+#sub-menu .sm-item.sel .sm-detail { color: #26304a; }
 
 /* --- Search --- */
 .search-wrap { position: absolute; top: 120px; left: 60px; right: 60px; bottom: 40px; }

package/js/player.js

@@ -43,13 +43,16 @@ var Player = (function () {
     var _osdTimer = null;
     var _seekPending = 0;
 
+    // audio
+    var _audioIdx = null;    // currently selected audio track index
+
     // subtitles
     var _subTracks = [];     // [{lang,url,_addon}]
     var _cues = null;        // [{start,end,text}]
     var _subOn = false;
     var _subLabel = '';
+    var _subTrackUrl = '';
     var _menuOpen = false;
-    var _menuIdx = 0;
 
     function init() {
         objEl = U.byId('av-player');
@@ -124,9 +127,10 @@ var Player = (function () {
         _isLive = (ctx.type === 'tv') || !!ctx.isLive;
         _ctx.resumeSec = ctx.resumeSec || getResume(ctx.type, ctx.id);
 
-        // reset subtitle state
-        _subTracks = []; _cues = null; _subOn = false; _subLabel = '';
-        _menuOpen = false; _menuIdx = 0;
+        // reset subtitle + audio state
+        _subTracks = []; _cues = null; _subOn = false; _subLabel = ''; _subTrackUrl = '';
+        _audioIdx = null;
+        _menuOpen = false;
         subsEl.className = 'hidden'; U.clear(subsEl);
         subMenuEl.className = 'hidden';
         updateHint();
@@ -192,6 +196,7 @@ var Player = (function () {
                 try { _dur = avplay.getDuration() / 1000; } catch (e3) { _dur = 0; }
                 markLiveFromDuration();
                 updateHint();
+                try { var atr = getAudioTracks(); _audioIdx = atr.length ? atr[0].index : null; } catch (eA) {}
                 if (!_isLive && _ctx.resumeSec > 5) { try { avplay.seekTo(_ctx.resumeSec * 1000); } catch (e4) {} }
                 avplay.play();
                 renderOSD();
@@ -249,9 +254,9 @@ var Player = (function () {
         showOSD(false);
     }
 
-    function seekBy(delta) {
+    function seekTo(sec) {
         if (_isLive) { showOSD(false); U.toast('Live — seeking unavailable', 1500); return; }
-        var target = Math.max(0, Math.min((_dur || 1e9), _cur + delta));
+        var target = Math.max(0, Math.min((_dur || 1e9), sec));
         _cur = target;
         renderOSD();
         showOSD(false);
@@ -262,6 +267,8 @@ var Player = (function () {
         }
     }
 
+    function seekBy(delta) { seekTo(_cur + delta); }
+
     // ---------- subtitles ----------
     // Parses SRT or VTT (both use HH:MM:SS,mmm / HH:MM:SS.mmm timing lines).
     function parseCues(text) {
@@ -309,17 +316,62 @@ var Player = (function () {
         U.getText(track.url, 15000).then(function (text) {
             var cues = parseCues(text);
             if (!cues.length) { U.toast('Could not parse subtitles'); return; }
-            _cues = cues; _subOn = true; _subLabel = track.lang || 'on';
+            _cues = cues; _subOn = true; _subLabel = track.lang || 'on'; _subTrackUrl = track.url;
             renderSubs();
             U.toast('Subtitles: ' + (track.lang || 'on'));
         }, function () { U.toast('Failed to download subtitles'); });
     }
 
     function subsOff() {
-        _subOn = false; _cues = null; _subLabel = '';
+        _subOn = false; _cues = null; _subLabel = ''; _subTrackUrl = '';
         subsEl.className = 'hidden'; U.clear(subsEl);
     }
 
+    // ---------- audio tracks ----------
+    function getAudioTracks() {
+        if (useAV) {
+            try {
+                var all = avplay.getTotalTrackInfo() || [];
+                var out = [];
+                for (var i = 0; i < all.length; i++) {
+                    if (('' + all[i].type).toUpperCase() === 'AUDIO') { out.push(all[i]); }
+                }
+                return out;
+            } catch (e) { return []; }
+        }
+        try {
+            var at = videoEl.audioTracks, arr = [];
+            if (at) {
+                for (var j = 0; j < at.length; j++) {
+                    arr.push({ index: j, extra_info: JSON.stringify({ language: at[j].language || at[j].label }) });
+                }
+            }
+            return arr;
+        } catch (e2) { return []; }
+    }
+
+    function audioLabel(tr, n) {
+        var info = tr.extra_info;
+        try { if (typeof info === 'string') { info = JSON.parse(info); } } catch (e) { info = null; }
+        var lang = info && (info.language || info.lang);
+        var ch = info && (info.channels || info.channel);
+        var parts = [];
+        parts.push((lang && lang !== 'und' && lang !== '') ? lang : ('Audio ' + (n + 1)));
+        if (ch) { parts.push(ch + 'ch'); }
+        return parts.join('  ·  ');
+    }
+
+    function selectAudio(index) {
+        if (useAV) {
+            try { avplay.setSelectTrack('AUDIO', index); }
+            catch (e) { try { avplay.setSelectTrack('AUDIO', '' + index); } catch (e2) {} }
+        } else {
+            try { var at = videoEl.audioTracks; for (var i = 0; i < at.length; i++) { at[i].enabled = (i === index); } } catch (e3) {}
+        }
+        _audioIdx = index;
+        U.toast('Audio track changed');
+    }
+
     function applyStyleNow() {
         var span = subsEl.firstChild;
         if (span) { styleSpan(span); }
@@ -362,8 +414,10 @@ var Player = (function () {
         subMenuEl.appendChild(U.el('div', 'sm-title', m.title));
         var list = U.el('div', 'sm-list');
         m.items.forEach(function (it, i) {
-            var label = it.label + (it.sel ? '  ✓' : '');
-            list.appendChild(U.el('div', 'sm-item' + (i === m.idx ? ' sel' : ''), label));
+            var node = U.el('div', 'sm-item' + (i === m.idx ? ' sel' : ''));
+            node.appendChild(U.el('div', 'sm-main', it.label + (it.sel ? '  ✓' : '')));
+            if (it.detail) { node.appendChild(U.el('div', 'sm-detail', it.detail)); }
+            list.appendChild(node);
         });
         subMenuEl.appendChild(list);
         var sel = list.children[m.idx];
@@ -375,16 +429,37 @@ var Player = (function () {
         if (_ctx.streams && _ctx.streams.length) {
             items.push({ label: 'Select source', run: function () { pushMenu(sourceMenu()); } });
         }
+        if (getAudioTracks().length > 1) {
+            items.push({ label: 'Audio track', run: function () { pushMenu(audioMenu()); } });
+        }
+        if (!_isLive) {
+            items.push({ label: 'Restart from beginning', run: function () { seekTo(0); closeMenu(); } });
+            items.push({ label: 'Skip back 10 minutes', run: function () { seekBy(-600); closeMenu(); } });
+            items.push({ label: 'Skip forward 10 minutes', run: function () { seekBy(600); closeMenu(); } });
+        }
         items.push({ label: 'Configure subtitles', run: function () { pushMenu(subConfigMenu()); } });
         return { title: 'Menu', items: items, idx: 0 };
     }
 
     function sourceMenu() {
-        var items = _ctx.streams.map(function (s) {
-            return { label: s.label || 'Source', sel: (s.url === _ctx.url),
+        var idx = 0;
+        var items = _ctx.streams.map(function (s, i) {
+            if (s.url === _ctx.url) { idx = i; }
+            return { label: s.label || 'Source', detail: s.detail || '', sel: (s.url === _ctx.url),
                 run: function () { switchSource(s); closeMenu(); } };
         });
-        return { title: 'Select source', items: items, idx: 0 };
+        return { title: 'Select source', items: items, idx: idx };
+    }
+
+    function audioMenu() {
+        var tracks = getAudioTracks();
+        var idx = 0;
+        var items = tracks.map(function (tr, i) {
+            if (tr.index === _audioIdx) { idx = i; }
+            return { label: audioLabel(tr, i), sel: (tr.index === _audioIdx),
+                run: function () { selectAudio(tr.index); closeMenu(); } };
+        });
+        return { title: 'Audio track', items: items, idx: idx };
     }
 
     function subConfigMenu() {
@@ -395,16 +470,36 @@ var Player = (function () {
         ] };
     }
 
+    // Level 1: Off + one row per language (with option count).
     function langMenu() {
-        var items = [{ label: 'Off', sel: !_subOn, run: function () { subsOff(); closeMenu(); } }];
+        var byLang = {}, order = [];
         _subTracks.forEach(function (tr) {
-            items.push({ label: (tr.lang || 'unknown') + '  ·  ' + (tr._addon || ''),
-                sel: (_subOn && _subLabel === (tr.lang || 'on')),
-                run: function () { loadTrack(tr); closeMenu(); } });
+            var l = tr.lang || 'unknown';
+            if (!byLang[l]) { byLang[l] = []; order.push(l); }
+            byLang[l].push(tr);
+        });
+        var items = [{ label: 'Off', sel: !_subOn, run: function () { subsOff(); closeMenu(); } }];
+        order.forEach(function (l) {
+            var n = byLang[l].length;
+            items.push({ label: l, detail: n + ' option' + (n > 1 ? 's' : ''),
+                sel: (_subOn && _subLabel === l),
+                run: function () { pushMenu(langTracksMenu(l, byLang[l])); } });
         });
         return { title: 'Subtitle language', items: items, idx: 0 };
     }
 
+    // Level 2: the individual tracks within one language.
+    function langTracksMenu(lang, tracks) {
+        var idx = 0;
+        var items = tracks.map(function (tr, i) {
+            if (_subTrackUrl === tr.url) { idx = i; }
+            return { label: (tr._addon || 'Source') + '  ·  option ' + (i + 1),
+                sel: (_subTrackUrl === tr.url),
+                run: function () { loadTrack(tr); closeMenu(); } };
+        });
+        return { title: lang + ' subtitles', items: items, idx: idx };
+    }
+
     function optionMenu(title, key, opts) {
         var cfg = getSubCfg();
         var idx = 0;

package/js/views.js

@@ -360,7 +360,15 @@ var Views = (function () {
                 if (!playable) { U.toast('This source can’t play directly on the TV.'); return; }
                 var sources = _d.streams.filter(Stremio.isPlayable).map(function (st) {
                     var sz = Stremio.streamSize(st);
-                    return { url: st.url, label: (st._addon ? st._addon + '  ·  ' : '') + Stremio.streamName(st) + (sz ? '  ·  ' + sz : '') };
+                    var desc = Stremio.streamDescription(st).replace(/\n/g, '   ');
+                    var dparts = [];
+                    if (sz && !/(TB|GB|MB)\b/i.test(desc)) { dparts.push('💾 ' + sz); }
+                    if (desc) { dparts.push(desc); }
+                    return {
+                        url: st.url,
+                        label: (st._addon ? st._addon + '  ·  ' : '') + Stremio.streamName(st),
+                        detail: dparts.join('   ')
+                    };
                 });
                 Player.play({
                     url: stream.url, type: _d.type, id: _d.streamId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuvio-tizen",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "Nuvio-style Stremio-addon streaming client for Tizen 3.0+ Samsung TVs (TizenBrew app module).",
   "packageType": "app",
   "appName": "Nuvio",