timer to stop duplicate instant recordings.( Default 15 minutes)

Updated some files

5 files changed, 44 insertions, 14 deletions

diff --git a/History b/History
index 1a86c1f..68d4532 100644
--- a/History
+++ b/History
@@ -9,6 +9,7 @@ VDR 1.7.29
 	In guideview you can have updates for all channels in view, was changed because it was too slow on 1910/1960 but 1963/1903 can handle it.
 	Added PG & content info.
 	fixed show double epg info (epg shortinfo = epg ext. info)
+	timer to stop duplicate instant recordings.( Default 15 minutes)
 
 
 0.19	Added SleepTimer in menu 1 Settings. (Key is stopbutton)
diff --git a/Manual.txt b/Manual.txt
index 3f21806..1876ba3 100644
--- a/Manual.txt
+++ b/Manual.txt
@@ -80,7 +80,8 @@ Down	- scroll +1
 OK	- Shows info about timer
 Blue	- Shows info about timer
 Red	- Set switch timer
-Rec	-
+Rec	- Server recording (makes local timer and sends key 'record' when recording should start)
+Green	- local recording (hdd units only)
 
 
 Teletext mode
diff --git a/channels6.js b/channels6.js
index 6ce5b54..419b223 100644
--- a/channels6.js
+++ b/channels6.js
@@ -26,9 +26,9 @@ channels[6007]="S13.0E-318-5000-13767";
 channelsnames[6008] = "SCT HQ (S)";
 channels[6008]="S13.0E-318-5000-13768";
 channelsnames[6009] = "Dorcel TV (S)";
-channels[6009]="S19.2E-53-1097-2045";
+channels[6009]="S19.2E-53-1119-12882";
 channelsnames[6010] = "Hustler TV (S)";
-channels[6010]="S19.2E-53-1097-2042";
+channels[6010]="S19.2E-53-1119-12883";
 channelsnames[6011] = "FRENCH LOVER (S)";
 channels[6011]="S19.2E-1-1018-6407";
 channelsnames[6012] = "LIBIDO TV (S)";
@@ -40,7 +40,7 @@ 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";
+channels[6018]="PS/S30.0W-54-37-1666.vob";
 channelsnames[6019] = "Leo TV (S)";
 channels[6019]="S23.5E-3-3209-13119";
 channelsnames[6020] = "Private Spice (S)";
@@ -83,7 +83,5 @@ channelsnames[6040] = "HUSTLER HD-3D (S)";
 channels[6040]="S13.0E-318-15800-16933";
 channelsnames[6041] = "DARING TV (S)";
 channels[6041]="S13.0E-318-15800-16931";
-channelsnames[6042] = "Penthouse HD. (S)"
-channels[6042] = "S23.5E-3-3202-6094"
 
-maxChan[6] = 6042; // set to max prt channel else you see 'undefined' in guide view
+maxChan[6] = 6041; // set to max prt channel else you see 'undefined' in guide view
diff --git a/index.html b/index.html
index 4b44279..f868ea3 100644
--- a/index.html
+++ b/index.html
@@ -1169,7 +1169,7 @@ function GetEPG(epgchan)
 	EPG[0][4][epgchan] = "";
 	EPG[0][5][epgchan] = "";
 	if (event.parentalRating) {
-		EPG[0][8][epgchan] = "<br>( from " + (event.parentalRating + 3) + ")";
+		EPG[0][8][epgchan] = "<br>( from " + (event.parentalRating + 3) + " )";
 	} else {
 		EPG[0][8][epgchan] = "";
 	}
@@ -1215,7 +1215,7 @@ function GetEPG(epgchan)
 	EPG[1][4][epgchan] = "";
 	EPG[1][5][epgchan] = "";
 	if (event.parentalRating) {
-		EPG[1][8][epgchan] = "<br>( from " + (event.parentalRating + 3) + ")";
+		EPG[1][8][epgchan] = "<br>( from " + (event.parentalRating + 3) + " )";
 	} else {
 		EPG[1][8][epgchan] = "";
 	}
