Script update, default channel of a group is now the first channel (override this in config\custom.js)

2 files changed, 36 insertions, 35 deletions

diff --git a/javascript/channels.js b/javascript/channels.js
index c48dfc4..a908aca 100644
--- a/javascript/channels.js
+++ b/javascript/channels.js
@@ -42,7 +42,7 @@ channelsnames[21]="EDGE";
 channels[21]="S23.5E-3-3202-6111";
 channelsnames[22]="NPO Politiek/NPO Best";
 channels[22]="S23.5E-3-3202-6010";
-channelsnames[23]="NPO Doc";
+channelsnames[23]="NPO 101TV";
 channels[23]="S23.5E-3-3202-6015";
 channelsnames[24]="NPO Zapp Xtra/NPO Humor TV";
 channels[24]="S23.5E-3-3202-6025";
@@ -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]="LILLE - WOL";
+channelsnames[485]="Sky Sport 2,Sport2";
 channels[485]="S19.2E-133-4-222";
 channelsnames[486]="N24 Austria";
 channels[486]="S19.2E-133-7-53";
@@ -3250,10 +3250,10 @@ 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]="AD ALOULA HD OBSOLETE";
-channels[6016]="S13.0E-318-8900-2098";
+channelsnames[6016]="FL TV";
+channels[6016]="S13.0E-318-15400-13512";
 channelsnames[6017]="Venus";
-channels[6017]="S30.0W-83-105-502";
+channels[6017]="S30.0W-83-105-502-4";
 channelsnames[6018]="Leo TV";
 channels[6018]="S23.5E-3-3219-13142";
 channelsnames[6019]="Vivid";
@@ -3277,9 +3277,9 @@ channels[6027]="S13.0E-318-5000-10";
 channelsnames[6028]="Redlight 3D-HD";
 channels[6028]="S13.0E-318-15800-16932";
 channelsnames[6029]="Penthouse 3D";
-channels[6029]="S23.5E-3-3204-5311";
+channels[6029]="S23.5E-3-3204-5311-12";
 channelsnames[6030]="EROXXX";
-channels[6030]="S23.5E-3-3212-14055";
+channels[6030]="S23.5E-3-3212-14055-12";
 channelsnames[6031]="Brazzers.tv";
 channels[6031]="S23.5E-3-3202-6072";
 channelsnames[6032]="Hustler HD-3D";
@@ -3600,14 +3600,14 @@ minChan[9] = 9001;
 maxChan[9] = 9523;
 baseChn[9] = 9000;
 
