Added global multicast setting

Added config/custom.js, override global settings, define local settings (setting file isn't included in the download/distro)
Added config/<macaddress>.js settings for a single box, read after all other settings.

5 files changed, 84 insertions, 88 deletions

diff --git a/History b/History
index 9be96eb..b4553f5 100644
--- a/History
+++ b/History
@@ -17,10 +17,13 @@ VDR 1.7.29+
 	epginfo box was left active but invisible when pressed menu(green key didn't change audio but show epginfonext)
 	add to favorite now refreshes view
 	added keys from Motorola NYX remote. (Both up/down/left/right keys do the same)
-	Turn record key off
 	NYX remote hase no stopkey so key 'back' does the same as stop.
 	Fixed Standby while playback
 	(For Easyvdr & SmartWebTV plugin) Menu + red send Server Power Down. (Define it in vdr's 'commands.conf')
+	Added global multicast setting
+	Added config/custom.js, override global settings, define local settings (setting file isn't included in the download/distro)
+	Added config/<macaddress>.js settings for a single box, read after all other settings.
+	
 
 0.25	Get recordings from Streamdev, Restfulapi or SmartTVweb.
 	Check if SmartTVweb is on the server if not turn SmartTVweb options off
diff --git a/index.html b/index.html
index 62be34a..a4af570 100644
--- a/index.html
+++ b/index.html
@@ -4,6 +4,7 @@
 <script type="text/javascript" src="javascript/guide_view.js"></script>
 <script type="text/javascript" src="languages/lang_eng.js"></script>
 <script type="text/javascript" src="javascript/channels.js"></script>
+<script type="text/javascript" src="config/custom.js"></script>
 <script type="text/javascript" src="javascript/main.js"></script>
 <script type="text/javascript">
 
diff --git a/javascript/channels.js b/javascript/channels.js
index 41bdd49..c48dfc4 100644
--- a/javascript/channels.js
+++ b/javascript/channels.js
@@ -662,7 +662,7 @@ channelsnames[483]="Sky Nostalgie,Nostalgie";
 channels[483]="S19.2E-133-3-516";
 channelsnames[484]="Sky Sport 1,Sport1";
 channels[484]="S19.2E-133-4-221";
-channelsnames[485]="Sky Sport 2,Sport2";
+channelsnames[485]="LILLE - WOL";
 channels[485]="S19.2E-133-4-222";
 channelsnames[486]="N24 Austria";
 channels[486]="S19.2E-133-7-53";
@@ -702,6 +702,10 @@ channelsnames[512]="ServusTV Deutschland";
 channels[512]="S19.2E-1-1115-13110";
 channelsnames[513]="ServusTV Oesterreich";
 channels[513]="S19.2E-1-1115-13111";
+channelsnames[514]="DAF Neu";
+channels[514]="S19.2E-1-1003-13227";
+channelsnames[515]="Bibel TV HD";
+channels[515]="S19.2E-1-1003-13224";
 channelsnames[520]="SRF info";
 channels[520]="S13.0E-318-8500-911";
 channelsnames[521]="SRF 1";
@@ -3012,7 +3016,7 @@ channelsnames[4726]="BBC English (Europe)";
 channels[4726]="S13.0E-318-13000-14618";
 channelsnames[4727]="BBC English Mid-East";
 channels[4727]="S13.0E-318-13000-14619";
-channelsnames[4728]="PPV| Gala KSW29";
+channelsnames[4728]="Test4";
 channels[4728]="S13.0E-113-7900-10500";
 channelsnames[4729]="Polsat Food";
 channels[4729]="S13.0E-113-7900-10501";
@@ -3246,7 +3250,7 @@ channelsnames[6014]="BRAZZERS TV Europe";
 channels[6014]="S13.0E-318-12200-7461";
 channelsnames[6015]="PRIVATE TV";
 channels[6015]="S13.0E-318-13300-4960";
-channelsnames[6016]="FL TV";
+channelsnames[6016]="AD ALOULA HD OBSOLETE";
 channels[6016]="S13.0E-318-8900-2098";
 channelsnames[6017]="Venus";
 channels[6017]="S30.0W-83-105-502";
@@ -3364,68 +3368,70 @@ channelsnames[8026]="BBC Two";
 channels[8026]="T-8720-2212-27";
 channelsnames[8027]="TV Oost";
 channels[8027]="T-8720-2214-1104";
-channelsnames[8028]="TV Gelderland";
-channels[8028]="T-0-0-1104";
-channelsnames[8029]="ZDF";
-channels[8029]="T-8468-514-514";
-channelsnames[8030]="3sat";
-channels[8030]="T-8468-514-515";
-channelsnames[8031]="ZDFinfo";
-channels[8031]="T-8468-514-516";
-channelsnames[8032]="neo/KiKA";
-channels[8032]="T-8468-514-517";
-channelsnames[8033]="arte";
-channels[8033]="T-8468-6144-2";
+channelsnames[8028]="Ketnet/OP12";
+channels[8028]="T-8720-2244-46";
+channelsnames[8029]="TV Gelderland";
+channels[8029]="T-0-0-1104";
+channelsnames[8030]="ZDF";
+channels[8030]="T-8468-514-514";
+channelsnames[8031]="3sat";
+channels[8031]="T-8468-514-515";
+channelsnames[8032]="ZDFinfo";
+channels[8032]="T-8468-514-516";
+channelsnames[8033]="neo/KiKA";
+channels[8033]="T-8468-514-517";
 channelsnames[8034]="arte";
-channels[8034]="T-8468-14849-2";
-channelsnames[8035]="arte OBSOLETE";
-channels[8035]="T-8720-2214-2";
-channelsnames[8036]="PHOENIX";
-channels[8036]="T-8468-6144-3";
-channelsnames[8037]="PHOENIX OBSOLETE";
-channels[8037]="T-8720-2214-3";
-channelsnames[8038]="PHOENIX";
-channels[8038]="T-8468-14849-3";
-channelsnames[8039]="Einsfestival";
-channels[8039]="T-8468-6144-5";
-channelsnames[8040]="Einsfestival OBSOLETE";
-channels[8040]="T-8720-2214-5";
-channelsnames[8041]="Einsfestival";
-channels[8041]="T-8468-14849-5";
-channelsnames[8042]="Das Erste";
-channels[8042]="T-8468-6144-256";
-channelsnames[8043]="Das Erste OBSOLETE";
-channels[8043]="T-8720-2214-256";
-channelsnames[8044]="Das Erste";
-channels[8044]="T-8468-14849-256";
-channelsnames[8045]="hr-fernsehen";
-channels[8045]="T-0-0-65";
+channels[8034]="T-8468-6144-2";
+channelsnames[8035]="arte";
+channels[8035]="T-8468-14849-2";
+channelsnames[8036]="arte OBSOLETE";
+channels[8036]="T-8720-2214-2";
+channelsnames[8037]="PHOENIX";
+channels[8037]="T-8468-6144-3";
+channelsnames[8038]="PHOENIX OBSOLETE";
+channels[8038]="T-8720-2214-3";
+channelsnames[8039]="PHOENIX";
+channels[8039]="T-8468-14849-3";
+channelsnames[8040]="Einsfestival";
+channels[8040]="T-8468-6144-5";
+channelsnames[8041]="Einsfestival OBSOLETE";
+channels[8041]="T-8720-2214-5";
+channelsnames[8042]="Einsfestival";
+channels[8042]="T-8468-14849-5";
+channelsnames[8043]="Das Erste";
+channels[8043]="T-8468-6144-256";
+channelsnames[8044]="Das Erste OBSOLETE";
+channels[8044]="T-8720-2214-256";
+channelsnames[8045]="Das Erste";
+channels[8045]="T-8468-14849-256";
 channelsnames[8046]="hr-fernsehen";
-channels[8046]="T-8468-38912-65";
-channelsnames[8047]="MDR FERNSEHEN";
-channels[8047]="T-0-0-100";
+channels[8046]="T-0-0-65";
+channelsnames[8047]="hr-fernsehen";
+channels[8047]="T-8468-38912-65";
 channelsnames[8048]="MDR FERNSEHEN";
-channels[8048]="T-8468-38912-100";
-channelsnames[8049]="NDR FS NDS";
-channels[8049]="T-8468-38912-129";
+channels[8048]="T-0-0-100";
+channelsnames[8049]="MDR FERNSEHEN";
+channels[8049]="T-8468-38912-100";
 channelsnames[8050]="NDR FS NDS";
-channels[8050]="T-0-0-129";
-channelsnames[8051]="NDR FS HH*";
-channels[8051]="T-0-0-130";
+channels[8050]="T-8468-38912-129";
+channelsnames[8051]="NDR FS NDS";
+channels[8051]="T-0-0-129";
 channelsnames[8052]="NDR FS HH*";
-channels[8052]="T-8468-38912-130";
-channelsnames[8053]="NDR FS SH*";
-channels[8053]="T-8468-38912-131";
+channels[8052]="T-0-0-130";
+channelsnames[8053]="NDR FS HH*";
+channels[8053]="T-8468-38912-130";
 channelsnames[8054]="NDR FS SH*";
-channels[8054]="T-0-0-131";
-channelsnames[8055]="NDR FS MVP*";
-channels[8055]="T-0-0-132";
+channels[8054]="T-8468-38912-131";
+channelsnames[8055]="NDR FS SH*";
+channels[8055]="T-0-0-131";
 channelsnames[8056]="NDR FS MVP*";
-channels[8056]="T-8468-38912-132";
-channelsnames[8057]="WDR Köln";
-channels[8057]="T-0-0-262";
+channels[8056]="T-0-0-132";
+channelsnames[8057]="NDR FS MVP*";
+channels[8057]="T-8468-38912-132";
 channelsnames[8058]="WDR Köln";
-channels[8058]="T-8468-38912-262";
+channels[8058]="T-0-0-262";
+channelsnames[8059]="WDR Köln";
+channels[8059]="T-8468-38912-262";
 channelsnames[9001]="NPO Radio1";
 channels[9001]="S23.5E-3-3211-20860";
 channelsnames[9002]="NPO Radio2";
@@ -3566,11 +3572,6 @@ channelsnames[9522]="SkyRadio 101 FM";
 channels[9522]="T-8720-2211-116";
 channelsnames[9523]="Radio Veronica";
 channels[9523]="T-8720-2211-117";
-
-channelsnames[7001]="Beeldkrant";
-channels[7001]="T-8720-2211-117";
-ServerAdres[7]="FullURL";
-
 minChan[0] = 1;
 maxChan[0] = 954;
 baseChn[0] = 0;
@@ -3593,7 +3594,7 @@ minChan[6] = 6001;
 maxChan[6] = 6047;
 baseChn[6] = 6000;
 minChan[8] = 8001;
-maxChan[8] = 8058;
+maxChan[8] = 8059;
 baseChn[8] = 8000;
 minChan[9] = 9001;
 maxChan[9] = 9523;
@@ -3609,15 +3610,4 @@ defChan[6] = 6001; protChn[6] = 1;
 defChan[7] = 7000; protChn[7] = 0;
 defChan[8] = 8001; protChn[8] = 0;
 defChan[9] = 9051; protChn[9] = 0;
-Chan_Ver = "12/04/14 18:58:19" ;
-
-
-channelsnames[7000]="BVN Multicast";
-channels[7000]="udp://239.255.0.10:11111";
-ServerAdres[7]="FullURL";
-minChan[7] = 7000;
-maxChan[7] = 7000;
-baseChn[7] = 7000;
-
-
-
+Chan_Ver = "12/17/14 19:41:05" ;
diff --git a/javascript/main.js b/javascript/main.js
index 381f424..030fa19 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -457,6 +457,13 @@ function play(uri) {
 	initialDelayPlay = 0;
     }
 
+    if (Global_Multicast) {
+	var x = Math.floor(currChan / 256);
+	uri = "239.255." + x.toString() + "." + (currChan - ( x * 256)).toString() + ":11111";
+	initialDelayPlay = 0;
+    }
+
+
     URL = uri;
     initialDelayPlayID = setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",initialDelayPlay);
     initialDelayPlay = 500; // wait 500 ms before zap to next channel
@@ -1405,7 +1412,7 @@ function OSDhtml(){
 	if (ShowSource == 1) {
 	    osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + ">" + channels[currChan].split("-")[0] + "\uE003" + channelsnames[currChan] + "</span>";
 	} else {
-	    osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + ">" + channelsnames[currChan] + "</span>";
+	    osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + "> \uE003 " + channelsnames[currChan] + "</span>";
 	}
     osdepg.innerHTML = "<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[0][7][currChan] + "</pre>\n<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[1][7][currChan] + "</pre>";
     osdepginfo.innerHTML =  "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>" + currChan + "\uE003" + channelsnames[currChan] + "</p><p class=epg_avinfo>" + AvInfo[currChan] + "</p><p class=epg_title>" + EPG[0][7][currChan] + EPG[0][9][currChan] + EPG[0][8][currChan] + "</p>\n<p class=epg_info>" + EPG[0][4][currChan] + "</p>\n<p class=epg_info_long>" + Left(EPG[0][5][currChan],750) + "</p></span>";
@@ -2253,7 +2260,7 @@ function onKeyMenu(keyCode) {
 
     break;
     case "Red":
-	if (menu == 0) {
+	if (menu == 0 && PowerDownServer) {
 		ServerPowerDown();
 		isSetupMenu = 0;
 		mainmenu.style.opacity = 0;
@@ -4827,7 +4834,7 @@ function ServerPause() {
 
 function ServerPowerDown() {
 //Power Down Server
- if (smartTVplugin && PowerDownServer) {
+ if (smartTVplugin) {
   try {
 	xmlhttp=new XMLHttpRequest();
 	xmlhttp.open('GET',(server_ip + recServ + '/execcmd?cmd=' + PowerDown));
diff --git a/javascript/settings.js b/javascript/settings.js
index 359233f..2dabbd1 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -2,7 +2,7 @@
 // Default settings
 // 
 
-var Version = "0.26.9";
+var Version = "0.26.10";
 
 server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.178.56","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.178.52");
 
@@ -11,6 +11,7 @@ var PowerDownServer = 0; // Power Down server from menu by sending cmds. (0 = no
 var PowerDown = 9; //With Easyvdr 0.806 it is cmds 9.
 var StartVolume = 15; // Volume on (re)start of the portal.
 var currChan = 10; // default channel
+var Global_Multicast = 0;// 1 = use only MultiCast
 
 OSDLang = new Array ("English", "Nederlands", "Deutsch");
 langfile = new Array ("languages/lang_eng.js", "languages/lang_dut.js","languages/lang_ger.js");
@@ -78,7 +79,6 @@ var RecCmdsIcon = new Array("","\uE005","","","","","","","","");
 
 var preRecTime = 300 ;// for local recordings time before recording in seconds
 var afterRecTime = 600 ; // for local recordings time after recording in seconds
-var No_rec_key = 0; // 0 = use rec_keys, 1 = don't use rec_keys, no server recording possible
 
 //
 // No need to change anything from here on.
@@ -174,13 +174,8 @@ var KEY_7 = "U+0037";
 var KEY_8 = "U+0038";
 var KEY_9 = "U+0039";
 var KEY_MENU = "Menu";
-if (No_rec_key) {
-	var KEY_REC = "";
-	var KEY_REC2 = "";
-} else {
-	var KEY_REC = "U+00bd";
-	var KEY_REC2 = "MediaRecord";
-}
+var KEY_REC = "U+00bd";
+var KEY_REC2 = "MediaRecord";
 var KEY_OK = "Accept";
 //Extra keys
 var KEY_DOWN1 = "ChannelDown";