added content info from stream to epg

updated some channels

5 files changed, 65 insertions, 31 deletions

diff --git a/History b/History
index 1b6b7ed..1a86c1f 100644
--- a/History
+++ b/History
@@ -7,7 +7,8 @@ VDR 1.7.29
 	SearchTimers Submenu.
 	Channels updates
 	In guideview you can have updates for all channels in view, was changed because it was too slow on 1910/1960 but 1963/1903 can handle it.
-	Added PG info.
+	Added PG & content info.
+	fixed show double epg info (epg shortinfo = epg ext. info)
 
 
 0.19	Added SleepTimer in menu 1 Settings. (Key is stopbutton)
diff --git a/channels.js b/channels.js
index bc26713..f082250 100644
--- a/channels.js
+++ b/channels.js
@@ -60,16 +60,12 @@ channelsnames[11] = "RTL8 (S)";
 channels[11] = "S19.2E-53-1097-2035";
 channelsnames[12] = "Nickelodeon (S)";
 channels[12] = "S19.2E-1-1078-28679";
-channelsnames[13] = "Comedy Central/Kindernet (S)";
-channels[13] = "S19.2E-53-1097-2036";
+channelsnames[13] = "ComedyCentral/Kindernet (S)";
+channels[13] = "S23.5E-3-3211-20826";
 channelsnames[14] = "Discovery (S)";
 channels[14] = "S19.2E-53-1097-2015";
-channelsnames[15] = "Animal Planet/TLC (S)";
+channelsnames[15] = "TLC Netherlands (S)";
 channels[15] = "S19.2E-53-1097-2020";
-channelsnames[16] = "NGC (S)";
-channels[16] = "S19.2E-53-1105-4015";
-channelsnames[17] = "Investigation Discovery (T)"
-channels[17] = "T-8720-2244-44"
 channelsnames[18] = "NG Wild DUT (S)";
 channels[18] = "S23.5E-3-3210-5145";
 channelsnames[19] = "History channel DUT (S)";
@@ -108,7 +104,6 @@ channels[34] = "S23.5E-3-3211-20820";
 channelsnames[35] = "Omroep Zeeland Televisie (S)";
 channels[35] = "S23.5E-3-3211-20818";
 
-
 channelsnames[40] = "een (MPEG4) (S)";
 channels[40] = "S19.2E-53-1119-12801";
 channelsnames[41] = "Canvas (MPEG4) (S)";
@@ -121,12 +116,9 @@ channelsnames[44] = "2BE (MPEG4) (S)";
 channels[44] = "S19.2E-53-1119-12812";
 channelsnames[45] = "VIJF (MPEG4) (S)";
 channels[45] = "S19.2E-53-1119-12820";
-channelsnames[46] = "KetOp12 (S)";
+channelsnames[46] = "KetNet (MPEG4) (S)";
 channels[46] = "S19.2E-53-1119-12808";
 
-channelsnames[49] = "Informatiekanaal (S)";
-channels[49] = "S19.2E-53-1119-12826";
-
 channelsnames[50] = "DMAX (S)";
 channels[50] = "S19.2E-133-33-63";
 channelsnames[51] = "Discovery (S)";
diff --git a/channels6.js b/channels6.js
index a2669a9..6ce5b54 100644
--- a/channels6.js
+++ b/channels6.js
@@ -65,18 +65,16 @@ channelsnames[6029] = "SCT HD (S)";
 channels[6029]="S13.0E-318-5000-10";
 channelsnames[6030] = "Redlight 3D-HD (S)";
 channels[6030]="S13.0E-318-15800-16932";
-channelsnames[6032] = "EroX HD (S)";
-channels[6032]="S23.5E-3-3206-5414";
-channelsnames[6033] = "EroXX HD (S)";
-channels[6033]="S23.5E-3-3206-5411";
-channelsnames[6034] = "EroXXX HD (S)";
-channels[6034]="S23.5E-3-3206-5412";
+channelsnames[6032] = "EROX (S)";
+channels[6032]="S23.5E-3-3212-14052";
+channelsnames[6034] = "EROXXX (S)";
+channels[6034]="S23.5E-3-3212-14055";
 channelsnames[6035] = "Penthouse HD (S)";
-channels[6035]="S23.5E-3-3226-5607";
+channels[6035]="S23.5E-3-3236-5711";
 channelsnames[6036] = "Penthouse HD1 (S)";
-channels[6036]="S23.5E-3-3226-5608";
+channels[6036]="S23.5E-3-3236-5712";
 channelsnames[6037] = "Penthouse HD2 (S)";
-channels[6037]="S23.5E-3-3226-5602";
+channels[6037]="S23.5E-3-3236-5713";
 channelsnames[6038] = "Private Spice (S)";
 channels[6038]="S23.5E-3-3202-6072";
 channelsnames[6039] = "Penthouse HD (S)";
diff --git a/index.html b/index.html
index 3ac9ddf..84e4af6 100644
--- a/index.html
+++ b/index.html
@@ -23,7 +23,7 @@
 //
 //
 
