David A. Windham
david
/
daveo-webrtc
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

edited for use with the only websocket part

Dennis Mårtensson 12 years ago
parent
c002a3c306
commit
e6cad947d2
3 changed files with 11 additions and 38 deletions
Split View Show Diff Stats
  1. 2 22
      example/index.html
  2. 8 16
      example/server.js
  3. 1 0
      example/webrtc.io.js

+ 2 - 22
example/index.html
View File 

@@ -4,8 +4,7 @@
 
     <title>Example webrtc.io</title>
 
     <link type="text/css" href="/style.css" rel="stylesheet"></link>
 
 
-    <script src="/socket.io/socket.io.js"></script>
 
-    <script src="/webrtc.io/webrtc.io.js"></script>
 
+    <script src="/webrtc.io.js"></script>
 
   </head>
 
   <body onload="init()">
 
     <div id="videos">
 
@@ -56,7 +55,6 @@
 
         var perColumn = Math.ceil(videos.length / perRow);
 
         var width = Math.floor((window.innerWidth) / perRow);
 
         var height = Math.floor((window.innerHeight - 190) / perColumn);
 
-        console.log(width, height);
 
         video.width = width;
 
         video.height = height;
 
         video.style.position = "absolute";
 
@@ -80,23 +78,6 @@
 
         }
 
       }
 
 
-      function initChat() {
 
-
 
-        var input = document.getElementById("chatinput");
 
-        input.addEventListener('keydown', function(event) {
 
-          var key = event.which || event.keyCode;
 
-          if (key === 13) {
 
-            rtc._socket.emit('chat msg', input.value);
 
-            addToChat(input.value);
 
-            input.value = "";
 
-          }
 
-        }, false);
 
-        rtc._socket.on('receive chat msg', function(data) {
 
-          console.log(data.color);
 
-          addToChat(data.msg, data.color.toString(16));
 
-        });
 
-      }
 
-
 
       function addToChat(msg, color) {
 
         var messages = document.getElementById('messages');
 
         msg = sanitize(msg);
 
@@ -162,7 +143,7 @@
 
         //rtc.connect("http://multiwebrtc.nodejitsu.com/", room);
 
 
         //When using localhost
 
-        rtc.connect("http://localhost:8000/", room);
 
+        rtc.connect("ws://localhost:8001/", room);
 
 
         rtc.on('add remote stream', function(stream, socketId) {
 
           console.log("ADDING REMOTE STREAM...");
 
@@ -175,7 +156,6 @@
 
             console.log('remove ' + data);
 
             removeVideo(data);
 
         });
 
-        initChat();
 
         initFullScreen();
 
         initNewRoom();
 
       }

+ 8 - 16
example/server.js
View File 

@@ -1,5 +1,5 @@
 
 var app = require('express').createServer();
 
-var webRTC = require('webrtc.io').listen(app);
 
+var webRTC = require('webrtc.io').listen(8001);
 
 
 var colors = {};
 
 
@@ -17,6 +17,10 @@ app.get('/style.css', function(req, res) {
 
   res.sendfile(__dirname + '/style.css');
 
 });
 
 
+app.get('/webrtc.io.js', function(req, res) {
 
+  res.sendfile(__dirname + '/webrtc.io.js');
 
+});
 
+
 
 function selectRoom(socket) {
 
   for (var room in servers) {
 
     console.log('***' + room);
 
@@ -29,26 +33,14 @@ function selectRoom(socket) {
 
 
 webRTC.rtc.on('connection', function(rtc) {
 
   //Client connected
 
+  console.log('connection');
 
 
   rtc.on('send_answer', function() {
 
     //answer sent
 
+    console.log('send_answer');
 
   });
 
 
   rtc.on('disconnect', function() {
 
-    //disconnect sent
 
-  });
 
-});
 
-
 
-webRTC.sockets.on('connection', function(socket) {
 
-  console.log("connection received");
 
-
 
-  colors[socket.id] = Math.floor(Math.random()* 0xFFFFFF)
 
-  socket.on('chat msg', function(msg) {
 
-    console.log("chat received");
 
-    
-    socket.broadcast.emit('receive chat msg', {
 
-      msg: msg,
 
-      color: colors[socket.id]
 
-    });
 
+    console.log('disconnect');
 
   });
 
 });

+ 1 - 0
example/webrtc.io.js
View File 

@@ -0,0 +1 @@
 
+/Users/dennis/developing/hacker_school/webRTC/webRTC.io/webrtc.io-new/webrtc.io-client/lib/webrtc.io.js