Some updates

7 files changed, 128 insertions, 109 deletions

diff --git a/History b/History
index 623acb0..6ad1aab 100644
--- a/History
+++ b/History
@@ -14,9 +14,11 @@ VDR 1.7.29
 	Small fix to make it work on 19x3. (Looks like 19x0 auto selects right font)
 	Pressing record start Instant server recording. (Switching is done by ID so no need for same channelnumbering on server)
 	Recording info shows channelnumber.
-	EPG filter on 23 expanded.
+	EPG filter on 23E expanded.
 	EPG filter on Cable set to Dutch / Ziggo.
 	Added info window for instant records.
+	Source in OSD (Can be switched off in settings.js)
+
 
 0.16	EPG/schedule info remove on channel switch
 	Exit Guide View removes epg/schedule info
diff --git a/channels.js b/channels.js
index fd76633..70b4d2b 100644
--- a/channels.js
+++ b/channels.js
@@ -59,7 +59,7 @@ channels[10] = "S19.2E-53-1105-4016";
 channelsnames[11] = "RTL8 (S)";
 channels[11] = "S19.2E-53-1097-2035";
 channelsnames[12] = "Nickelodeon (S)";
-channels[12] = "S19.2E-53-1105-4014";
+channels[12] = "S19.2E-0-211973-28679";
 channelsnames[13] = "Comedy Central/Kindernet (S)";
 channels[13] = "S19.2E-53-1097-2036";
 channelsnames[14] = "Discovery (S)";
diff --git a/channels1.js b/channels1.js
index a93938d..c734b05 100644
--- a/channels1.js
+++ b/channels1.js
@@ -25,94 +25,62 @@ channelsnames[1008] = "Veronica/DisneyXD HD (S)"
 channels[1008] = "S23.5E-3-3225-21035"
 channelsnames[1009] = "NET5 HD (S)"
 channels[1009] = "S23.5E-3-3225-21020"
-channelsnames[1010] = "RTL8 HD (S)"
-channels[1010] = "S23.5E-3-3208-7036"
-channelsnames[1011] = "Discovery HD (S)"
-channels[1011] = "S23.5E-3-3208-7010"
-channelsnames[1012] = "Eurosport HD (S)"
-channels[1012] = "S23.5E-3-3205-5033"
-channelsnames[1013] = "History HD DUT (S)"
-channels[1013] = "S23.5E-3-3205-5151"
-channelsnames[1014] = "Travel Channel HD WE (S)"
-channels[1014] = "S23.5E-3-3221-5056"
-channelsnames[1015] = "Penthouse HD. (S)"
-channels[1015] = "S23.5E-3-3202-6094"
+channelsnames[1010] = "BVN (S)";
+channels[1010] = "S19.2E-53-1105-4016";
+channelsnames[1011] = "RTL8 HD (S)"
+channels[1011] = "S23.5E-3-3208-7036"
+channelsnames[1012] = "Nickelodeon (S)";
+channels[1012] = "S19.2E-53-1105-4014";
+channelsnames[1013] = "Comedy Central/Kindernet (S)";
+channels[1013] = "S19.2E-53-1097-2036";
+channelsnames[1014] = "Discovery HD (S)"
+channels[1014] = "S23.5E-3-3208-7010"
+channelsnames[1015] = "Animal Planet/TLC (S)";
+channels[1015] = "S19.2E-53-1097-2020";
 channelsnames[1016] = "NGC HD (S)"
 channels[1016] = "S23.5E-3-3208-7015"