-defChan[0] = 10  ; protChn[0] = 0;
-defChan[1] = 1001; protChn[1] = 0;
-defChan[2] = 2000; protChn[2] = 0;
-defChan[3] = 3000; protChn[3] = 0;
-defChan[4] = 4145; protChn[4] = 0;
-defChan[5] = 5000; protChn[5] = 0;
-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/17/14 19:41:05" ;
+defChan[0] = minChan[0]; protChn[0] = 0;
+defChan[1] = minChan[1]; protChn[1] = 0;
+defChan[2] = minChan[2]; protChn[2] = 0;
+defChan[3] = minChan[3]; protChn[3] = 0;
+defChan[4] = minChan[4]; protChn[4] = 0;
+defChan[5] = minChan[5]; protChn[5] = 0;
+defChan[6] = minChan[6]; protChn[6] = 1;
+defChan[7] = minChan[7]; protChn[7] = 0;
+defChan[8] = minChan[8]; protChn[8] = 0;
+defChan[9] = minChan[9]; protChn[9] = 0;
+Chan_Ver = "12/25/14 18:21:55" ;
diff --git a/javascript/main.js b/javascript/main.js
index c719cf1..f18a8d2 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -116,7 +116,7 @@ function GetSettings() {
 		if (!is.getObject("vip.testing3")) {} 
 	} catch(e) {
 		is.setObject("vip.testing3","0",is.STORAGE_PERMANENT)
-		// Use some experimental code for multicast streams 0/1
+		// Unused at the moment
 	}
 
 	try {
@@ -171,7 +171,7 @@ function GetSettings() {
 
 	experimental = Number(is.getObject("vip.testing"));// Use some experimental code
 	testing2 = Number(is.getObject("vip.testing2"));// Use some experimental code
-	Exp_Multi = Number(is.getObject("vip.testing3"));// Use some experimental code for multicast streams
+
 	ShowSubs = Number(is.getObject("vip.showsubs"));
 	css_nr = Number(is.getObject("vip.css_nr"));
 	loadcss(cssfile[css_nr]);
@@ -447,20 +447,17 @@ function play(uri) {
     if (isSchedule) { schedule.style.opacity = 0; isSchedule = 0;}
     if (epgactive) { epg_unactive();}
 
-    if (ServerAdres[ChanGroup] == "MultiCast" ) { SI=channels[currChan].split("-"); uri = SI[4];
-    } else if (ServerAdres[ChanGroup] == "FullURL" ) {	// uri = ready!
-    } else { uri = ServerAdres[ChanGroup] + uri; }
-
-    Exp_Multi = Number(is.getObject("vip.testing3"));// Use some experimental code for multicast streams
-    if (Exp_Multi && (currChan < 20)) {
-	uri = "239.255.0." + currChan.toString() + ":11111";
-	initialDelayPlay = 0;
-    }
-
-    if (Global_Multicast) {
+    //Server address setup
+    if (ServerAdres[ChanGroup] == "MultiCast" ) { 
+	SI=channels[currChan].split("-"); uri = SI[4];
+    } else if (ServerAdres[ChanGroup] == "FullURL" ) {
+	;// uri = ready!
+    } else if (Global_Multicast) {
 	var x = Math.floor(currChan / 256);
 	uri = "239.255." + x.toString() + "." + (currChan - ( x * 256)).toString() + ":11111";
 	initialDelayPlay = 0;
+    } else {
+	uri = ServerAdres[ChanGroup] + uri; 
     }
 
 
@@ -2833,7 +2830,7 @@ if(menu == 4) { // INFO Menu
 	try {
 		htmltext += "\n   Product name: " + is.getObject("config.productdisplayname");
 		htmltext += "\n   Build date : " + is.getObject("config.build.date");
-		htmltext += "\n\n   IP address : " + is.getObject("config.ipaddress");
+		htmltext += "\n   IP address : " + is.getObject("config.ipaddress");
 		htmltext += "\n   MACaddress : " + MACaddress;
 
 		var x = is.getObject("cfg.ip.eth0.mode");
@@ -2841,8 +2838,12 @@ if(menu == 4) { // INFO Menu
 		htmltext += "DHCP";
 		var x = is.getObject("var.capabilities.dvr");
 		if (x !== "FALSE") { htmltext += "\n \uE003\uE017 "; } else { htmltext += "\n \uE003\uE016 "; }
-		htmltext += "DVR \n";
-		htmltext += "\n   VDR address : " + server_ip;
+		htmltext += "DVR";
+		if (Global_Multicast) {
+			htmltext += "\n   VDR address : MultiCast";
+		} else {
+			htmltext += "\n   VDR address : " + server_ip;
+		}
 		htmltext += "\n   Vip Client\uE003\uE003\uE003: " + Version;
 		htmltext += "\n   Channel list\uE003: " + Chan_Ver;
 
@@ -2911,7 +2912,7 @@ if(menu == 9) { // INFO2 Menu
 		if (Number(is.getObject("vip.testing2"))) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
 		htmltext += "Experimental 2 (Info box 'not in package')";
 		if (Number(is.getObject("vip.testing3"))) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
-		htmltext += "Experimental 3 (Multicast testing)";
+		htmltext += "Experimental 3 (Unused)";
 
 		if (Restfulapiplugin) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
 		htmltext += "Has Restfulapiplugin"