Author: solomax
Date: Wed Mar 6 11:30:26 2013
New Revision: 1453299
URL: http://svn.apache.org/r1453299
Log:
SIP: hack for "custom" user picture for "SIP Transport" is removed (audio seems
to be broken)
Modified:
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
Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx?rev=1453299&r1=1453298&r2=1453299&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx Wed
Mar 6 11:30:26 2013
@@ -97,7 +97,7 @@
pUri = "_profile_" + pUri;
downloadurl = canvas.getUrl() +
'DownloadHandler?fileName=' + pUri
- + '&room_id=&r=' + (new Date()).getTime()
+ + '&parentPath=&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=1453299&r1=1453298&r2=1453299&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Wed Mar 6 11:30:26 2013
@@ -125,7 +125,7 @@
-->
<method name="createVideo"
args="publicSID,displayName,broadcastId,avsettings,interviewPodId,object">
<![CDATA[
- if($debug) Debug.info("createVideo, publicSID:
",publicSID,"broadcastId: ",broadcastId,"AVsettings: ",avsettings);
+ if ($debug) Debug.info("createVideo, publicSID:
",publicSID,"broadcastId: ",broadcastId,"AVsettings: ",avsettings);
if ($debug) Debug.write(" createVideo ALL vars ",object);
var vidContainer = getVideoObjectByPublicSID(publicSID);
if(vidContainer == null) {
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx?rev=1453299&r1=1453298&r2=1453299&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
Wed Mar 6 11:30:26 2013
@@ -220,7 +220,9 @@
<![CDATA[
if ($debug) Debug.write("resetValues: ",this.isremote);
this.clientVars=null;
- deleteVideoConfProfilePic();
+ if (!this.isremote) {
+ deleteVideoConfProfilePic();
+ }
if (this.isremote){
this._chatvideoinner._videostream.restart();
} else {
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx?rev=1453299&r1=1453298&r2=1453299&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx
Wed Mar 6 11:30:26 2013
@@ -26,11 +26,8 @@
<handler name="oninit">
<![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));
+ this._userpic.setAttribute('src',
canvas.getPictureUrl(value.picture_uri
+ ,
'&moduleName=remoteuserprofile&remoteUserid='+this.value.user_id));
]]>
</handler>
<image name="_userpic" stretches="both" width="${parent.width}"
height="${parent.height}" />