-channelsnames[1017] = "Film 1 Premiere HD (S)"
-channels[1017] = "S23.5E-3-3222-20955"
-channelsnames[1018] = "Sport1 SELECT HD (S)"
-channels[1018] = "S23.5E-3-3222-20960"
-channelsnames[1019] = "EDL1 HD (S)"
-channels[1019] = "S23.5E-3-3202-6092"
-channelsnames[1020] = "Brava HDTV (S)"
-channels[1020] = "S23.5E-3-3208-7025"
-channelsnames[1021] = "Omroep Zeeland Televisie (S)"
-channels[1021] = "S23.5E-3-3211-20818"
-channelsnames[1022] = "TV Drenthe (S)"
-channels[1022] = "S23.5E-3-3211-20812"
-channelsnames[1023] = "TV West (S)"
-channels[1023] = "S23.5E-3-3211-20804"
-channelsnames[1024] = "AT5 (S)"
-channels[1024] = "S23.5E-3-3211-20806"
-channelsnames[1025] = "L1MBURG (S)"
-channels[1025] = "S23.5E-3-3211-20802"
-channelsnames[1026] = "Omroep Brabant Televisie (S)"
-channels[1026] = "S23.5E-3-3211-20820"
-channelsnames[1027] = "TVL/ATV/TV Oost (S)"
-channels[1027] = "S23.5E-3-3202-6055"
-channelsnames[1028] = "een HD (S)"
-channels[1028] = "S23.5E-3-3225-21025"
-channelsnames[1029] = "Canvas HD (S)"
-channels[1029] = "S23.5E-3-3225-21030"
-channelsnames[1030] = "VTM HD (S)"
-channels[1030] = "S23.5E-3-3208-7030"
+channelsnames[1017] = "Investigation Discovery (S)"
+channels[1017] = "S23.5E-3-3202-6045"
+channelsnames[1018] = "NG Wild DUT (S)";
+channels[1018] = "S23.5E-3-3210-5145";
+channelsnames[1019] = "History HD DUT (S)"
+channels[1019] = "S23.5E-3-3205-5151"
+channelsnames[1020] = "Animax (S)";
+channels[1020] = "S19.2E-53-1097-2047";
+channelsnames[1021] = "Eurosport HD (S)"
+channels[1021] = "S23.5E-3-3205-5033"
+channelsnames[1022] = "Eurosport 2 Deutschland (S)";
+channels[1022] = "S19.2E-133-15-55";
+channelsnames[1023] = "ESPN America (S)";
+channels[1023] = "S19.2E-1-1115-13109";
+channelsnames[1024] = "MOTORS TV (S)";
+channels[1024] = "S19.2E-1-1110-9509";
+channelsnames[1025] = "NAUTICAL CHANNEL (S)";
+channels[1025] = "S19.2E-1-1096-8607";
+channelsnames[1026] = "Travel Channel HD WE (S)"
+channels[1026] = "S23.5E-3-3221-5056"
+
+channelsnames[1030] = "Film 1 Premiere HD (S)"
+channels[1030] = "S23.5E-3-3222-20955"
 channelsnames[1031] = "Film1 Family (S)"
 channels[1031] = "S23.5E-3-3222-20910"
 channelsnames[1032] = "Film1 Sundance (S)"
 channels[1032] = "S23.5E-3-3222-20915"
 channelsnames[1033] = "Film1 Action (S)"
 channels[1033] = "S23.5E-3-3222-20920"
