From b20a1c7f2b79edf8672aa0909087584b7230cc3b Mon Sep 17 00:00:00 2001
From: "M. Voerman" <rekordc@gmail.com>
Date: Wed, 22 Jan 2014 13:30:53 +0100
Subject: On request changed back to get marks from restfulapi (if vip.testing3
 = 0), will be selectable soon.

---
 channels6.js | 10 +++++-----
 index.html   | 36 +++++++++++++++++++++++++++++++++++-
 settings.js  |  4 +++-
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/channels6.js b/channels6.js
index ec0e97d..08204f1 100644
--- a/channels6.js
+++ b/channels6.js
@@ -38,8 +38,8 @@ channelsnames[6014] = "FREE XTV (S)";
 channels[6014]="S13.0E-318-8900-2099";
 channelsnames[6015] = "French Lover (S)";
 channels[6015]="S13.0E-318-8900-2098";
-channelsnames[6018] = "Hot (S)";
-channels[6018]="S30.0W-54-37-1666";
+channelsnames[6018] = "Venus (S)";
+channels[6018]="S30.0W-83-105-502";
 channelsnames[6019] = "Leo TV (S)";
 channels[6019]="S23.5E-3-3209-13119";
 //channelsnames[6020] = "Private Spice (S)";
@@ -78,8 +78,8 @@ channels[6034]="S23.5E-3-3212-14055";
 //channels[6037]="S23.5E-3-3236-5713";
 channelsnames[6038] = "Private Spice (S)";
 channels[6038]="S23.5E-3-3202-6072";
-channelsnames[6039] = "Penthouse HD (S)";
-channels[6039]="S23.5E-3-3208-7037";
+//channelsnames[6039] = "Penthouse HD (S)";
+//channels[6039]="S23.5E-3-3208-7037";
 channelsnames[6040] = "HUSTLER HD-3D (S)";
 channels[6040]="S13.0E-318-15800-16933";
 channelsnames[6041] = "DARING TV (S)";
@@ -91,7 +91,7 @@ channels[6041]="S13.0E-318-13300-4960";
 channelsnames[6045]="Beate-Uhse.TV (S)";
 channels[6045]="S19.2E-133-17-21";
 channelsnames[6047]="PENTHOUSE HD (S)";
-channels[6047]="S19.2E-1-1088-9306";
+channels[6047]="S19.2E-1-1086-9907";
 channelsnames[6048]="PLAYBOY TV (S)";
 channels[6048]="S19.2E-1-1060-30603";
 //channelsnames[6049]="CONTO TV 1 (S)";
diff --git a/index.html b/index.html
index 99daa78..2a8b5d0 100644
--- a/index.html
+++ b/index.html
@@ -171,8 +171,15 @@ function GetSettings() {
 		if (!toi.informationService.getObject("vip.testing2")) {} 
 	} catch(e) {
 		toi.informationService.setObject("vip.testing2","0",toi.informationService.STORAGE_PERMANENT)
+		//show info if channel is on hardcoded list of non free
 	}
 
+	try {
+		if (!toi.informationService.getObject("vip.testing3")) {} 
+	} catch(e) {
+		toi.informationService.setObject("vip.testing3","0",toi.informationService.STORAGE_PERMANENT)
+		//0 = Marks from restfulapi (like old versions), 1 = Marks from smartwebTV
+	}
 
 	var sel_group;
 	for (var i=0;i<10;i++) {
@@ -2598,6 +2605,12 @@ if(menu == 4) { // INFO Menu
 		experimental = Number(is.getObject("vip.testing"));
 		if (experimental) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
 		htmltext += "Experimental";
+		if (Number(is.getObject("vip.testing2"))) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
+		htmltext += "Experimental 2";
+		if (Number(is.getObject("vip.testing3"))) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
+		htmltext += "Experimental 3";
+
+
 
 	} catch(e) {
 		alert("Error : " + e);
@@ -3420,6 +3433,7 @@ if (UseNewReclist && recPath == "/recordings.xml") {
 			recChan[i] = rec_lst[i][7];
 			recProt[i] = rec_lst[i][8];
 		}
+	recProt[i] = 1;
  } else {
 
 // old recordings list function
@@ -3469,7 +3483,9 @@ if (UseNewReclist && recPath == "/recordings.xml") {
 
 
 function GetMarks() {
-try {
+
+if (testing3==1) {
+ try {
    posMark = 0;
    xmlhttp=new XMLHttpRequest();
    xmlhttp.open("GET",(server_ip + recServ + "/getMarks.xml?guid=" + recGUID[currMed] + "&" + new Date().getTime()),false);
@@ -3485,6 +3501,24 @@ try {
   } catch(e) {
     alert("Getting Marks problem: " + e);
   }
+ } else {
+  try {
+   posMark = 0;
+   xmlhttp=new XMLHttpRequest();
+   xmlhttp.open("GET",(server_ip + RestFulAPI + "/recordings/" + currMed + ".xml?marks=true&" + new Date().getTime()),false);
+   xmlhttp.send();
+   xmlDoc=xmlhttp.responseXML;
+   recMark = [];
+   var x=xmlDoc.getElementsByTagName("mark");
+	   for (var i=0;i<x.length;i++)
+		{
+		var y = x[i].childNodes[0].nodeValue.split(":");
+		recMark[i] = Number(y[0]*3600) + Number(y[1]*60) + Number(y[2]);
+		}
+  } catch(e) {
+    alert("Getting Marks problem: " + e);
+  }
+ }
 }
 
 
diff --git a/settings.js b/settings.js
index c1c674f..22a9855 100644
--- a/settings.js
+++ b/settings.js
@@ -2,7 +2,7 @@
 // Default settings
 // 
 
-var Version = "0.23"
+var Version = "0.24.1"
 
 server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.3.100","http://192.168.178.19");
 
@@ -17,6 +17,7 @@ OSDLang = new Array ("English", "Nederlands");
 langfile = new Array ("lang_eng.js", "lang_dut.js");
 
 var testing2;
+var testing3;
 var UseNewReclist = 1 ; //use new recordingslist function
 
 var ShowSubDir = 1 ; // 0 = no, 1 = yes (default) // show seperate maps for subdirs in menu recordings
@@ -49,6 +50,7 @@ var recServ = ":" + "8000";
 var RestFulAPI = ":" + "8002";
 var MPDAddress = ":" + "8888";
 var StreamPort = ":" + "3000" + "/";
+//var StreamPort = ":" + "8000" + "/live/";
 
 var channeldigits = 2; // 0 - Max 9, 1 max 99, 2 max 999 or 3 max 9999 channels directly selectable by numbers
 
-- 
cgit v1.2.3