diff --git a/www/camera.php b/www/camera.php index 12bdb92f0380969a07250b31bc8ed82187f1f912..793b5c39108524d48024c1f8a2e6f5dc535e1914 100644 --- a/www/camera.php +++ b/www/camera.php @@ -2,16 +2,20 @@ $camera = 'nocamera'; if (isset($_GET['camera'])) $camera=$_GET['camera']; - $imagelocation="../../"; + $imagelocation="../"; $file = $imagelocation.strtolower($camera).".jpg"; + $statusfile = $imagelocation.strtolower($camera).".status"; //echo $file; header("Expires: ".gmdate("D, d M Y H:i:s", time())." GMT"); if (!is_readable($file)) { $file="nocamera.jpg"; } + if (file_exists($statusfile)) + usleep(250000); header("Content-Type: image/jpeg"); header("Content-Length: ".filesize($file)); - header("Last-Modified: ".gmdate("D, d M Y H:i:s", filectime($file))." GMT"); + $fps = stat($file); + header("Last-Modified: ".gmdate("D, d M Y H:i:s", $fps[9])." GMT"); $fp = fopen($file, 'rb'); fpassthru($fp); fclose($fp); diff --git a/www/webcam-overrides.css b/www/webcam-overrides.css index 98eb295bb8ead2decd817eb995cde18a47257695..af81e540899cd4d6cc5d500f8d1bee18c5a1dded 100644 --- a/www/webcam-overrides.css +++ b/www/webcam-overrides.css @@ -33,7 +33,7 @@ body { } .offline { - opacity: 0.1; + /*opacity: 0.1;*/ } /* Haven't touched anything below this */ diff --git a/www/webcams.js b/www/webcams.js index 22b966d1c5ab135ee93f0b69a2d0b00b7dd34627..37533c173f7b3d2e2fed8bf14dff11b5bcc333b5 100644 --- a/www/webcams.js +++ b/www/webcams.js @@ -1,7 +1,7 @@ function windowOnload() { updateTime(); - setInterval("updateTime()",15000); + setInterval("updateTime()", 15000); } function updateWebcam (webcamid, webcamurl) @@ -37,13 +37,17 @@ function updateWebcam (webcamid, webcamurl) { var imgdate = new Date (Date.parse (req.getResponseHeader ("Last-Modified"))); var servdate = new Date (Date.parse (req.getResponseHeader ("Date"))); - if (Math.abs (imgdate.getTime () - servdate.getTime ()) > 1000 * 60 * 2) + if (Math.abs (imgdate.getTime () - servdate.getTime ()) > 1000 * 60 * 3) { + console.log("Out Of Sync"); + console.log("imgdate: " + imgdate); + console.log("servdate: " + servdate); // this image is out of date img.classList.add('offline'); } else { + //console.log("In Sync"); img.classList.remove('offline'); } }