-channelsnames[1034] = "AXN CS (S)"
-channels[1034] = "S23.5E-3-3211-20822"
-channelsnames[1035] = "AXN Crime CS (S)"
-channels[1035] = "S23.5E-3-3211-20823"
-channelsnames[1036] = "AXN SciFi CS (S)"
-channels[1036] = "S23.5E-3-3211-20824"
-channelsnames[1037] = "Journaal24/Best 24 (S)"
-channels[1037] = "S23.5E-3-3202-6010"
-channelsnames[1038] = "Holland Doc 24 (S)"
-channels[1038] = "S23.5E-3-3202-6015"
-channelsnames[1039] = "Zappelin/Zapp24 (S)"
-channels[1039] = "S23.5E-3-3202-6020"
-channelsnames[1040] = "Humor 24/Nost.Net (S)"
-channels[1040] = "S23.5E-3-3202-6025"
-channelsnames[1041] = "FoxLife (S)"
-channels[1041] = "S23.5E-3-3202-6030"
-channelsnames[1042] = "Boomerang (S)"
-channels[1042] = "S23.5E-3-3202-6035"
-channelsnames[1043] = "Discovery Science (S)"
-channels[1043] = "S23.5E-3-3202-6040"
-channelsnames[1044] = "Investigation Discovery (S)"
-channels[1044] = "S23.5E-3-3202-6045"
-channelsnames[1045] = "TEST (S)"
-channels[1045] = "S23.5E-3-3202-6050"
-channelsnames[1046] = "BiB (S)"
-channels[1046] = "S23.5E-3-3202-6060"
-channelsnames[1047] = "Disney Channel (S)"
-channels[1047] = "S23.5E-3-3202-6065"
-channelsnames[1048] = "EDL2 (S)"
-channels[1048] = "S23.5E-3-3222-20935"
-channelsnames[1049] = "Cartoon/TCM (S)"
-channels[1049] = "S23.5E-3-3222-20940"
-channelsnames[1050] = "Planet (S)"
-channels[1050] = "S19.2E-53-1097-2044"
-channelsnames[1051] = "Extreme Sports (S)"
-channels[1051] = "S23.5E-3-3222-20945"
-channelsnames[1052] = "Sport1 Voetbal (S)"
-channels[1052] = "S23.5E-3-3222-20925"
-channelsnames[1053] = "Sport1 Golf (S)"
-channels[1053] = "S23.5E-3-3222-20930"
+
+
+channelsnames[1040] = "een HD (S)"
+channels[1040] = "S23.5E-3-3225-21025"
+channelsnames[1041] = "Canvas HD (S)"
+channels[1041] = "S23.5E-3-3225-21030"
+channelsnames[1042] = "VTM HD (S)"
+channels[1042] = "S23.5E-3-3208-7030"
+
+
+
+
+
 channelsnames[1100] = "MGM HD (S)"
 channels[1100] = "S28.2E-2-2016-3807"
 channelsnames[1101] = "Sky DraRomHD (S)"
@@ -341,10 +309,6 @@ channelsnames[1602] = "MTV Live HD (S)"
 channels[1602] = "S19.2E-1-1068-28601"
 channelsnames[1603] = "Planeta HD (S)"
 channels[1603] = "S23.5E-3-3206-5410"
-channelsnames[1604] = "EroXX HD (S)"
-channels[1604] = "S23.5E-3-3206-5411"
-channelsnames[1605] = "EroXXX HD (S)"
-channels[1605] = "S23.5E-3-3206-5412"
 channelsnames[1606] = "DELUXE LOUNGE HD (S)"
 channels[1606] = "S23.5E-3-3217-6100"
 channelsnames[1607] = "UNITEL CLASSICA HD (S)"
@@ -397,13 +361,64 @@ channelsnames[1818] = "Travel Channel HD (S)"
 channels[1818] = "S23.5E-0-112109-5048"
 channelsnames[1900] = "Sky News HD (S)"
 channels[1900] = "S28.2E-2-2039-3850"
