Fixed a few bugs. All chats back to working

GleasonK · GleasonK · commit a04947eabc61 · 2015-07-10T15:22:37.000-07:00
diff --git a/js/rtc-controller.js b/js/rtc-controller.js
@@ -4,7 +4,6 @@
 var CONTROLLER = window.CONTROLLER = function(phone){
 	if (!window.phone) window.phone = phone;
 	var ctrlChan  = controlChannel(phone.number());
-	var isStream  = phone.oneway;
 	var pubnub    = phone.pubnub;
 	var userArray = [];
 	subscribe();
@@ -95,7 +94,7 @@ var CONTROLLER = window.CONTROLLER = function(phone){
     }
     
     CONTROLLER.send = function( message, number ) {
-        if (isStream) return stream_message(message);
+        if (phone.oneway) return stream_message(message);
         phone.send(message, number);
     };
     
@@ -174,7 +173,8 @@ var CONTROLLER = window.CONTROLLER = function(phone){
 			if (idx != -1) userArray.splice(idx, 1)[0]; // User leaving
 		} else {  				// New User added to stream/group
 			if (idx == -1) {  	// Tell everyone in array of new user first, then add to array. 
-				if (!isStream) publishCtrlAll("userJoin", session.number);
+				alert(phone.oneway);
+				if (!phone.oneway) publishCtrlAll("userJoin", session.number);
 				userArray.push(session);
 			}
 		}
@@ -222,7 +222,7 @@ var CONTROLLER = window.CONTROLLER = function(phone){
 			callAuth(m.data);
 			break;
 		case "userJoin":
-			if (isStream) add_to_stream(m.data); // JOIN STREAM HERE!
+			if (phone.oneway){ alert("HERE"); add_to_stream(m.data); }// JOIN STREAM HERE!
 			else add_to_group(m.data);
 			break;
 		case "userLeave":
diff --git a/js/webrtc.js b/js/webrtc.js
@@ -16,7 +16,8 @@ var PHONE = window.PHONE = function(config) {
     var myconnection  = false;
     var mediaconf     = config.media || { audio : true, video : true };
     var conversations = {};
-    var oneway        = config.oneway || false;
+    var oneway        = config.oneway || false
+    var broadcast     = config.broadcast || false;
 
     // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
     // RTC Peer Connection Session (one per call)
@@ -190,8 +191,7 @@ var PHONE = window.PHONE = function(config) {
 
             // Add Local Media Streams Audio Video Mic Camera
             //  If answering and oneway streaming, do not attach stream
-            if (!isAnswer || !oneway) 
-            	talk.pc.addStream(mystream);   // Add null here on the receiving end of streaming to go one-way.
+            if (!isAnswer || !oneway) talk.pc.addStream(mystream);   // Add null here on the receiving end of streaming to go one-way.
 
             // Notify of Call Status
             update_conversation( talk, 'connecting' );
@@ -415,7 +415,7 @@ var PHONE = window.PHONE = function(config) {
     // Prepare Local Media Camera and Mic
     // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
     function getusermedia() { //Do something if not requesting any media?
-        if (oneway){
+        if (oneway && !broadcast){
 	        if (!PeerConnection){ return unablecb(); }
 	        onready();
 	        subscribe();
diff --git a/stream.html b/stream.html
@@ -84,7 +84,8 @@
 	    number        : streamName, // listen on username line else random
 	    publish_key   : 'pub-c-561a7378-fa06-4c50-a331-5c0056d0163c', // Your Pub Key
 	    subscribe_key : 'sub-c-17b7db8a-3915-11e4-9868-02ee2ddab7fe', // Your Sub Key
-	    oneway        : true
+	    oneway        : true,
+	    broadcast     : true
 	});
 	phone.debug(function(m){ console.log(m); })
 	var ctrl = window.ctrl = CONTROLLER(phone);
