summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--History3
-rw-r--r--index.html25
-rw-r--r--settings.js6
3 files changed, 17 insertions, 17 deletions
diff --git a/History b/History
index 46d362f..125875c 100644
--- a/History
+++ b/History
@@ -2,11 +2,12 @@ Tested on
Motorola Vip : 1960, 1910, 1903, 1963.
VDR 1.7.29 / 2.1.1
-0.24 vip.testing3 used for selecting getmarks from 0 = restfulapi, 1 = SmartTVWeb (not all users have the newest SmartTVWeb)
+0.24 vip.getmarks used for selecting getmarks 0 = restfulapi, 1 = SmartTVWeb (not all users have the newest SmartTVWeb)
Channels update.
Selectable gettimer source. (de)activate/del/add timers only with SmartTVWeb
Update EPG Filter
EPGList/ Recordinglist bug fixed (hopefully)
+ New key from old KPN remote added for swap prev / current channel
0.23 Infobox for connection Error, not only ERRR on display but also the Infobox
diff --git a/index.html b/index.html
index f680b5f..ddcef67 100644
--- a/index.html
+++ b/index.html
@@ -176,10 +176,9 @@ function GetSettings() {
}
try {
- if (!toi.informationService.getObject("vip.testing3")) {}
+ if (!toi.informationService.getObject("vip.getmarks")) {}
} catch(e) {
- toi.informationService.setObject("vip.testing3","0",toi.informationService.STORAGE_PERMANENT)
- //0 = Marks from restfulapi (like old versions), 1 = Marks from smartwebTV
+ toi.informationService.setObject("vip.getmarks","0",toi.informationService.STORAGE_PERMANENT)
}
var sel_group;
@@ -211,7 +210,7 @@ function GetSettings() {
experimental = Number(toi.informationService.getObject("vip.testing"));// Use some experimental code
testing2 = Number(toi.informationService.getObject("vip.testing2"));// Use some experimental code
- testing3 = Number(toi.informationService.getObject("vip.testing3"));// Use some experimental code
+ get_marks = Number(toi.informationService.getObject("vip.getmarks"));// Use some experimental code
Set_Res = Number(toi.informationService.getObject("vip.resolution"));
VideoOutput();
@@ -2589,8 +2588,8 @@ if(menu == 4) { // INFO Menu
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";
+ if (Number(is.getObject("vip.getmarks"))) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
+ htmltext += "getmarks 1 = smarttvweb, 0 = restfulapi";
@@ -2695,7 +2694,7 @@ function LoadTimers() {
function LoadTimersServer() {
try {
- if (testing4==1) {
+ if (get_timer==1) {
//Get timers from SmartTVweb
xmlhttp=new XMLHttpRequest();
xmlhttp.open("GET",(server_ip + recServ + "/timers.xml?" + new Date().getTime()),false);
@@ -2775,7 +2774,7 @@ try {
}
function DeleteTimers() {
-if (testing4==1) {
+if (get_timer==1) {
try {
xmlhttp=new XMLHttpRequest();
@@ -2793,7 +2792,7 @@ if (testing4==1) {
}
function activate_timers(){
-if (testing4==1) {
+if (get_timer==1) {
// (De)activate timers.
try {
@@ -3417,7 +3416,7 @@ function getRecList() {
MaxInGroup = 14;
subgroup = 0;
try {
- if (testing5==1) {
+ if (get_recordings ==1) {
// get recordings from smartTVWeb
xmlhttp=new XMLHttpRequest();
xmlhttp.open("GET",(server_ip + recServ + recPath + "?" + new Date().getTime()),false);
@@ -3493,7 +3492,7 @@ try {
// try to fix display double entries in the last directory. (Only shown for some time after deleting files, should be fixed now)
recProt[i] = 1;
}
-} else if (testing5==2) {
+} else if (get_recordings==2) {
//get recordings from streamdev
//no media directory or delete support
xmlhttp=new XMLHttpRequest();
@@ -3522,7 +3521,7 @@ try {
recProt[i] = 1;
}
-//end of testing5
+//end of get_recordings
if (ShowSubDir) {
MakeRecList2();
} else {
@@ -3542,7 +3541,7 @@ try {
function GetMarks() {
-if (testing3==1) {
+if (get_marks==1) {
try {
posMark = 0;
xmlhttp=new XMLHttpRequest();
diff --git a/settings.js b/settings.js
index 1b0f070..e6a27c1 100644
--- a/settings.js
+++ b/settings.js
@@ -17,9 +17,9 @@ OSDLang = new Array ("English", "Nederlands");
langfile = new Array ("lang_eng.js", "lang_dut.js");
var testing2;
-var testing3; // getmarks 1 = smarttvweb, 0 = restfulapi
-var testing4 = 1; // gettimersserver 1 = smarttvweb, 0 = restfulapi
-var testing5 = 1; // getrecordings 1 = smarttvweb, 2 = streamdev (not working yet)
+var get_marks; // getmarks 1 = smarttvweb, 0 = restfulapi
+var get_timer = 1; // gettimersserver 1 = smarttvweb, 0 = restfulapi
+var get_recordings = 1; // getrecordings 1 = smarttvweb, 2 = streamdev (not working yet)
var UseNewReclist = 1 ; //use new recordingslist function