From 8b1f8e341c2c9c4dbec82a39bf7bf54497e3c00a Mon Sep 17 00:00:00 2001
From: Randall Barker <rbarker@mozilla.com>
Date: Tue, 7 Oct 2014 14:41:45 -0700
Subject: [PATCH] Updating to latest code.

---
 chromecast.html | 140 ++++++++++++++++++++----------------------------
 demostyle.css   |   7 +++
 mozdemo.js      |   5 --
 3 files changed, 64 insertions(+), 88 deletions(-)
diff --git a/chromecast.html b/chromecast.html
index 65fc83a..3c0c455 100644
--- a/chromecast.html
+++ b/chromecast.html
@@ -4,111 +4,85 @@
     <script src="//www.gstatic.com/cast/sdk/libs/receiver/2.0.0/cast_receiver.js"></script>
     <style>
       body {
-      color: white;
+      color: yellow;
+      background-color: white;
       }
     </style>
-    <script src="adapter.js"></script>
-    <script src="mozdemo.js?5"></script>
-    <link rel='stylesheet' href="demostyle.css"></link>
+    <script src="adapter.js?1"></script>
+    <script src="mozdemo.js?1"></script>
+    <link rel='stylesheet' href="demostyle.css?3"></link>
   </head>
   <body>
-    <span>hello</span>
-    <span style="color:red">world 5</span>
-    <div id="header"><h2>TabCast: You are the sender</h2></div>
-    <div id="status"></div>
-    <div id="sender_inst">
-      <div>Open this link in another tab or browser</div>
-      <div> <a id="link">right click here</a></div>
-      <div>That other tab or browser will have text in a red box that you'll paste here:</div>
-      <textarea id="answer"></textarea>
-      <button onclick="answer_click()">submit answer</button>
-    </div>
-    <div style="display:none" id="receiver_inst">
-      <div>Copy this text and paste it into the input box of the sender tab</div>
-      <div style="border:thin red solid" id="answer_json"> </div>
-    </div>
-    <div>
+      <video id="video" autoplay="TRUE"></video><br/>
 
-      <div id="remote">
-        <div id="remote-caption"><h2>Remote</h1></div>
-<div>
-  <video style="border:thin blue solid" id="video" width="320" height="240" autoplay="TRUE"></video><br/>
-</div><br/>
-</div>
-
-</div>
-<div style="color:green; font-size: xx-small;" id="logwindow"></div>
+    <div style="color:green; font-size: xx-small;" id="logwindow"></div>
 
 
-<script>
-  //window.location.reload(true);
-  var me = "castee";
-  var them = "caster";
-  var start = false;
-  document.getElementById("sender_inst").style.display = "none";
-  document.getElementById("receiver_inst").style.display = "block";
-  document.getElementById("header").firstChild.innerHTML = "TabCast: You are the reciever";
+    <script>
+      //window.location.reload(true);
+      var me = "castee";
+      var them = "caster";
+      var start = false;
+      var extra = {};
+      if (true ) {
+      extra.video=true;
+      }
+      if (false ) {
+      extra.audio=true;
+      }
+      if (true ) {
+      extra.demo=true;
+      }
+      if (false ) {
+      extra.turn_only=true;
+      }
 
-  var extra = {};
-  if (true ) {
-  extra.video=true;
-  }
-  if (false ) {
-  extra.audio=true;
-  }
-  if (true ) {
-  extra.demo=true;
-  }
-  if (false ) {
-  extra.turn_only=true;
-  }
+      var senderId = null;
 
-  var senderId = null;
+      var divs = {
+      local_video :  null,
+      remote_video : document.getElementById("video") ,
+      };
+      in_queue = [];
+      var client = new CallingClient({}, me, them, divs, start, extra);
 
-  var divs = {
-  local_video :  null,
-  remote_video : document.getElementById("video") ,
-  };
-  in_queue = [];
-  var client = new CallingClient({}, me, them, divs, start, extra);
-
-  window.onload = function() {
-    try {
-     cast.receiver.logger.setLevelValue(cast.receiver.LoggerLevel.DEBUG);
+      window.onload = function() {
+      try {
+      cast.receiver.logger.setLevelValue(cast.receiver.LoggerLevel.DEBUG);
       window.castReceiverManager = cast.receiver.CastReceiverManager.getInstance();
 
       window.castReceiverManager.onSenderConnected = function(event) {
-        ui_log("sender connected: " + JSON.stringify(event));
+      ui_log("sender connected: " + JSON.stringify(event));
 
       }
       window.castReceiverManager.onReady = function(event) {
-        ui_log("on ready");
-        try {
-        console.log("### Cast Receiver Manager is READY: " + JSON.stringify(event));
-        ui_log("onReady: " +  JSON.stringify(event));
-        } catch(e) {
-          ui_log(e);
-       }
+      ui_log("on ready");
+      try {
+      console.log("### Cast Receiver Manager is READY: " + JSON.stringify(event));
+      ui_log("onReady: " +  JSON.stringify(event));
+      } catch(e) {
+      ui_log(e);
+      }
       }
 
-        window.messageBus = window.castReceiverManager.getCastMessageBus('urn:x-cast:org.mozilla.castin');
-        ui_log("bus: " + messageBus);
-        //window.messageBus.broadcast("broadcast");
-        window.messageBus.onMessage = function(event) {
-          ui_log("onMessage called with: " + event.data);
-          senderId = event.senderId;
-          //window.messageBus.send(event.senderId, "msg");
-          in_queue.push(event.data);
-          //ui_log("msg sent");
-        }
+      window.messageBus = window.castReceiverManager.getCastMessageBus('urn:x-cast:org.mozilla.mirror');
+      ui_log("bus: " + messageBus);
+      //window.messageBus.broadcast("broadcast");
+      window.messageBus.onMessage = function(event) {
+      ui_log("onMessage called with: " + event.data);
+      senderId = event.senderId;
+      //window.messageBus.send(event.senderId, "msg");
+      in_queue.push(event.data);
+      //ui_log("msg sent");
+      }
 
       var appConfig = new cast.receiver.CastReceiverManager.Config();
       appConfig.statusText = "let's cast";
       appConfig.maxInactvity = 6000;
       window.castReceiverManager.start(appConfig);
 
-    } catch(e) {ui_log(e);}
-  }
-</script>
-</body>
+      } catch(e) {ui_log(e);}
+      }
+    </script>
+  </body>
 </html>
diff --git a/demostyle.css b/demostyle.css
index 88f2bae..5b97b72 100644
--- a/demostyle.css
+++ b/demostyle.css
@@ -31,3 +31,10 @@ html, body {
      clear:both;
      display:none;
 }
+
+#video {
+    width:100%;
+    height:100%;
+    margin-left: auto;
+    margin-right: auto;
+}
diff --git a/mozdemo.js b/mozdemo.js
index 8451279..ed97fb3 100644
--- a/mozdemo.js
+++ b/mozdemo.js
@@ -21,11 +21,6 @@ var color_log = function(msg, color) {
 var out_queue = []
 var in_queue = null;
 
-function answer_click() {
-  var textarea = document.getElementById("answer");
-  in_queue = JSON.parse(textarea.value);
-  console.log("got " + in_queue.length + " messages");
-}
 
 
 
