openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solo...@apache.org
Subject svn commit: r1453266 - in /openmeetings/trunk/singlewebapp: WebContent/openmeetings/default/ WebContent/src/base/auth/ WebContent/src/base/hibernate/ WebContent/swf10/ WebContent/swf10/base/ WebContent/swf10/video/ src/org/apache/openmeetings/remote/red5/
Date Wed, 06 Mar 2013 10:22:56 GMT
Author: solomax
Date: Wed Mar  6 10:22:56 2013
New Revision: 1453266

URL: http://svn.apache.org/r1453266
Log:
SIP: "Sip Transport" starts as audio only client and then switch to be audio/video if necessary;
	Issue with user profile pictures are fixed;
	Code cleanup;

Added:
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/_profile_phone.png
      - copied unchanged from r1453158, openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/phone.png
Removed:
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/default/phone.png
Modified:
    openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java

Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx?rev=1453266&r1=1453265&r2=1453266&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx Wed Mar  6
10:22:56 2013
@@ -187,10 +187,6 @@
             }
             
             this.parent.loginUser.doCall();
-            
-            //Recheck the Applet Status 
-            getAppletStatus();
-            
         </handler>
     </simpleLabelButton>   
         

Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1453266&r1=1453265&r2=1453266&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Wed
Mar  6 10:22:56 2013
@@ -183,9 +183,6 @@
             lz.Timer.addTimer( this.refreshDelegate, canvas.refreshSession );
             canvas.thishib.loaderVar.setProgress();
             
-            //check and get the Applet SIP Status
-            getAppletStatus();
-            
             //Load Session Data
             this.getsessiondata.callRPC();    
         }
@@ -261,7 +258,8 @@
             //The onResult-Handler will be called be the rtmpconnection
             if ($debug) Debug.write("hibRtmpConnection/getsessiondata [",value,"]");
             canvas.sessionObject = value;
-            canvas.sessionId = value.session_id;     
+            canvas.sessionId = value.session_id;
+			canvas.sendViaLocalConnection(canvas.vid_lc_name, "setSessionId", [canvas.sessionId]);
             canvas.thishib.loaderVar.setProgress();
             parent.getPublicSID.doCall();
         </handler>  

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx?rev=1453266&r1=1453265&r2=1453266&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx Wed Mar  6 10:22:56
2013
@@ -97,7 +97,7 @@
 			pUri = "_profile_" + pUri;
 			
 			downloadurl = canvas.getUrl() + 'DownloadHandler?fileName=' + pUri
-				+ '&parentPath=&room_id=&r=' + (new Date()).getTime()
+				+ '&room_id=&r=' + (new Date()).getTime()
 				+ extraParams + '&sid='+canvas.sessionId;
 		}
 		if($debug) Debug.write("getPictureUrl/downloadurl ", downloadurl);

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1453266&r1=1453265&r2=1453266&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Wed Mar
 6 10:22:56 2013
@@ -56,7 +56,6 @@
             client.startStream = this.startStream;
             client.removeVideoByUser = this.removeVideoByUser;
             client.muteSound = this.muteSound;
-            // client.videoOnMove = this.videoOnMove; function not in use ?! swagner 04.02.2012
             client.updateMuteStatusVideoView = this.updateMuteStatusVideoView;
             client.ismoderatorChanged = this.ismoderatorChanged;
             // update rights to SWF10 client
@@ -69,6 +68,7 @@
             client.closeWhiteboard = this.closeWhiteboard;
             client.arrangeWindows = this.arrangeWindows;
             client.updateFirstLastName = this.updateFirstLastName;
+            client.setSessionId = this.setSessionId;
 
             var lc:LocalConnection = new LocalConnection();
             lc.connect(canvas.vid_lc_name);
@@ -377,7 +377,7 @@
             obj.setVideouserProfilePic(rcl);
             obj.setAttribute("visibility","hidden");
         } else {
-            obj.deleteVideoConfProfilePic(null);
+            obj.deleteVideoConfProfilePic();
             obj.setAttribute("visibility","visible");
         }
         obj.thisVars = rcl;
@@ -496,7 +496,6 @@
 	<method name="updateFirstLastName" args="publicSID,first,last">
 		var v = getVideoObjectByPublicSID(publicSID);
 		if (v != null) {
-			if ($debug) Debug.write("!!!!!!! updating FirstLastName",publicSID,first,last);
 			v.setAttribute('chatpartnername', first + ' ' + last);
 		}
 	</method>
@@ -523,19 +522,6 @@
     	canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'closeWhiteboard', bool);
     </method>
         
