2006-03-30: 3.4.4rcv3.4.4rc

- Fixed: new TV grabbing introduced with beta2 (Many thanks to horchi for reporting and testing).
- Changed: check if a timer to be programmed by an AutoTimer already exists (Requested by several people).
- Added: display AutoTimer information in timer's edit view (Somehow requested by MarkusE).
- Fixed: recordings/timers/autotimers containing double-quotes couldn't be deleted (Reported by The Unknown).

2 files changed, 25 insertions, 23 deletions

diff --git a/template/default/timer_new.html b/template/default/timer_new.html
index b6ac8c5..76c5258 100644
--- a/template/default/timer_new.html
+++ b/template/default/timer_new.html
@@ -83,7 +83,7 @@
 				<td class="col_value">
 					<input type="hidden" name="event_id" value="<tmpl_var event_id>"/>
 					<tmpl_if expr="at_epg == 1">
-						<input type="radio" name="autotimer" value="2" id="event_id" <tmpl_if expr="autotimer == 2">checked</tmpl_if> /><label for="event_id"><%! Transmission Identification !%></label>
+						<input type="radio" name="autotimer" value="2" id="event_id" <tmpl_if expr="autotimer == 2">checked</tmpl_if> /><label for="event_id"><%! Transmission Identification !%> (<tmpl_var event_id>)</label>
 					</tmpl_if>
 					<input type="radio" name="autotimer" value="1" id="event_time" <tmpl_if expr="autotimer == 1">checked</tmpl_if> /><label for="event_time"><%! Time !%></label>
 					<input type="radio" name="autotimer" value="0" id="event_off" <tmpl_if expr="autotimer == 0">checked</tmpl_if> /><label for="event_off"><%! off !%></label>
@@ -126,6 +126,9 @@
 					<b>&nbsp;:&nbsp;</b>
 					<input type="text" name="startm" value="<tmpl_var startm>" size="2" maxlength="2" />
 					&nbsp;<%! o'clock !%>
+					<tmpl_if bstart>
+						(<%! Buffer: !%> <tmpl_var bstart> <%! minutes !%>)
+					</tmpl_if>
 				</td>
 				<td  class="col_right"></td>
 			</tr>
@@ -137,6 +140,9 @@
 					<b>&nbsp;:&nbsp;</b>
 					<input type="text" name="stopm" value="<tmpl_var stopm>" size="2" maxlength="2" />
 					&nbsp;<%! o'clock !%>
+					<tmpl_if bstop>
+						(<%! Buffer: !%> <tmpl_var bstop> <%! minutes !%>)
+					</tmpl_if>
 				</td>
 				<td  class="col_right"></td>
 			</tr>
@@ -170,6 +176,14 @@
 				<td class="col_value"><textarea name="summary" rows="6" cols="80" readonly="readonly"><tmpl_var summary></textarea></td>
 				<td class="col_right"></td>
 			</tr>
+<tmpl_if pattern>
+			<tr class="row_even">
+				<td  class="col_left"></td>
+				<td  class="col_label"><h5><%! Timer has been set by AutoTimer pattern: !%></h5></td>
+				<td  class="col_value"><tmpl_var pattern></td>
+				<td  class="col_right"></td>
+			</tr>
+</tmpl_if>
 			<tr class="footer">
 				<td class="col_left"></td>
 				<td colspan="2"></td>
diff --git a/template/default/tv.html b/template/default/tv.html
index 24ad372..fc60d6d 100644
--- a/template/default/tv.html
+++ b/template/default/tv.html
@@ -11,7 +11,6 @@
 	<script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
 	<script type="text/javascript" language="JavaScript">
 		<!--
-		var aktiv;
 		var timeout;
 		var interval = <tmpl_var interval>;
 		var size = "<tmpl_var size>";
@@ -26,6 +25,7 @@
 		}
 
 		function switch_channel(url) {
+			v_Stop();
 			Now = new Date();
 			document.switchimage.src = url + "&rand=" + Now.getTime();
       timeout = window.setTimeout("WebcamUpdate()", 500);
@@ -35,41 +35,29 @@
 			Before = new Date();
 			NewPicUrl = "<tmpl_var url>&size=" + size + "&rand=" + Before.getTime();
 			document.Bild.src = NewPicUrl;
-			After = new Date();
-			timeout = window.setTimeout("WebcamUpdate()", (interval * 1000) - (After - Before));
-		}
-
-		function go() {
-			WebcamUpdate();
-//      v_Start();
-		}
-
-		function v_Start() {
-			aktiv = window.setInterval("WebcamUpdate()", interval * 1000);
+			if(interval > 0) {
+				After = new Date();
+				wait_sec = (interval * 1000) - (After - Before);
+				timeout = window.setTimeout("WebcamUpdate()", wait_sec > 0 ? wait_sec : 0);
+			}
 		}
 
 		function v_Stop() {
-//			window.clearInterval(aktiv);
-			cleanTimeout(timeout);
+			window.clearTimeout(timeout);
 		}
 
 		function v_changeInterval(val) {
 			interval = val;
 			v_Stop();
 			if(interval > 0) {
-			  go();
+			  WebcamUpdate();
 			};
 		}
 
 		function v_changeSize(val) {
 			size = val;
 			v_Stop();
-			if(interval > 0) {
-		  	go();
-			}
-			else {
-				WebcamUpdate();
-			};
+			WebcamUpdate();
 		}
 
 		function tv_open() {
@@ -79,7 +67,7 @@
 	</script>
 </head>
 
-<body onLoad="window.focus();go()" id="tv"> 
+<body onLoad="window.focus();WebcamUpdate()" id="tv"> 
 	<form action="<tmpl_var url>" method="get" name="liveform">
 		<table width="200" border="0" cellspacing="0" cellpadding="0" style="background-image: url(bilder/tv_bottom.gif);">
 			<tr>