summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheTroll <trolldev@gmail.com>2010-03-18 11:18:58 +0100
committerTheTroll <trolldev@gmail.com>2010-03-18 11:18:58 +0100
commit41f916381f7236e05df3d92090137667ada5a741 (patch)
treebe8f5d68f43e1a64a9ed46202f358040a2c6cd09
parentdbed07971b2681ea1639978b26201530ff68b888 (diff)
parentbeecdfa67aa0067a69e948c6903c85b6baa03375 (diff)
downloadistreamdev-41f916381f7236e05df3d92090137667ada5a741.tar.gz
istreamdev-41f916381f7236e05df3d92090137667ada5a741.tar.bz2
Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery
* 'jquery' of projects.vdr-developer.org:istreamdev: added enc status fix type added type in running status removed Live on active session
-rw-r--r--js/istreamdev.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/js/istreamdev.js b/js/istreamdev.js
index 763dd3a..2218667 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -184,10 +184,13 @@ var dataString = "action=getRunningSessions";
session = broadcast.session;
name = broadcast.name;
type = broadcast.type;
+ encoding = broadcast.encoding;
+ if (encoding == 1) { encstatus = '*'; }
+ else { encstatus = ''; }
if (type == 'tv') { var pic='tv.png'; }
else if (type == 'rec') { var pic='record.png'; }
else if (type == 'vid') { var pic='video.png'; }
- $('#home #runningsessions').append('<li class="arrow"><a rel="' + session + '" href="#"><img class="menuicon" src="img/' + pic + '" /><span class="menuname">*Live: ' + name + '</span></a></li>');
+ $('#home #runningsessions').append('<li class="arrow"><a rel="' + session + '" href="#"><img class="menuicon" src="img/' + pic + '" /><span class="menuname">' + encstatus + name + '</span></a></li>');
});
$('#home #runningsessions').append('<li><a rel="killsessions" href="#"><span class="menuname">Stop all sessions</span></a></li>');
}