summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/.main.js.swpbin12288 -> 0 bytes
-rw-r--r--js/cctv-control.js13
-rw-r--r--js/cctv-control.js.bak (renamed from js/main.js.bak)0
-rw-r--r--js/main.js100
4 files changed, 10 insertions, 103 deletions
diff --git a/js/.main.js.swp b/js/.main.js.swp
deleted file mode 100644
index b3ba802..0000000
--- a/js/.main.js.swp
+++ /dev/null
Binary files differ
diff --git a/js/cctv-control.js b/js/cctv-control.js
index 09e978f..b85fa89 100644
--- a/js/cctv-control.js
+++ b/js/cctv-control.js
@@ -1,8 +1,15 @@
-// Small lib to
-//
-//
+// CCTV Control
+//
+// Author: Florian Raemisch
+// Email: olf@subsignal.org
//
+// cctv-control is a webinterface to control and view
+// mjpeg encoded videos by cctv cameras which are
+// proxied by mjpegplexer. camera control is possible
+// with arrow-keys, if mjpegplexer is configured
+// properly.
//
+// This Software is licensed under the GPL Version 3, 29 June 2007
var cam = 0;
diff --git a/js/main.js.bak b/js/cctv-control.js.bak
index 7a12dce..7a12dce 100644
--- a/js/main.js.bak
+++ b/js/cctv-control.js.bak
diff --git a/js/main.js b/js/main.js
deleted file mode 100644
index b85fa89..0000000
--- a/js/main.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// CCTV Control
-//
-// Author: Florian Raemisch
-// Email: olf@subsignal.org
-//
-// cctv-control is a webinterface to control and view
-// mjpeg encoded videos by cctv cameras which are
-// proxied by mjpegplexer. camera control is possible
-// with arrow-keys, if mjpegplexer is configured
-// properly.
-//
-// This Software is licensed under the GPL Version 3, 29 June 2007
-
-
-var cam = 0;
-var camHost = "172.22.80.56:8080";
-var controlHost = "172.22.80.56:8080";
-
-//create event which is triggered when DOM is ready
-window.onDomReady = initReady;
-
-//change from testbild to default cam when DOM is ready
-window.onDomReady(changeCam);
-
-function initReady(fn) {
- if(document.addEventListener) {
- document.addEventListener("DOMContentLoaded", fn, false);
- }
-}
-
-//change currently displayed camera to the one in cam variable
-function changeCam() {
- var display = document.getElementById('screen');
- if (cam <= 7 && cam >= 0) {
- display.innerHTML = '<img src="http://' + camHost + '/cam/' + cam + '/stream.mjpeg" />';
- }
- else {
- display.innerHTML = '<img src="img/testbild.png" />';
- }
-}
-
-//send control command to currently selected camera
-function controlCam(direction) {
- if (direction == "left" || direction == "right" || direction == "up" || direction == "down") {
- var request = new XMLHttpRequest();
- request.open("get", "http://" + controlHost + "/cam/" + cam + "/control/" + direction + "left", false);
- request.send();
- return false;
- }
-
-
-function keyDown(event) {
-
- switch(event.keyCode) {
- case 49: // 1
- cam = 0;
- changeCam();
- break;
- case 50: // 2
- cam = 1;
- changeCam();
- break;
- case 51: // 3
- cam = 2;
- changeCam();
- break;
- case 52: // 4
- cam = 3;
- changeCam();
- break;
- case 53: // 5
- cam = 4;
- changeCam();
- break;
- case 54: // 6
- cam = 5;
- changeCam();
- break;
- case 55: // 7
- cam = 6;
- changeCam();
- break;
- case 56: // 8
- cam = 7;
- changeCam();
- break;
- case 37: // arrow left
- controlCam("left");
- break;
- case 38: // arrow up
- controlCam("up");
- break;
- case 39: // arrow right
- controlCam("right");
- break;
- case 40: // arrow down
- controlCam("down");
- break;
- }
-}