summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--History7
-rw-r--r--channels.js15
-rw-r--r--index.html122
-rw-r--r--settings.js8
4 files changed, 81 insertions, 71 deletions
diff --git a/History b/History
index fcf6566..2515880 100644
--- a/History
+++ b/History
@@ -1,6 +1,11 @@
0.06 More options in Main Menu:
- Audio selection normal,hearing_impaired,visually_impaired (work around for some AC3 channels is to select Hearing_impaired which is still in mpeg)
+ Audio selection normal,hearing_impaired,visually_impaired
cfg.media.subtitling.modepriority, cfg.media.subtitling.typepriority
+ removed cds setting.
+ Fixed : OSD time left/ time played is updated.
+ New BootImage now supports AC3 downmixing, so no more work around by selecting NAR sound track.
+ EPGinfo extended with audio languages read from the stream.
+
0.05 OSD 1920x1088 (16:9) // OSD 1280x720 (16:9) // OSD 704x576 (16:9) But should work on other size too.
diff --git a/channels.js b/channels.js
index 846e13b..d70866d 100644
--- a/channels.js
+++ b/channels.js
@@ -498,8 +498,9 @@ channelsnames[402] = "ZDF (S)";
channels[402] = "S19.2E-1-1079-28006";
channelsnames[403] = "3sat (S)";
channels[403] = "S19.2E-1-1079-28007";
-channelsnames[404] = "WDR Düsseldorf (S)";
-channels[404] = "S19.2E-1-1201-28308";
+channelsnames[404] = "WDR Düsseldorf HD (S)";
+channels[404] = "S19.2E-1-1201-28328";
+// SD channels[404] = "S19.2E-1-1201-28308";
channelsnames[405] = "NDR FS HH (S)";
channels[405] = "S19.2E-1-1073-28225";
channelsnames[406] = "MDR Thüringen (S)";
@@ -1175,8 +1176,9 @@ channelsnames[927] = "CNN (S)";
channels[927] = "S28.2E-2-2018-7140";
channelsnames[928] = "FOX News (S)";
channels[928] = "S28.2E-2-2031-4643";
-channelsnames[929] = "RT (S)";
-channels[929] = "S28.2E-2-2409-50847";
+channelsnames[929] = "RT HD(S)";
+channels[929] = "S28.2E-2-2312-53148";
+//SD channels[929] = "S28.2E-2-2409-50847";
channelsnames[930] = "Al Jazeera Eng (S)";
channels[930] = "S28.2E-2-2412-51107";
channelsnames[931] = "Russia Today (S)";
@@ -1210,10 +1212,15 @@ channelsnames[965] = "RSI LA 1 HD (S)";
channels[965] = "S13.0E-318-1700-14051";
channelsnames[966] = "RSI LA 2 HD (S)";
channels[966] = "S13.0E-318-8500-951";
+channelsnames[967] = "RT HD(S)";
+channels[967] = "S28.2E-2-2312-53148";
channelsnames[968] = "ITV1 London HD (S)";
channels[968] = "S28.2E-2-2049-10000";
channelsnames[969] = "Channel 4 HD (S)";
channels[969] = "S28.2E-2-2068-21200";
+channelsnames[970] = "WDR Düsseldorf HD (S)";
+channels[970] = "S19.2E-1-1201-28328";
+
channelsnames[991] = "NED1 HD (S)"
channels[991] = "S23.5E-3-3208-7035"
diff --git a/index.html b/index.html
index 6bb138d..79e000e 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,6 @@
//
// TODO
//
-// Sound mapping for AC3
// auto epg switch language for EIT Cache
//
// make VDR connection
@@ -28,7 +27,7 @@
//
//
-var Version = "0.05 2012/12/24"
+var Version = "0.06 2012/12/xx"
var nrChannels = channels.length;
var nrMedia = recording.length - 1;
@@ -37,9 +36,12 @@ for (var i = 1; i < nrChannels; i++) { EPG[0][4][i] = "";EPG[1][4][i] = "";EPG[
window.onkeydown = onKeyDown;
function onLoad() {
- createPlayer();
+ createPlayer();
+ if(Experimental){
+ // Space for testing experimental parts.
createRecorder();
- embedTeletextPlugin();
+ }
+ embedTeletextPlugin();
toi.audioOutputService.setVolume(AudioOut, StartVolume);
toi.audioOutputService.setMuteState(AudioOut, false);
showDisplay((currChan.toString()), false, 100, 0 );
@@ -124,15 +126,8 @@ function play(uri) {
mediaPlayer.close();
}
uri = ServerAdres + uri;
- if(Experimental){
- //Space for testing experimental parts.
-
-
-
- } else {
- mediaPlayer.open(uri);
- mediaPlayer.play(1000);
- }
+ mediaPlayer.open(uri);
+ mediaPlayer.play(1000);
if(TimeShift){
initialDelayID = setTimeout("startTimeshiftBuffering();", 5000);
@@ -172,28 +167,32 @@ function onDataAvailableEvent(event) {
function updateStreamInfo() {
-alert("What can this stream do : " + mediaPlayer.getCapabilities());
+//alert("What can this stream do : " + mediaPlayer.getCapabilities());
var streamInfo = mediaPlayer.getStreamInfo();
var cList = streamInfo.availableComponents;
var x;
+xx = 0;
+AudioInfo[currChan] = "";
for(x=0; x<cList.length;x++) {
-alert ("Read StreamINFO " + cList[x].type);
+//alert ("Read StreamINFO " + cList[x].type);
if(cList[x].type == 0) {
- alert("language : " + mediaPlayer.getAudioStreamInfo(cList[x]).language);
- alert("audienceType : " + mediaPlayer.getAudioStreamInfo(cList[x]).audienceType);
- alert("channelFormat : " + mediaPlayer.getAudioStreamInfo(cList[x]).channelFormat);
- alert("channelMode : " + mediaPlayer.getAudioStreamInfo(cList[x]).channelMode);
- alert("encoding : " + mediaPlayer.getAudioStreamInfo(cList[x]).encoding);
- alert("sublanguage : " + mediaPlayer.getAudioStreamInfo(cList[x]).sublanguage);
- alert("sampleRate : " + mediaPlayer.getAudioStreamInfo(cList[x]).sampleRate);
+ xx = xx + 1;
+ AudioInfo[currChan] = AudioInfo[currChan] + " Audio " + xx + " " + mediaPlayer.getAudioStreamInfo(cList[x]).encoding + " - " + mediaPlayer.getAudioStreamInfo(cList[x]).language + " , ";
+// alert("language : " + mediaPlayer.getAudioStreamInfo(cList[x]).language);
+// alert("audienceType : " + mediaPlayer.getAudioStreamInfo(cList[x]).audienceType);
+// alert("channelFormat : " + mediaPlayer.getAudioStreamInfo(cList[x]).channelFormat);
+// alert("channelMode : " + mediaPlayer.getAudioStreamInfo(cList[x]).channelMode);
+// alert("encoding : " + mediaPlayer.getAudioStreamInfo(cList[x]).encoding);
+// alert("sublanguage : " + mediaPlayer.getAudioStreamInfo(cList[x]).sublanguage);
+// alert("sampleRate : " + mediaPlayer.getAudioStreamInfo(cList[x]).sampleRate);
}
if(cList[x].type == 1) {
- alert("aspectRatio : " + mediaPlayer.getVideoStreamInfo(cList[x]).aspectRatio);
- alert("activeFormatDescriptor : " + mediaPlayer.getVideoStreamInfo(cList[x]).activeFormatDescriptor);
- alert("frameRate : " + mediaPlayer.getVideoStreamInfo(cList[x]).frameRate);
- alert("componentTag : " + mediaPlayer.getVideoStreamInfo(cList[x]).componentTag);
- alert("resolutionX : " + mediaPlayer.getVideoStreamInfo(cList[x]).resolutionX);
- alert("resolutionY : " + mediaPlayer.getVideoStreamInfo(cList[x]).resolutionY);
+// alert("aspectRatio : " + mediaPlayer.getVideoStreamInfo(cList[x]).aspectRatio);
+// alert("activeFormatDescriptor : " + mediaPlayer.getVideoStreamInfo(cList[x]).activeFormatDescriptor);
+// alert("frameRate : " + mediaPlayer.getVideoStreamInfo(cList[x]).frameRate);
+// alert("componentTag : " + mediaPlayer.getVideoStreamInfo(cList[x]).componentTag);
+// alert("resolutionX : " + mediaPlayer.getVideoStreamInfo(cList[x]).resolutionX);
+// alert("resolutionY : " + mediaPlayer.getVideoStreamInfo(cList[x]).resolutionY);
}
@@ -452,6 +451,8 @@ function onKeyDown(event) {
if(isFullscreen) {
// fullscreen
if(!count) {
+ updateOSDtime(currChan);
+ osdepg.innerHTML = "<p>" + EPG[0][7][currChan] + "</p>\n<p>" + EPG[1][7][currChan] + "</p>";
showOSD();
} else {
CheckChannel(Change);
@@ -743,10 +744,37 @@ function OSDhtml(){
osdtime.innerHTML = result;
osdname.innerHTML = Left(channelsnames[currChan],30);
osdepg.innerHTML = "<p>" + EPG[0][7][currChan] + "</p>\n<p>" + EPG[1][7][currChan] + "</p>";
- osdepginfo.innerHTML = "<center><p style='color:white;' >" + currChan + "\uE003" + channelsnames[currChan] + "</p><p style='color:white;'>" + EPG[0][7][currChan] + "</p>\n<p style='color:yellow;'>" + EPG[0][4][currChan] + "</p>\n<p>" + Left(EPG[0][5][currChan],750) + "</p></center>";
+ osdepginfo.innerHTML = "<center><p style='color:white;' >" + currChan + "\uE003" + channelsnames[currChan] + "</p>" + AudioInfo[currChan] + "<p style='color:white;'>" + EPG[0][7][currChan] + "</p>\n<p style='color:yellow;'>" + EPG[0][4][currChan] + "</p>\n<p>" + Left(EPG[0][5][currChan],750) + "</p></center>";
osdepginfonext.innerHTML = "<center><p style='color:white;'>" + currChan + "\uE003" + channelsnames[currChan] + "</p><p style='color:white;'>" + EPG[1][7][currChan] + "</p>\n<p style='color:yellow;'>" + EPG[1][4][currChan] + "</p>\n<p>" + Left(EPG[1][5][currChan],750) + "</p></center>";
}
+function updateOSDtime(timchan) {
+
+ tijd = EPG[0][2][timchan];
+ date = new Date(tijd*1000);
+ tijd = date.toUTCString();
+ tijd = new Date(tijd);
+ dateCurrent = new Date();
+ var EPGminutes = Math.floor((dateCurrent.getTime() - date.getTime()) /1000/60);
+ var tm = tijd.getMinutes();
+ var th = tijd.getHours();
+ if(th<10)
+ {
+ th = "0"+th;
+ }
+ if(tm<10)
+ {
+ tm = "0"+tm;
+ }
+
+ EPG[0][7][timchan] = th + ":" + tm + " (" + EPGminutes + " / " + ((EPG[0][3][timchan])-EPGminutes).toFixed(0) + ")" + " " + EPG[0][1][timchan] + " ";
+ if (!EPG[0][2][timchan])
+ {
+ EPG[0][7][timchan] = " ";
+ }
+
+}
+
function settimer() {
if(SwitchTimer) {
@@ -875,7 +903,6 @@ function GetEPG(epgchan)
EPG[1][7][epgchan] = "";
EPGShortnext = "";
EPGExtnext = "";
- cds = 0;
SI="";
try {
@@ -915,33 +942,7 @@ function GetEPG(epgchan)
} else {
EPG[0][5][epgchan] = "";
}
- tijd = event.time;
- date = new Date(tijd*1000);
- tijd = date.toUTCString();
- tijd = new Date(tijd);
- dateCurrent = new Date();
- var EPGminutes = Math.floor((dateCurrent.getTime() - date.getTime()) /1000/60);
- var tm = tijd.getMinutes();
- var th = tijd.getHours();
- if(th<10)
- {
- th = "0"+th;
- }
- if(tm<10)
- {
- tm = "0"+tm;
- }
- if(cds){
- // CDS has short info, other providers, a little longer.
- EPG[0][7][epgchan] = th + ":" + tm + " (" + EPGminutes + " / " + ((event.duration/60)-EPGminutes).toFixed(0) + ")" + " " + event.name + " " + EPGShortnow;
- } else {
- EPG[0][7][epgchan] = th + ":" + tm + " (" + EPGminutes + " / " + ((event.duration/60)-EPGminutes).toFixed(0) + ")" + " " + event.name + " ";
- }
- if (!event.time)
- {
- EPG[0][7][epgchan] = " ";
- }
-
+ updateOSDtime(epgchan);
event = eitCache.getFollowingEvent(eitService);
if (Extok) {
@@ -987,12 +988,8 @@ function GetEPG(epgchan)
tm = "0"+tm;
}
- if(cds){
- // CDS has short info, other providers, a little longer.
- EPG[1][7][epgchan] = th + ":" + tm + " (" + (event.duration/60).toFixed(0) + ")" + " " + event.name + " " + EPGShortnext;
- } else {
EPG[1][7][epgchan] = th + ":" + tm + " (" + (event.duration/60).toFixed(0) + ")" + " " + event.name + " ";
- }
+
if (!event.time)
{
EPG[1][7][epgchan] = " ";
@@ -1097,7 +1094,6 @@ function StreamInfo(si) {
if(SI[1]=="3" || SI[1]=="53") {
//Canal Digitaal/ TV Vlaanderen (NID:3 is used for more than only CDS/TVV on 23East)
is.setObject("cfg.locale.ui","dut",is.STORAGE_VOLATILE);
- cds = 1;
}
if((SI[0]=="S13.0E" && SI[3]=="14003") || (SI[0]=="S13.0E" && SI[3]=="14009") || (SI[0]=="S13.0E" && SI[3]=="14051") || (SI[0]=="S13.0E" && SI[3]=="951")) {
diff --git a/settings.js b/settings.js
index ad32c8d..7a0b907 100644
--- a/settings.js
+++ b/settings.js
@@ -122,7 +122,6 @@ var osdtimeout = 0;
var osdVolumetimeout = 0;
var epgactive = 0;
var preChan = 0;
-var cds = 1;
var timerChan = 10;
var TimerActions = "";
var switchtimerID = 0;
@@ -135,10 +134,10 @@ var CAicon = "\uE00D";
var fsAudio = (16*Yfactor) + "px";
var fsTime = (16*Yfactor) + "px";
var fsName = (27*Yfactor) + "px";
-var fsMenu = (20*Yfactor) + "px";
+var fsMenu = (18*Yfactor) + "px";
var fsChan = (43*Yfactor) + "px";
var fsCA = (32*Yfactor) + "px";
-var fsMenuMain = (40*Yfactor) + "px";
+var fsMenuMain = (35*Yfactor) + "px";
var fsEpg = (19*Yfactor) + "px";
var fsEpginfo = (21*Yfactor) + "px";
var fsList = (18*Yfactor) + "px";
@@ -149,6 +148,9 @@ var fsReclist = (19*Yfactor) + "px";
var fsMedia = (27*Yfactor) + "px";
var fsKeys = (19*Yfactor) + "px";
+var AudioInfo = new Array();
+var xx = 0;
+
var isRecording = 0; // set by recording subroutine
var audiotype = 0; // used for selecting "cfg.media.audio.typepriority","normal,hearing_impaired,visually_impaired"
var subsmode = 0; // "cfg.media.subtitling.modepriority","Teletext,DVB"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 14:57:24 +0000