From 9ae052cb8e623ebaac90ff4a43ee4b4ede55a51a Mon Sep 17 00:00:00 2001
From: "M. Voerman" <rekordc@gmail.com>
Date: Fri, 1 Aug 2014 23:57:51 +0200
Subject: Removed some old code

---
 History     |  2 +-
 index.html  | 43 ++++---------------------------------------
 settings.js |  3 +--
 3 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/History b/History
index 013fba4..6442abb 100644
--- a/History
+++ b/History
@@ -12,7 +12,7 @@ VDR 1.7.29+
 	Duration of recording is show in Recordings list.
 	In recordings listing there is an other sublevel for directories, (use subgroup_old = 0 for old version)
 	In recordings listing, first sub directory is shown in Header
-
+	Removed some old, not in use, code for recordings listings
 
 0.24	vip.getmarks used for selecting getmarks 0 = restfulapi, 1 = SmartTVWeb (not all users have the newest SmartTVWeb)
 	Channels update.
diff --git a/index.html b/index.html
index 37f5977..d80ba22 100644
--- a/index.html
+++ b/index.html
@@ -2486,8 +2486,6 @@ function onKeyMenu(keyCode) {
 	InitMenu(menu);
     break;
     case "Teletext":
-	UseNewReclist = 1 - UseNewReclist;
-	alert(UseNewReclist);
     break;
     case "TV":
     break;
@@ -3873,7 +3871,7 @@ try {
 	   recTitl.length = 0;
 	   rec_lst.length = 0;
 
-	 if (UseNewReclist && recPath == "/recordings.xml") {
+	 if (recPath == "/recordings.xml") {
 	   for (var i=0;i<x.length;i++)
 		  { 
 			rec_lst[i] = new Array();
@@ -3923,17 +3921,9 @@ try {
 	          recStrt[i] = (x[i].getElementsByTagName("start")[0].childNodes[0].nodeValue);
 	          rec_New[i] = (x[i].getElementsByTagName("isnew")[0].childNodes[0].nodeValue);
 	          recGUID[i] = (x[i].getElementsByTagName("guid")[0].childNodes[0].nodeValue);
-	                if (recPath == "/recordings.xml") {
-	                  //Get channel number from recordings
-	                  recDummy = recGUID[i].split(".");
-	                  recDummy = recDummy[(recDummy.length-2)].split("-");
-	                  recChan[i] = recDummy[0] + "\uE003-\uE003" + channelsnames[(recDummy[0])];
-	                  recProt[i] = protChn[Number(Left((recDummy[0] / 1000),1))];
-	                } else {
-	                  //Media directory
-	                  recChan[i] = "Media File";
-	                  recProt[i] = 0; // No protection for Media Files.
-	                }
+                  //Media directory
+                  recChan[i] = "Media File";
+                  recProt[i] = 0; // No protection for Media Files.
 	         }
 	// 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;
@@ -3993,7 +3983,6 @@ try {
 	   recTitl.length = 0;
 	   rec_lst.length = 0;
 
-	 if (UseNewReclist) {
 	   for (var i=0;i<x.length;i++)
 		  { 
 			rec_lst[i] = new Array();
@@ -4028,30 +4017,7 @@ try {
 			recProt[i] = rec_lst[i][8];
 		}
 		recProt[i] = 1;
-	 } else {
-
-	 // old recordings list function
-	 // also used for media listing
-
-	   for (var i=0;i<x.length;i++) { 
-	          recTitl[i] = (x[i].getElementsByTagName("param")[1].childNodes[0].nodeValue);
-	          recTitl[i] = recTitl[i].split("~");
-	          recLink[i] = (x[i].getElementsByTagName("param")[2].childNodes[0].nodeValue);
-	          recDesc[i] = (x[i].getElementsByTagName("param")[13].childNodes[0].nodeValue);
-	          recDura[i] = (x[i].getElementsByTagName("param")[8].childNodes[0].nodeValue);
-	          recStrt[i] = (x[i].getElementsByTagName("param")[14].childNodes[0].nodeValue);
-	          rec_New[i] = (x[i].getElementsByTagName("param")[4].childNodes[0].nodeValue);
-	          recGUID[i] = (x[i].getElementsByTagName("param")[0].childNodes[0].nodeValue);
-	                  //Get channel number from recordings
-	                  recDummy = recLink[i].split(".");
-	                  recDummy = recDummy[(recDummy.length-2)].split("-");
-	                  recChan[i] = recDummy[0] + "\uE003-\uE003" + channelsnames[(recDummy[0])];
-	                  recProt[i] = protChn[Number(Left((recDummy[0] / 1000),1))];
-	         }
 	// 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;
-   }
-
 }
 
 
@@ -4414,7 +4380,6 @@ function MakeRecList_sublevel(GroupID) {
 						recList[i] = "" ; 
 					}
 					recSubGroup[i] = xx;
-						alert(recSubGroup[i] + "  " + recList[i]);
 				} else { 
 					recSubGroup[i] = 0;
 					var tmp = "";
diff --git a/settings.js b/settings.js
index 4dca93f..e1c6b5a 100644
--- a/settings.js
+++ b/settings.js
@@ -2,7 +2,7 @@
 // Default settings
 // 
 
-var Version = "0.25.11";
+var Version = "0.25.12";
 
 server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://easyvdr","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");
 
@@ -23,7 +23,6 @@ var get_marks = 1;// getmarks 1 = smarttvweb, 0 = restfulapi
 var subgroup_old = 1 ;// 0 = use old routine for sub group in recordings listing.
 
 var SortByDate = 1; //Sort recordings by date
-var UseNewReclist = 1 ; //use new recordingslist function
 
 var ShowSubDir = 1 ; // 0 = no, 1 = yes (default) // show seperate maps for subdirs in menu recordings
 var showClock = 0;   // 0 = no, 1 = yes
-- 
cgit v1.2.3