@@ -3275,7 +3275,20 @@ function onStateChanged(ev) {
 
 function ServerRecordStart() {
 //Instant recording on server
-try {
+
+//Check if no recording on this channel is started the last 15 min.
+//
+var ii = SwitchTimer;
+SwitchTimer = 0;
+
+var trec = "OK";
+for (var i=0; i<instanttimer.length; i++) {
+ if (instanttimer[i] == currChan) { trec = "NOK" } 
+}
+
+//only record if nothing is running 
+ if (trec == "OK"){
+  try {
    xmlhttp=new XMLHttpRequest();
 	//switch server to current channel
    xmlhttp.open("POST",(RestFulAPI + "/remote/switch/" + channels[currChan]),true);
@@ -3283,6 +3296,11 @@ try {
 	//start recording
 	setTimeout("xmlhttp.open('POST',(RestFulAPI + '/remote/Record'),false);xmlhttp.send();",5000);
 
+	//set timer to ignore duplicate recordings within inst_timeout
+	instanttimer[inst_timer] = currChan;
+	setTimeout("instanttimer[inst_timer] = '';", inst_timeout);
+	inst_timer = inst_timer + 1;
+
 	//Show some info on screen
 	settimer(EPG[NowNext][2][currChan],EPG[NowNext][1][currChan],0);
 	switchtimer.style.opacity = 1;
@@ -3291,6 +3309,14 @@ try {
   } catch(e) {
    alert("Sending Record key to server problem: " + e);
   }
+ } else {
+	settimer(EPG[NowNext][2][currChan],"ERROR recording already running",0);
+	switchtimer.style.opacity = 1;
+	setTimeout("switchtimer.style.opacity = 0; ", 2000);
+ }
+
+SwitchTimer = ii;
+//end of function
 }
 
 function ServerRecordStop() {
@@ -3392,9 +3418,9 @@ function ShowMediaOSD() {
 		x = pos3;
 		pos6 = Right(pos5,140 - pos3);
 		}
-		pos4 = pos4 + "</font><font color=red>" + pos6 + "</font>";
-		var x = (Number(recDura[currMed])/60).toFixed(0);
-		if (pos/60 > x) { x = (pos/60).toFixed(0);}
+	pos4 = pos4 + "</font><font color=red>" + pos6 + "</font>";
+	var x = (Number(recDura[currMed])/60).toFixed(0);
+	if (pos/60 > x) { x = (pos/60).toFixed(0);}
 	osdmedia.innerHTML = "<pre style='color:white;font-size:" + fsMedia +";'>  " + (pos/60).toFixed(0) + " / " + x + "  " + Left(recTitl[currMed],40) + "\n  " + pos4 + " </pre>";
 }
 
diff --git a/settings.js b/settings.js
index 3a6eb0b..d967647 100644
--- a/settings.js
+++ b/settings.js
@@ -33,6 +33,7 @@ var mediaRecorder = 1; // 0 = no, 1 = yes local recording.
 
 var fullupdate = 1; // If guideview is too slow, set it to 0 (for 1910/1960), faster boxes can use 1
 
+var inst_timeout = 15 * 1000; // 15 minutes
 
 var serverEPGdays = 3 * (60 * 60 * 24); // the higher the longer you wait while getting the epg info
 
@@ -170,11 +171,14 @@ var preChan = 0;
 var timerChan = 10;
 var TimerActions = "";
 var switchtimerID = 0;
-var SwitchTimer = 1; // 1 - switchonly, 2 - record local, 3 - record on server (only 1 & 2 are working)
+var SwitchTimer = 1; // 1 - switchonly, 2 - record on server (localtimer), 3 - record local
 var initialDelayID = 0;
 var SleepTimer = 0;
 var SleepTimerID = -1;
 
+var instanttimer = new Array();
+var inst_timer = 0;
+
 var switchicon = "\uE003";
 var CAicon = "\uE00F";
 var RECicon = "\uE003";