-channelsnames[1950] = "HD Demo ASTRA & RAI (S)"
-channels[1950] = "S23.5E-3-3204-7550"
-channelsnames[1951] = "HD Demo ASTRA & RAI (S)"
-channels[1951] = "S23.5E-0-211778-7550"
-channelsnames[1952] = "High TV (S)"
-channels[1952] = "S30.0W-1388-1388-3"
-channelsnames[1953] = "FOX Sports HD (S)"
-channels[1953] = "S30.0W-1388-1388-7"
+channelsnames[1934] = "AXN CS (S)"
+channels[1934] = "S23.5E-3-3211-20822"
+channelsnames[1935] = "AXN Crime CS (S)"
+channels[1935] = "S23.5E-3-3211-20823"
+channelsnames[1936] = "AXN SciFi CS (S)"
+channels[1936] = "S23.5E-3-3211-20824"
+channelsnames[1937] = "Journaal24/Best 24 (S)"
+channels[1937] = "S23.5E-3-3202-6010"
+channelsnames[1938] = "Holland Doc 24 (S)"
+channels[1938] = "S23.5E-3-3202-6015"
+channelsnames[1939] = "Zappelin/Zapp24 (S)"
+channels[1939] = "S23.5E-3-3202-6020"
+channelsnames[1940] = "Humor 24/Nost.Net (S)"
+channels[1940] = "S23.5E-3-3202-6025"
+channelsnames[1941] = "FoxLife (S)"
+channels[1941] = "S23.5E-3-3202-6030"
+channelsnames[1942] = "Boomerang (S)"
+channels[1942] = "S23.5E-3-3202-6035"
+channelsnames[1943] = "Discovery Science (S)"
+channels[1943] = "S23.5E-3-3202-6040"
+
+channelsnames[1946] = "BiB (S)"
+channels[1946] = "S23.5E-3-3202-6060"
+channelsnames[1947] = "Disney Channel (S)"
+channels[1947] = "S23.5E-3-3202-6065"
+channelsnames[1948] = "EDL2 (S)"
+channels[1948] = "S23.5E-3-3222-20935"
+channelsnames[1949] = "Cartoon/TCM (S)"
+channels[1949] = "S23.5E-3-3222-20940"
+channelsnames[1950] = "Planet (S)"
+channels[1950] = "S19.2E-53-1097-2044"
+channelsnames[1951] = "Extreme Sports (S)"
+channels[1951] = "S23.5E-3-3222-20945"
+channelsnames[1952] = "Sport1 Voetbal (S)"
+channels[1952] = "S23.5E-3-3222-20925"
+channelsnames[1953] = "Sport1 Golf (S)"
+channels[1953] = "S23.5E-3-3222-20930"
+channelsnames[1918] = "Sport1 SELECT HD (S)"
+channels[1918] = "S23.5E-3-3222-20960"
+channelsnames[1919] = "EDL1 HD (S)"
+channels[1919] = "S23.5E-3-3202-6092"
+channelsnames[1920] = "Brava HDTV (S)"
+channels[1920] = "S23.5E-3-3208-7025"
+channelsnames[1921] = "Omroep Zeeland Televisie (S)"
+channels[1921] = "S23.5E-3-3211-20818"
+channelsnames[1922] = "TV Drenthe (S)"
+channels[1922] = "S23.5E-3-3211-20812"
+channelsnames[1923] = "TV West (S)"
+channels[1923] = "S23.5E-3-3211-20804"
+channelsnames[1924] = "AT5 (S)"
+channels[1924] = "S23.5E-3-3211-20806"
+channelsnames[1925] = "L1MBURG (S)"
+channels[1925] = "S23.5E-3-3211-20802"
+channelsnames[1926] = "Omroep Brabant Televisie (S)"
+channels[1926] = "S23.5E-3-3211-20820"
+channelsnames[1927] = "TVL/ATV/TV Oost (S)"
+channels[1927] = "S23.5E-3-3202-6055"
+
+
 
 maxChan[1] = 1953; // set to max HD channel else you see 'undefined' in guide view
diff --git a/channels5.js b/channels5.js
index 2e70b23..9b9bda8 100644
--- a/channels5.js
+++ b/channels5.js
@@ -42,11 +42,9 @@ ServerAdres[2] = "FullURL";
 // MultiCast, channels[x] layout DVB(Satposition, C or T)-NID-TID-SID-multicast address
 
 
-channelsnames[2001] = "YouTube 1080p";
-channels[2001] = "http://r5---sn-h0j7sn76.c.youtube.com/videoplayback?itag=37&ip=92.73.12.87&key=yt1&upn=bTPjGgbx5_4&cp=U0hVRVFLVl9GTUNONV9JRVpGOmozTmpPZFEtVk5E&source=youtube&sparams=cp%2Cid%2Cip%2Cipbits%2Citag%2Cratebypass%2Csource%2Cupn%2Cexpire&ipbits=8&ratebypass=yes&mv=m&mt=1360086794&ms=au&id=2707c2440b646042&fexp=927101%2C916807%2C900222%2C916625%2C902538%2C920704%2C912806%2C902000%2C922403%2C922405%2C929901%2C913605%2C925710%2C929114%2C920201%2C913302%2C919009%2C911116%2C910221%2C901451%2C919114&newshard=yes&expire=1360108513&sver=3&signature=2580F86F2429B02B80F1D2F6941A2B12B0D11177.A18842DF82FA7DBC1494B7C4CF9C1949C59FB335&title=Revolution%20-%20Trailer";
-channelsnames[2002] = "YouTube 720p";
-channels[2002] = "http://192.168.3.15:8000/media/videos/Doro and Lemmy Kilmister Love Me Forever Live 2003 HD.mp4";
+channelsnames[2001] = "Nick TEST";
+channels[2001] = "http://82.73.255.132:3000/C-1000-6-16.ts";
 
