From d7125846e2cf34d647de4e86ca3222fc6040579a Mon Sep 17 00:00:00 2001
From: rperezgonz <rpg0702@gmail.com>
Date: Sat, 12 May 2018 21:01:32 +0200
Subject: [PATCH] issue #1149: solved problem with usbcam and rename it

---
 src/drivers/cameraserver_web/package.json     |  21 ------------------
 .../.DS_Store                                 | Bin
 .../main.js                                   |   0
 .../package-lock.json                         |   0
 src/drivers/camserverWeb/package.json         |  15 +++++++++++++
 .../public/config.yml                         |   0
 .../public/css/bootstrap.min.css              |   0
 .../public/css/cameraserver.css               |   0
 .../public/css/fondo.png                      | Bin
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 .../fonts/glyphicons-halflings-regular.woff2  | Bin
 .../public/index.html                         |  12 +++++-----
 .../public/js/CamServer.js}                   |   0
 .../public/js/apiCamServer.js}                |  14 +++++++++---
 .../public/js/bootstrap.min.js                |   0
 .../public/js/camserverWeb.js}                |   0
 .../public/js/jquery.min.js                   |   0
 .../public/js/roslibjs.min.js                 |   0
 .../{cameraserver_web => camserverWeb}/run.js |   0
 22 files changed, 32 insertions(+), 30 deletions(-)
 delete mode 100755 src/drivers/cameraserver_web/package.json
 rename src/drivers/{cameraserver_web => camserverWeb}/.DS_Store (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/main.js (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/package-lock.json (100%)
 create mode 100755 src/drivers/camserverWeb/package.json
 rename src/drivers/{cameraserver_web => camserverWeb}/public/config.yml (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/css/bootstrap.min.css (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/css/cameraserver.css (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/css/fondo.png (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/fonts/glyphicons-halflings-regular.eot (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/fonts/glyphicons-halflings-regular.svg (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/fonts/glyphicons-halflings-regular.ttf (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/fonts/glyphicons-halflings-regular.woff (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/fonts/glyphicons-halflings-regular.woff2 (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/index.html (92%)
 rename src/drivers/{cameraserver_web/public/js/CameraServer.js => camserverWeb/public/js/CamServer.js} (100%)
 rename src/drivers/{cameraserver_web/public/js/apiCameraServer.js => camserverWeb/public/js/apiCamServer.js} (90%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/js/bootstrap.min.js (100%)
 rename src/drivers/{cameraserver_web/public/js/cameraserverweb.js => camserverWeb/public/js/camserverWeb.js} (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/js/jquery.min.js (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/public/js/roslibjs.min.js (100%)
 rename src/drivers/{cameraserver_web => camserverWeb}/run.js (100%)

diff --git a/src/drivers/cameraserver_web/package.json b/src/drivers/cameraserver_web/package.json
deleted file mode 100755
index d286dd715..000000000
--- a/src/drivers/cameraserver_web/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "CameraServer",
-  "version": "0.1.0",
-  "main": "main.js",
-  "scripts": {
-    "start": "electron ."
-  },
-  "devDependencies": {
-    "electron": "^1.8.4",
-    "js-yaml": "^3.10.0"
-  },
-  "dependencies": {
-    "express": "^4.15.2",
-    "getusermedia": "^2.0.1",
-    "jquery": "^3.3.1",
-    "ros": "^1.0.4",
-    "roslib": "^0.20.0",
-    "roslibjs-client": "^0.2.1",
-    "yaml": "^0.3.0"
-  }
-}
diff --git a/src/drivers/cameraserver_web/.DS_Store b/src/drivers/camserverWeb/.DS_Store
similarity index 100%
rename from src/drivers/cameraserver_web/.DS_Store
rename to src/drivers/camserverWeb/.DS_Store
diff --git a/src/drivers/cameraserver_web/main.js b/src/drivers/camserverWeb/main.js
similarity index 100%
rename from src/drivers/cameraserver_web/main.js
rename to src/drivers/camserverWeb/main.js
diff --git a/src/drivers/cameraserver_web/package-lock.json b/src/drivers/camserverWeb/package-lock.json
similarity index 100%
rename from src/drivers/cameraserver_web/package-lock.json
rename to src/drivers/camserverWeb/package-lock.json
diff --git a/src/drivers/camserverWeb/package.json b/src/drivers/camserverWeb/package.json
new file mode 100755
index 000000000..b81068014
--- /dev/null
+++ b/src/drivers/camserverWeb/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "CamServerWeb",
+  "version": "0.1.0",
+  "main": "main.js",
+  "scripts": {
+    "start": "electron ."
+  },
+  "devDependencies": {
+    "electron": "^1.8.4",
+    "js-yaml": "^3.10.0"
+  },
+  "dependencies": {
+    "jquery": "^3.3.1"
+  }
+}
diff --git a/src/drivers/cameraserver_web/public/config.yml b/src/drivers/camserverWeb/public/config.yml
similarity index 100%
rename from src/drivers/cameraserver_web/public/config.yml
rename to src/drivers/camserverWeb/public/config.yml
diff --git a/src/drivers/cameraserver_web/public/css/bootstrap.min.css b/src/drivers/camserverWeb/public/css/bootstrap.min.css
similarity index 100%
rename from src/drivers/cameraserver_web/public/css/bootstrap.min.css
rename to src/drivers/camserverWeb/public/css/bootstrap.min.css
diff --git a/src/drivers/cameraserver_web/public/css/cameraserver.css b/src/drivers/camserverWeb/public/css/cameraserver.css
similarity index 100%
rename from src/drivers/cameraserver_web/public/css/cameraserver.css
rename to src/drivers/camserverWeb/public/css/cameraserver.css
diff --git a/src/drivers/cameraserver_web/public/css/fondo.png b/src/drivers/camserverWeb/public/css/fondo.png
similarity index 100%
rename from src/drivers/cameraserver_web/public/css/fondo.png
rename to src/drivers/camserverWeb/public/css/fondo.png
diff --git a/src/drivers/cameraserver_web/public/fonts/glyphicons-halflings-regular.eot b/src/drivers/camserverWeb/public/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from src/drivers/cameraserver_web/public/fonts/glyphicons-halflings-regular.eot
rename to src/drivers/camserverWeb/public/fonts/glyphicons-halflings-regular.eot
diff --git a/src/drivers/cameraserver_web/public/fonts/glyphicons-halflings-regular.svg b/src/drivers/camserverWeb/public/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from src/drivers/cameraserver_web/public/fonts/glyphicons-halflings-regular.svg
rename to src/drivers/camserverWeb/public/fonts/glyphicons-halflings-regular.svg
diff --git a/src/drivers/cameraserver_web/public/fonts/glyphicons-halflings-regular.ttf b/src/drivers/camserverWeb/public/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from src/drivers/cameraserver_web/public/fonts/glyphicons-halflings-regular.ttf
rename to src/drivers/camserverWeb/public/fonts/glyphicons-halflings-regular.ttf
diff --git a/src/drivers/cameraserver_web/public/fonts/glyphicons-halflings-regular.woff b/src/drivers/camserverWeb/public/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from src/drivers/cameraserver_web/public/fonts/glyphicons-halflings-regular.woff
rename to src/drivers/camserverWeb/public/fonts/glyphicons-halflings-regular.woff
diff --git a/src/drivers/cameraserver_web/public/fonts/glyphicons-halflings-regular.woff2 b/src/drivers/camserverWeb/public/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from src/drivers/cameraserver_web/public/fonts/glyphicons-halflings-regular.woff2
rename to src/drivers/camserverWeb/public/fonts/glyphicons-halflings-regular.woff2
diff --git a/src/drivers/cameraserver_web/public/index.html b/src/drivers/camserverWeb/public/index.html
similarity index 92%
rename from src/drivers/cameraserver_web/public/index.html
rename to src/drivers/camserverWeb/public/index.html
index e0e6dc3ca..fc1b704c1 100755
--- a/src/drivers/cameraserver_web/public/index.html
+++ b/src/drivers/camserverWeb/public/index.html
@@ -3,7 +3,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-   <title>CameraServer-Web</title>
+   <title>CamServerWeb</title>
    <meta name="description" content="">
 
    <!-- core CSS -->
@@ -17,7 +17,7 @@
   <nav class="navbar navbar-inverse" role="banner">
     <div class="container">
       <div class="navbar-header">
-        <a class="navbar-brand " href="#"><i class="fa fa-bolt"></i> JdeRobot Driver CameraServer Web</a>
+        <a class="navbar-brand " href="#"><i class="fa fa-bolt"></i> JdeRobot Driver CamServerWeb</a>
      </div>
     </div>
     <!--/.container-->
@@ -43,7 +43,7 @@ <h1><p id = "activeCam"></p></h1>
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="configLabel">CameraServer Config</h4>
+        <h4 class="modal-title" id="configLabel">CamServer Config</h4>
       </div>
       <div id = "confignav" class="modal-body">
         <br>
@@ -91,9 +91,9 @@ <h4 class="modal-title" id="configLabel">CameraServer Config</h4>
   </script>
   <script src="js/jquery.min.js"></script>
   <script src="js/bootstrap.min.js"></script>
-  <script src="js/cameraserverweb.js"></script>
-  <script src="js/CameraServer.js"></script>
-  <script src="js/apiCameraServer.js"></script>
+  <script src="js/camserverWeb.js"></script>
+  <script src="js/CamServer.js"></script>
+  <script src="js/apiCamServer.js"></script>
   <script type="text/javascript" src="http://static.robotwebtools.org/EventEmitter2/current/eventemitter2.min.js"></script>
   <script type="text/javascript" src="http://static.robotwebtools.org/roslibjs/current/roslib.min.js"></script>
 </body>
diff --git a/src/drivers/cameraserver_web/public/js/CameraServer.js b/src/drivers/camserverWeb/public/js/CamServer.js
similarity index 100%
rename from src/drivers/cameraserver_web/public/js/CameraServer.js
rename to src/drivers/camserverWeb/public/js/CamServer.js
diff --git a/src/drivers/cameraserver_web/public/js/apiCameraServer.js b/src/drivers/camserverWeb/public/js/apiCamServer.js
similarity index 90%
rename from src/drivers/cameraserver_web/public/js/apiCameraServer.js
rename to src/drivers/camserverWeb/public/js/apiCamServer.js
index 2100cc736..65106efb5 100755
--- a/src/drivers/cameraserver_web/public/js/apiCameraServer.js
+++ b/src/drivers/camserverWeb/public/js/apiCamServer.js
@@ -47,7 +47,6 @@ API.CameraServer = function (conf){
 
 
       function cameraOn(){
-
           videoSource = $("#videoSource").val();
           var constraints = {};
           if (videoSource == null) {
@@ -63,8 +62,16 @@ API.CameraServer = function (conf){
             }).catch(function(err) {
               alert(err.name + ": " + err.message);
             });
-      }
+     	 }
 
+	function cameraOff(){
+	    let stream = video.srcObject;
+	    let tracks = stream.getTracks();
+	    tracks.forEach(function(track) {
+	      track.stop();
+	    });
+	    video.srcObject = null;
+	  }
 
   video.addEventListener('canplay', function(ev){
     if (!hasRunOnce) {
@@ -81,7 +88,7 @@ API.CameraServer = function (conf){
   this.startStreaming = function () {
     if(cameraTimer == null) {
         self.ros.connect("ws://" + config.serv.dir + ":" + config.serv.port);
-        document.getElementById("activeCam").innerHTML = "CamereServer active in address " + config.serv.dir + " and port " + config.serv.port;
+        document.getElementById("activeCam").innerHTML = "CamServer active in address " + config.serv.dir + " and port " + config.serv.port;
         cameraOn();
         cameraTimer = setInterval(function(){
           canvas.width = width;
@@ -108,6 +115,7 @@ API.CameraServer = function (conf){
    }
 
    this.restart = function() {
+     cameraOff();
      self.ros.close();
    }
 }
diff --git a/src/drivers/cameraserver_web/public/js/bootstrap.min.js b/src/drivers/camserverWeb/public/js/bootstrap.min.js
similarity index 100%
rename from src/drivers/cameraserver_web/public/js/bootstrap.min.js
rename to src/drivers/camserverWeb/public/js/bootstrap.min.js
diff --git a/src/drivers/cameraserver_web/public/js/cameraserverweb.js b/src/drivers/camserverWeb/public/js/camserverWeb.js
similarity index 100%
rename from src/drivers/cameraserver_web/public/js/cameraserverweb.js
rename to src/drivers/camserverWeb/public/js/camserverWeb.js
diff --git a/src/drivers/cameraserver_web/public/js/jquery.min.js b/src/drivers/camserverWeb/public/js/jquery.min.js
similarity index 100%
rename from src/drivers/cameraserver_web/public/js/jquery.min.js
rename to src/drivers/camserverWeb/public/js/jquery.min.js
diff --git a/src/drivers/cameraserver_web/public/js/roslibjs.min.js b/src/drivers/camserverWeb/public/js/roslibjs.min.js
similarity index 100%
rename from src/drivers/cameraserver_web/public/js/roslibjs.min.js
rename to src/drivers/camserverWeb/public/js/roslibjs.min.js
diff --git a/src/drivers/cameraserver_web/run.js b/src/drivers/camserverWeb/run.js
similarity index 100%
rename from src/drivers/cameraserver_web/run.js
rename to src/drivers/camserverWeb/run.js