-var Version = "0.20.2"
+var Version = "0.20.4"
 
 for (var x = 0;  x < 10; x++) { 
 	if (minChan[x]) {
@@ -966,8 +966,8 @@ function OSDhtml(){
 	    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>" + AudioInfo[currChan] + "<p style='color:white;'>" + EPG[0][7][currChan] + EPG[0][8][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] + EPG[1][8][currChan] + "</p>\n<p style='color:yellow;'>" + EPG[1][4][currChan] + "</p>\n<p>" + Left(EPG[1][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] + EPG[0][9][currChan] + EPG[0][8][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] + EPG[1][9][currChan] + EPG[1][8][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) {
@@ -1169,11 +1169,20 @@ function GetEPG(epgchan)
 	EPG[0][4][epgchan] = "";
 	EPG[0][5][epgchan] = "";
 	if (event.parentalRating) {
-	EPG[0][8][epgchan] = "( from " + (event.parentalRating + 3) + ")";
+		EPG[0][8][epgchan] = "<br>( from " + (event.parentalRating + 3) + ")";
 	} else {
-	EPG[0][8][epgchan] = "";
+		EPG[0][8][epgchan] = "";
 	}
 
+	if (event.contentNibbles) {
+		connib = event.contentNibbles;
+		Nibbles();
+		EPG[0][9][epgchan] = "<br>" + content;
+	} else {
+		EPG[0][9][epgchan] = "";
+	}
+
+
 	if(EPGShortnow) {
 	EPG[0][4][epgchan] = EPGShortnow;
 	} else {
@@ -1184,6 +1193,9 @@ function GetEPG(epgchan)
 	} else {
 	EPG[0][5][epgchan] = "";
 	}
+
+	if (EPG[0][5][epgchan] = EPG[0][4][epgchan]) { EPG[0][5][epgchan] = "";}
+
 	updateOSDtime(epgchan);
 
 	 event = eitCache.getFollowingEvent(eitService);
@@ -1203,11 +1215,18 @@ function GetEPG(epgchan)
 	EPG[1][4][epgchan] = "";
 	EPG[1][5][epgchan] = "";
 	if (event.parentalRating) {
-	EPG[1][8][epgchan] = "( from " + (event.parentalRating + 3) + ")";
+		EPG[1][8][epgchan] = "<br>( from " + (event.parentalRating + 3) + ")";
 	} else {
-	EPG[1][8][epgchan] = "";
+		EPG[1][8][epgchan] = "";
 	}
 
+	if (event.contentNibbles) {
+		connib = event.contentNibbles;
+		Nibbles();
+		EPG[1][9][epgchan] = "<br>" + content;
+	} else {
+		EPG[1][9][epgchan] = "";
+	}
 
 	if(EPGShortnext) {
 	EPG[1][4][epgchan] = EPGShortnext;
@@ -1219,6 +1238,9 @@ function GetEPG(epgchan)
 	} else {
 	EPG[1][5][epgchan] = "";
 	}
+	
+	if (EPG[1][5][epgchan] = EPG[1][4][epgchan]) { EPG[1][5][epgchan] = "";}
+
 	tijd = event.time;
 	date = new Date(tijd*1000); 
 	tijd = date.toUTCString();
@@ -1242,6 +1264,22 @@ function GetEPG(epgchan)
 } 
 
 
+function Nibbles() {
+	content = "";
+	if (connib >= 0x00001000 && connib < 0x00002000) { content = "Movie/Drama"; }
+	if (connib >= 0x00002000 && connib < 0x00003000) { content = "News/Current affairs"; }
+	if (connib >= 0x00003000 && connib < 0x00004000) { content = "Show/Game show"; }
+	if (connib >= 0x00004000 && connib < 0x00005000) { content = "Sports"; }
+	if (connib >= 0x00005000 && connib < 0x00006000) { content = "Children's/Youth programmes"; }
+	if (connib >= 0x00006000 && connib < 0x00007000) { content = "Music/Ballet/Dance"; }
+	if (connib >= 0x00007000 && connib < 0x00008000) { content = "Arts/Culture (without music)"; }
+	if (connib >= 0x00008000 && connib < 0x00009000) { content = "Social/Political issues/Economics"; }
+	if (connib >= 0x00009000 && connib < 0x0000A000) { content = "Education/Science/Factual topics"; }
+	if (connib >= 0x0000A000 && connib < 0x0000B000) { content = "Leisure hobbies"; }
+	if (connib >= 0x0000B000 && connib < 0x0000C000) { content = "Special characteristics"; }
+	alert(connib);
+}
+
 
 function GetSchedule(schchan,tablelength){
 	SI = "";
diff --git a/settings.js b/settings.js
index 7f5b70f..3a6eb0b 100644
--- a/settings.js
+++ b/settings.js
@@ -127,8 +127,8 @@ var files = new Array();
 //		5 = extinfo
 //		6 = eventid
 //		7 = EPGNow / EPGNext
-//		8 = parentalRating
-
+//		8 = ParentalRating
+//		9 = ContentNibbles
 var EPG = new Array();
 EPG[0] = new Array();
 EPG[1] = new Array();
@@ -141,6 +141,7 @@ EPG[0][5] = new Array();
 EPG[0][6] = new Array();
 EPG[0][7] = new Array();
 EPG[0][8] = new Array();
+EPG[0][9] = new Array();
 EPG[1][1] = new Array();
 EPG[1][2] = new Array();
 EPG[1][3] = new Array();
@@ -149,6 +150,7 @@ EPG[1][5] = new Array();
 EPG[1][6] = new Array();
 EPG[1][7] = new Array();
 EPG[1][8] = new Array();
+EPG[1][9] = new Array();
 EPG[2][1] = new Array();
 EPG[2][2] = new Array();
 EPG[2][3] = new Array();
@@ -157,7 +159,10 @@ EPG[2][5] = new Array();
 EPG[2][6] = new Array();
 EPG[2][7] = new Array();
 EPG[2][8] = new Array();
+EPG[2][9] = new Array();
 
+var content = "";
+var connib = 0x00000000;
 var osdtimeout = 0;
 var osdVolumetimeout = 0;
 var epgactive = 0;