-maxChan[2] = 2002; // set to max multicast channel else you see 'undefined' in guide view
+maxChan[2] = 2001; // set to max multicast channel else you see 'undefined' in guide view
 
 
diff --git a/channels6.js b/channels6.js
index ca52e6d..0e409b4 100644
--- a/channels6.js
+++ b/channels6.js
@@ -69,19 +69,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[6031] = "Penthouse 3D (S)";
-channels[6031]="S23.5E-3-3204-5311";
 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[6035] = "Penthouse HD1 (S)";
-channels[6035]="S23.5E-3-3226-5608";
-channelsnames[6036] = "Penthouse HD (S)";
-channels[6036]="S23.5E-3-3226-5607";
+channelsnames[6035] = "Penthouse HD (S)";
+channels[6035]="S23.5E-3-3226-5607";
+channelsnames[6036] = "Penthouse HD1 (S)";
+channels[6036]="S23.5E-3-3226-5608";
 channelsnames[6037] = "Penthouse HD2 (S)";
 channels[6037]="S23.5E-3-3226-5602";
 channelsnames[6038] = "Private Spice (S)";
@@ -92,5 +89,7 @@ channelsnames[6040] = "HUSTLER HD-3D (S)";
 channels[6040]="S13.0E-318-15800-16933";
 channelsnames[6041] = "DARING TV (S)";
 channels[6041]="S13.0E-318-15800-16931";
+channelsnames[6042] = "Penthouse HD. (S)"
+channels[6042] = "S23.5E-3-3202-6094"
 
-maxChan[6] = 6041; // set to max prt channel else you see 'undefined' in guide view
+maxChan[6] = 6042; // set to max prt channel else you see 'undefined' in guide view
diff --git a/index.html b/index.html
index 3977212..71b3c98 100644
--- a/index.html
+++ b/index.html
@@ -940,7 +940,11 @@ function OSDchannr(channr) {
 
 function OSDhtml(){
     osdtime.innerHTML = result;
-    osdname.innerHTML = Left(channelsnames[currChan],30);
+	if (ShowSource == 1) {
+	    osdname.innerHTML = channels[currChan].split("-")[0] + "\uE003" + Left(channelsnames[currChan],30);
+	} else {
+	    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] + "</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>";
@@ -2964,7 +2968,7 @@ function ClearScreen() {
 
 	<div id="osdmain" style="background:#3366ff;width:80%; position:absolute; left:10%; top:60%; bottom:9%;z-index:505;-webkit-border-radius:50px;"></div>
 	<div id="osdtime" style="width:42%; position:absolute; left:58%; top:63%;z-index:505;"></div>
-	<div id="osdname" style="width:69%;height:4%; position:absolute; left:12%; top:65%;z-index:505;"></div>
+	<div id="osdname" style="width:69%;height:4%; position:absolute; left:12%; top:66%;z-index:505;"></div>
 	<div id="osdepg" style="width:63%; position:absolute; left:21%; top:69%;z-index:505;"></div>
 	<div id="osdtimer" style="width:7%; position:absolute; left:12%; top:69%;z-index:505;"></div>
 	<div id="osdca" style="width:5%; position:absolute; left:75%; top:67%;z-index:505;font-family:'VDRSymbols Sans';"></div>
diff --git a/settings.js b/settings.js
index 48bf127..d9bbcf9 100644
--- a/settings.js
+++ b/settings.js
@@ -26,6 +26,7 @@ var TimeShift = 0;   // 0 = no, 1 = yes timeshift
 var ShowSubs = 1;    // 0 = no, 1 = yes (default)
 var KillStream = 1;  // 1 = Close stream on Standby
 var ShowProtectedChannels = 1; // Default don't show protected channels.
+var ShowSource = 1; // show source in OSD
 var serverEPGdays = 3 * (60 * 60 * 24); // the higher the longer you wait while getting the epg info
 
 months = new Array('January', 'February', 'March', 'April', 'May', 'June', 'Jully', 'August', 'September', 'October', 'November', 'December');