From e75ae50c0c1db450218b8416e7ef41b514f5202c Mon Sep 17 00:00:00 2001
From: Cat <carinasadres@gmail.com>
Date: Tue, 24 Oct 2017 16:21:57 +0200
Subject: [PATCH] Embed: support for new subtitle track format

---
 embed/core.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/embed/core.js b/embed/core.js
index ff9a1e19..b12ded02 100644
--- a/embed/core.js
+++ b/embed/core.js
@@ -455,13 +455,13 @@ MistPlayer.prototype.buildMistControls = function(){
           if ('name' in tracks[i][j]) {
             name = tracks[i][j].name;
           }
+          else if ('desc' in tracks[i][j]) {
+            name = tracks[i][j].desc;
+          }
           else if ('lang' in tracks[i][j]) {
             name = tracks[i][j].lang;
             o.setAttribute('data-lang',tracks[i][j].lang);
           }
-          else if ('desc' in tracks[i][j]) {
-            name = tracks[i][j].desc;
-          }
           else {
             name = 'Track '+(Number(j)+1);
           }
@@ -1148,20 +1148,25 @@ function mistPlay(streamName,options) {
           var skip = false;
           switch (t.type) {
             case 'video':
-              t.desc = [t.width+'x'+t.height,/*Math.round(t.bps/1024)+'kbps',*/t.fpks/1e3+'fps',t.codec];
+              t.desc = [t.width+'x'+t.height,Math.round(t.bps/1024)+'kbps',t.fpks/1e3+'fps',t.codec];
               if (t.lang) {
-                t.desc.unshift(t.lang);
+                t.desc.unshift(t.language);
               }
               break;
             case 'audio':
-              t.desc = [(t.channels == 2 ? 'Stereo' : (t.channels == 1 ? 'Mono' : t.channels+' channels')),/*Math.round(t.bps/1024)+'kbps',*/Math.round(t.rate/1000)+'kHz',t.codec];
+              t.desc = [(t.channels == 2 ? 'Stereo' : (t.channels == 1 ? 'Mono' : t.channels+' channels')),Math.round(t.bps/1024)+'kbps',Math.round(t.rate/1000)+'kHz',t.codec];
               if (t.lang) {
-                t.desc.unshift(t.lang);
+                t.desc.unshift(t.language);
               }
               break;
+            case 'meta':
             case 'subtitle':
-              t.desc = [t.lang,t.codec];
-              break;
+              //subtitles are type meta and codec subtitle in Mist > v2.13, still support type subtitle though
+              if ((t.type == 'subtitle') || (t.codec == 'subtitle')) {
+                t.type = "subtitle";
+                t.desc = [t.language];
+                break;
+              }
             default:
               skip = true;
               break;