From 5229b0c0f3bc97dcd1239198f60620fab67486bb Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 14 Nov 2019 15:45:52 -0800
Subject: [PATCH] Various cleanup and CR

---
 interface/src/Application.cpp                 |  4 ---
 .../scripting/ScreenshareScriptingInterface.h |  4 +--
 screenshare/src/screenshareApp.html           | 15 ---------
 screenshare/src/screenshareApp.js             | 33 ++++++++++---------
 screenshare/src/screenshareMainProcess.js     | 10 +++---
 screenshare/src/styles.css                    |  4 ---
 6 files changed, 24 insertions(+), 46 deletions(-)
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f62196323d..28e3368b30 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -889,10 +889,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<ScriptCache>();
     DependencyManager::set<SoundCache>();
     DependencyManager::set<SoundCacheScriptingInterface>();
-    
-#ifdef HAVE_DDE
-    DependencyManager::set<DdeFaceTracker>();
-#endif
     DependencyManager::set<AudioClient>();
     DependencyManager::set<AudioScope>();
     DependencyManager::set<DeferredLightingEffect>();
diff --git a/interface/src/scripting/ScreenshareScriptingInterface.h b/interface/src/scripting/ScreenshareScriptingInterface.h
index d64daa6c6b..432f730e28 100644
--- a/interface/src/scripting/ScreenshareScriptingInterface.h
+++ b/interface/src/scripting/ScreenshareScriptingInterface.h
@@ -22,10 +22,10 @@
 class ScreenshareScriptingInterface : public QObject, public Dependency {
     Q_OBJECT
 public:
-	ScreenshareScriptingInterface();
+    ScreenshareScriptingInterface();
     ~ScreenshareScriptingInterface();
 
-	Q_INVOKABLE void startScreenshare(const QUuid& screenshareZoneID, const QUuid& smartboardEntityID, const bool& isPresenter = false);
+    Q_INVOKABLE void startScreenshare(const QUuid& screenshareZoneID, const QUuid& smartboardEntityID, const bool& isPresenter = false);
     Q_INVOKABLE void stopScreenshare();
 
 signals:
diff --git a/screenshare/src/screenshareApp.html b/screenshare/src/screenshareApp.html
index ed722f7fde..c647bd58a3 100644
--- a/screenshare/src/screenshareApp.html
+++ b/screenshare/src/screenshareApp.html
@@ -1,5 +1,4 @@
 <!-- 
-
 screenshareApp.html
 
 Created by Milad Nazeri, Rebecca Stankus, and Zach Fox 2019/11/13
@@ -7,7 +6,6 @@ Copyright 2019 High Fidelity, Inc.
 
 Distributed under the Apache License, Version 2.0.
 See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html 
-
 -->
 
 <html>
@@ -23,26 +21,13 @@ See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.
         <div id="select_screen">
             <div class="scrollbar" id="style-1">
                 <div class="force-overflow">
-        
                     <div id="selects">
-        
-                        <!-- <div class="box"> -->
-                            <!-- <div class="heading"> -->
-                                <!-- <div class="circle"></div> -->
-                                <!-- <span class=" abel">Screen 1</span> -->
-                            <!-- </div> heading -->
-                            <!-- <div class="image"> -->
-                            <!-- </div> -->
-                        <!-- </div> box -->
-        
                     </div>
-        
                 </div>
             </div>
         </div> 
         <div id="confirmation_screen" style="display: none;">
             <div id="share_pick">
-                    
             </div> <!-- share_pick --> 
             <div id="confirmation_text" style="color: white;">
                 <p>
diff --git a/screenshare/src/screenshareApp.js b/screenshare/src/screenshareApp.js
index 9fae20e0aa..245972f967 100644
--- a/screenshare/src/screenshareApp.js
+++ b/screenshare/src/screenshareApp.js
@@ -18,7 +18,7 @@ function handleError(error) {
 // When an application is picked, make sure we clear out the previous pick, toggle the page, 
 // and add the correct source
 let currentScreensharePickID = "";
-function screensharePicked(id){
+function screensharePicked(id) {
     currentScreensharePickID = id;
     document.getElementById("share_pick").innerHTML = "";
     togglePage();
@@ -28,8 +28,8 @@ function screensharePicked(id){
 
 // Once we have confirmed that we want to share, prepare the tokbox publishing initiating
 // and toggle back to the selects page
-function screenConfirmed(isConfirmed){    
-    document.getElementById("selects").innerHTML="";
+function screenConfirmed(isConfirmed) {    
+    document.getElementById("selects").innerHTML = "";
     if (isConfirmed === true){
         onAccessApproved(currentScreensharePickID);
     }
@@ -72,7 +72,7 @@ function addSource(source, type) {
 // Get the html created from the source.  Alter slightly depending on whether this source
 // is on the selects screen, or the confirmation screen.  Mainly removing highlighting.
 // If there is an app Icon, then add it.
-function renderSourceHTML(source){
+function renderSourceHTML(source) {
     let type = currentPage === "confirmationPage" ? "share_pick" : "selects";
     let sourceBody = document.createElement('div')
     let thumbnail = source.thumbnail.toDataURL();
@@ -101,7 +101,7 @@ function renderSourceHTML(source){
 // Separate out the screenshares and applications
 // Make sure the screens are labeled in order
 // Concact the two arrays back together and return
-function sortSources(){
+function sortSources() {
     let screenSources = [];
     let applicationSources = [];
     // Difference with Mac selects:
@@ -112,19 +112,19 @@ function sortSources(){
         } else {
             applicationSources.push(source)
         }
-    })
-    screenSources.sort( (a, b) => {
+    });
+    screenSources.sort((a, b) => {
         let aNumber = a.name.replace(/[^\d]/, "");
         let bNumber = b.name.replace(/[^\d]/, "");
         return aNumber - bNumber;
-    })
+    });
     let finalSources = [...screenSources, ...applicationSources];
     return finalSources;
 }
 
 
 // Setup sorting the selection array, add individual sources, and update the sourceMap
-function addSources(){
+function addSources() {
     screenshareSourceArray = sortSources();
     for (let i = 0; i < screenshareSourceArray.length; i++) {
         addSource(screenshareSourceArray[i], "selects");
@@ -158,6 +158,7 @@ function showSources() {
             console.log("Error getting sources", error);
         }
         for (let source of sources) {
+            // change this to a regex - thanks milad
             if (source.name.indexOf(SCREENSHARE_TITLE) > -1){
                 continue;
             }
@@ -171,7 +172,7 @@ function showSources() {
 
 // Stop the localstream and end the tokrok publishing
 let localStream;
-function stopSharing(){
+function stopSharing() {
     desktopSharing = false;
 
     if (localStream) {
@@ -191,7 +192,7 @@ function gotStream(stream) {
 
     stream.onended = () => {
         if (desktopSharing) {
-            toggle();
+            togglePage();
         }
     };
 }
@@ -243,7 +244,7 @@ function initializeTokboxSession() {
 
 // Init the tokbox publisher with our newly created stream
 var publisher; 
-function startTokboxPublisher(stream){
+function startTokboxPublisher(stream) {
     publisher = document.createElement("div");
     var publisherOptions = {
         videoSource: stream.getVideoTracks()[0],
@@ -269,7 +270,7 @@ function startTokboxPublisher(stream){
 
 
 // Kills the streaming being sent to tokbox
-function stopTokBoxPublisher(){
+function stopTokBoxPublisher() {
     publisher.destroy();
 }
 
@@ -280,18 +281,18 @@ let projectAPIKey;
 let sessionID;
 let token;
 let session;
-ipcRenderer.on('connectionInfo', function(event, message){
+ipcRenderer.on('connectionInfo', function(event, message) {
     const connectionInfo = JSON.parse(message);
     projectAPIKey = connectionInfo.projectAPIKey;
     sessionID = connectionInfo.sessionID;
     token = connectionInfo.token;
 
     initializeTokboxSession();
-})
+});
 
 
 // Show the initial sources after the dom has loaded
 // Sources come from electron.desktopCapturer
 document.addEventListener("DOMContentLoaded", () => {
     showSources();
-})
+});
diff --git a/screenshare/src/screenshareMainProcess.js b/screenshare/src/screenshareMainProcess.js
index c674a70505..5dce65a783 100644
--- a/screenshare/src/screenshareMainProcess.js
+++ b/screenshare/src/screenshareMainProcess.js
@@ -11,7 +11,7 @@ const {app, BrowserWindow, ipcMain} = require('electron');
 const gotTheLock = app.requestSingleInstanceLock()
 const argv = require('yargs').argv;
 
-// ./screenshare.exe --userName=miladN ...
+
 const connectionInfo = {
     token: argv.token || "token",
     projectAPIKey: argv.projectAPIKey || "projectAPIKey",
@@ -19,7 +19,7 @@ const connectionInfo = {
 }
 
 
-// Mac and Pc need slightly different width and height sizes.
+// Mac and PC need slightly different width and height sizes.
 const osType = require('os').type();
 let width;
 let height;
@@ -33,9 +33,9 @@ if (osType == "Darwin" || osType == "Linux") {
 
 
 if (!gotTheLock) {
-  console.log("Another instance of the screenshare is already running - this instance will quit.");
-  app.exit(0);
-  return;
+    console.log("Another instance of the screenshare is already running - this instance will quit.");
+    app.exit(0);
+    return;
 }
 
 let window;
diff --git a/screenshare/src/styles.css b/screenshare/src/styles.css
index c1a29d0a32..7c90980b7c 100644
--- a/screenshare/src/styles.css
+++ b/screenshare/src/styles.css
@@ -1,10 +1,6 @@
 body {
   background-color: black;
   box-sizing: border-box;
-  /* display: -webkit-flex; */
-  /* -webkit-justify-content: center; */
-  /* -webkit-align-items: center; */
-  /* -webkit-flex-direction: column; */
   font-family: "Graphik";
   margin: 0px 22px 10px 22px;
   }