-    <!--
-    function not in use ?! swagner 04.02.2012
-    <method name="videoOnMove" args="interviewPodId, x, y">
-        if($debug) Debug.write("videoOnY: ", interviewPodId, y);
-        var obj = getVideoObjectByInterviewPodId(interviewPodId);
-        if($debug) Debug.write("getVideoObjectByInterviewPodId: ", interviewPodId, obj);
-        if(obj != null) {
-            obj.setAttribute('x', x);
-            obj.setAttribute('y', y);
-        }
-    </method>
-     -->
-
 	<!-- arranges video pods -->
 	<method name="arrangeWindows">
 	<![CDATA[
@@ -578,6 +564,10 @@
 	]]>
 	</method>
 
+	<method name="setSessionId" args="session_id">
+		canvas.setAttribute("sessionId", session_id);
+	</method>
+	
     <!-- @keyword private -->
     <method name="sortFunction" args="el1, el2">
         <![CDATA[

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx?rev=1453266&r1=1453265&r2=1453266&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx Wed Mar  6
10:22:56 2013
@@ -218,12 +218,9 @@
 		<!--- resets all values and stops the streaming -->
 		<method name="resetValues">
 		<![CDATA[
-	    	this.clientVars=null;
-	    	if (this.showUserProfilePic && !this.isremote){
-	    		this._chatvideoinner.userProfilePic.destroy();
-	    		this.showUserProfilePic = false;
-	    	}
 	    	if ($debug) Debug.write("resetValues: ",this.isremote);
+	    	this.clientVars=null;
+	    	deleteVideoConfProfilePic();
 	    	if (this.isremote){
 	    		this._chatvideoinner._videostream.restart();
 	    	} else {
@@ -232,14 +229,13 @@
 		]]>
 		</method>
 		<method name="setVideouserProfilePic" args="value">
-			if ($debug)
-			Debug.write("### setVideouserProfilePic ",value);
-			this.deleteVideoConfProfilePic(value);
+			if ($debug) Debug.write("### setVideouserProfilePic ",value);
+			this.deleteVideoConfProfilePic();
 			new lz.videoUserProfilePicSWF10(this._chatvideoinner,{name:'userProfilePic',value:value});
 			this.showUserProfilePic = true;
 		</method>
-		<method name="deleteVideoConfProfilePic" args="value">
-			if ($debug) Debug.write("### deleteVideoConfProfilePic ",value);
+		<method name="deleteVideoConfProfilePic">
+			if ($debug) Debug.write("### deleteVideoConfProfilePic ###");
 			if ($debug) Debug.write("delete ",this.showUserProfilePic);
 			if (this.showUserProfilePic) {
 				this._chatvideoinner.userProfilePic.destroy();

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx?rev=1453266&r1=1453265&r2=1453266&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx Wed
Mar  6 10:22:56 2013
@@ -25,10 +25,13 @@
 	<attribute name="value" value="null" />
 		
 	<handler name="oninit">
-		<![CDATA[
-	        this._userpic.setAttribute('src'
-	        	, canvas.getPictureUrl(value.picture_uri, '&moduleName=remoteuserprofile&remoteUserid='+this.value.user_id));

-        ]]>
+	<![CDATA[
+		if($debug) Debug.write("value:: ", value);
+		var extra = value.sipTransport ? "&parentPath=../default&moduleName=videoconf1"
+			: '&parentPath=&moduleName=remoteuserprofile&remoteUserid='+this.value.user_id;
+
+		this._userpic.setAttribute('src', canvas.getPictureUrl(value.picture_uri, extra));
+	]]>
 	</handler>	
 	<image name="_userpic" stretches="both" width="${parent.width}" height="${parent.height}"
/>
 </class>

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1453266&r1=1453265&r2=1453266&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Wed Mar  6 10:22:56 2013
@@ -1291,6 +1291,7 @@ public class ScopeApplicationAdapter ext
 			Object newMessage, Integer vWidth, Integer vHeight, 
 			long room_id, String publicSID, Integer interviewPodId) {
 		try {
+			log.error("[setUserAVSettings]" + avsettings + newMessage);
 
 			IConnection current = Red5.getConnectionLocal();
 			IClient c = current.getClient();
@@ -2862,12 +2863,13 @@ public class ScopeApplicationAdapter ext
         currentClient.setBroadCastID(Long.parseLong(broadCastId));
         currentClient.setIsBroadcasting(true);
         currentClient.setPublicSID(publicSID);
-        currentClient.setAvsettings("av");
+        currentClient.setAvsettings("a");
         currentClient.setVWidth(120);
         currentClient.setVHeight(90);
         currentClient.setSipTransport(true);
+        currentClient.setPicture_uri("phone.png");
         sessionManager.updateClientByStreamId(streamid, currentClient, false, null);
-        SessionVariablesUtil.initClient(c, false, publicSID); //TODO not sure if this should
be marked as AVClient or not 
+        SessionVariablesUtil.initClient(c, false, publicSID);
 
         Collection<Set<IConnection>> conCollection = current.getScope().getConnections();
         for (Set<IConnection> conset : conCollection) {



Mime
View raw message