You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/04/28 15:28:42 UTC
svn commit: r1331762 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10:
commonVideoViewContentSWF10.lzx video/library.lzx
video/resources/arrow_refresh.png video/resources/arrow_refresh_small.png
video/resources/profile_pic.jpg
Author: sebawagner
Date: Sat Apr 28 13:28:41 2012
New Revision: 1331762
URL: http://svn.apache.org/viewvc?rev=1331762&view=rev
Log:
OPENMEETINGS-145 Fix to correctly show init status
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/arrow_refresh_small.png (with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/arrow_refresh.png
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/profile_pic.jpg
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1331762&r1=1331761&r2=1331762&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Sat Apr 28 13:28:41 2012
@@ -86,6 +86,12 @@
return;
</method>
+ <!--
+ Method that creates the video views when another user enters a room and his
+ item in the list of participants is created.
+ The method to "play" the stream is invoked later, when the user
+ really starts to stream and not only when he just enters the room.
+ -->
<method name="createVideoObject" args="publicSID,isBroadcasting,interviewPodId,object">
if($debug) Debug.info("createVideoObject, publicSID: ",publicSID, "isBroadcasting: ", isBroadcasting, "object", object);
var vidContainer = getVideoObjectByPublicSID(publicSID);
@@ -108,6 +114,11 @@
return vidContainer;
</method>
+ <!--
+
+ Method that creates the video views when user(self) initially entering a room.
+ Creates the video-view AND starts to stream/play the video
+ -->
<method name="createVideo" args="publicSID,displayName,broadcastId,avsettings,interviewPodId,object">
<![CDATA[
if($debug) Debug.info("createVideo, publicSID: ",publicSID,"broadcastId: ",broadcastId,"AVsettings: ",avsettings);
@@ -136,8 +147,12 @@
}
vidContainer.setAttribute("interviewPodId", interviewPodId);
vidContainer.updateAVSettingsSymbol(object);
+ if (object.micMuted) {
+ vidContainer.setMicMuted(object.micMuted);
+ }
}
+
if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
if (canvas.isInterview && interviewPodId != null && interviewPodId > 0) {
if ($debug) Debug.write("Is interview ",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx?rev=1331762&r1=1331761&r2=1331762&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/library.lzx Sat Apr 28 13:28:41 2012
@@ -23,11 +23,11 @@
<!-- FamFam Icon Creative Commons -->
<resource name="warning_icon_popup_devices_rsc" src="resources/error.png" />
- <!-- REPLACE -->
+ <!-- APL author sebawagner -->
<resource name="chatbgitem" src="resources/profile_pic.jpg" />
<!-- FamFam Icon Creative Commons -->
- <resource name="resyncuser_rsc" src="resources/arrow_refresh.png" />
+ <resource name="resyncuser_rsc" src="resources/arrow_refresh_small.png" />
<!-- APL author sebawagner -->
<resource name="mic_rsc" src="resources/micro.png" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/arrow_refresh_small.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/arrow_refresh_small.png?rev=1331762&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/arrow_refresh_small.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/profile_pic.jpg
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/resources/profile_pic.jpg?rev=1331762&r1=1331761&r2=1331762&view=diff
==============================================================================
Binary files - no diff available.