You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/02/18 17:12:16 UTC
svn commit: r1447369 - in /openmeetings/trunk/singlewebapp:
WebContent/src/base/hibernate/
WebContent/src/modules/conference/participants/ WebContent/swf10/
src/org/apache/openmeetings/remote/red5/
Author: solomax
Date: Mon Feb 18 16:12:15 2013
New Revision: 1447369
URL: http://svn.apache.org/r1447369
Log:
SIP: SIP Transport starts audio broadcast immediately (without re-sync)
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
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=1447369&r1=1447368&r2=1447369&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Mon Feb 18 16:12:15 2013
@@ -936,14 +936,18 @@
</netRemoteCallHib>
<!--- Notification of new User -->
- <netRemoteCallHib name="addNewUser" funcname="addNewUser">
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("addNewUser: ",value);
- canvas._videocontainer.addClientItem(value.connectedSince,value.isMod,value.streamid,value.room_id,'',value.formatedDate,value.userpos,value.usercolor,value);
- canvas.setAttribute('numberofpartners',canvas.numberofpartners+1);
- </handler>
- </netRemoteCallHib>
+ <netRemoteCallHib name="addNewUser" funcname="addNewUser">
+ <handler name="ondata" args="value">
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("addNewUser: ",value);
+ if(value.sipTransport) {
+ canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.room_id,'',value.formatedDate,value.userpos,value.usercolor,value);
+ } else {
+ canvas._videocontainer.addClientItem(value.connectedSince,value.isMod,value.streamid,value.room_id,'',value.formatedDate,value.userpos,value.usercolor,value);
+ }
+ canvas.setAttribute('numberofpartners',canvas.numberofpartners+1);
+ </handler>
+ </netRemoteCallHib>
<netRemoteCallHib name="getCurrentModeratorList" funcname="getCurrentModeratorList">
<handler name="ondata" args="value">
@@ -960,30 +964,10 @@
//if ($debug) Debug.write("throw event to drawarea: ",canvas.moderatorStreamID,canvas.ismoderator);
- if (canvas.ismoderator){
- if (this.parent.modus == "conference"){
- if ($debug) Debug.write("############## showDevicePopUp 3");
- canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
- }
- } else if (value==null){
- //I think we never can run into this! value is always != null, this is from a previous implementation
- if ($debug) Debug.write("############ value IS NULL: ",this.parent.modus);
- //no moderator availible
- //check if this is conferenceViewmodus
- if (this.parent.modus == "conference"){
- if ($debug) Debug.write("############## showDevicePopUp 4");
- canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
- } else {
- // in audienceView modus you get no notification
- // cause you are not able to register your stream
- // as non moderator
- }
- } else {
- if (this.parent.modus == "conference"){
- if ($debug) Debug.write("############## showDevicePopUp 1a");
- canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
- }
- }
+ if (this.parent.modus == "conference"){
+ if ($debug) Debug.write("############## showDevicePopUp");
+ canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
+ }
canvas._drawarea.onopenWhiteBoard.sendEvent();
if ($debug) Debug.write("roomType_id ",canvas.currentRoomObject);
@@ -1001,8 +985,6 @@
}
}
}
- //@deprecated call to old screensharing implementation
- //parent.checkSharingSession.doCall();
]]>
</handler>
</netRemoteCallHib>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx?rev=1447369&r1=1447368&r2=1447369&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx Mon Feb 18 16:12:15 2013
@@ -260,18 +260,19 @@
this._videoviewcontent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight);
</method>
- <method name="addClientItem" args="connectedSince,isMod,streamid,username,room_id,formatedDate,position,color,object">
- <![CDATA[
- if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate);
-
- if (canvas.publicSID != object.publicSID){
- this._videoviewcontent.createVideoObject(object.publicSID, false, -1, object);
- }
-
- //Do Add it anyway
- this._participants.addItem(object);
- ]]>
- </method>
+ <method name="addClientItem" args="connectedSince,isMod,streamid,username,room_id,formatedDate,position,color,object">
+ <![CDATA[
+ if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate);
+
+ if (canvas.publicSID != object.publicSID){
+ if ($debug) Debug.write("### initializeStreams createVideoObject: ", object);
+ this._videoviewcontent.createVideoObject(object.publicSID, false, -1, object);
+ }
+
+ //Do Add it anyway
+ this._participants.addItem(object);
+ ]]>
+ </method>
<moderationMiniIconsEventUserList name="_applyAndStatusIcons" x="2" y="2" >
<handler name="onismoderator" reference="canvas" args="m">
Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1447369&r1=1447368&r2=1447369&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Mon Feb 18 16:12:15 2013
@@ -102,7 +102,6 @@
if(vidContainer == null) {
vidContainer = isBroadcasting ? this.getNewVideoObject(publicSID) : this.getNewVideoObjectByPos(publicSID);
vidContainer.publicSID = publicSID;
-
}
if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
if (canvas.isInterview) {
@@ -211,15 +210,7 @@
if (obj!=null){
this.broadCastViewRef = obj;
} else {
- //Get a Free VideoView Slot
- var freePos = this.getVideoObjectFreePos(this.offsetLength,this.videoWidth,this.videoHeight);
-
- this.broadCastViewRef = new lz.videoObjectBroadcast(this,{
- publicSID:publicSID, width:videoWidth,height:videoHeight,
- x:freePos[0],
- y:freePos[1],
- isInterview:canvas.isInterview
- });
+ this.broadCastViewRef = getNewVideoObjectByPos(publicSID);
this.broadCastViewRef._chatvideoinner.r.destroy();
if ($debug) Debug.write("getNewVideoObject canvas.userobject ",publicSID,canvas.userobject);
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=1447369&r1=1447368&r2=1447369&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 Mon Feb 18 16:12:15 2013
@@ -2860,12 +2860,10 @@ public class ScopeApplicationAdapter ext
currentClient.setVWidth(120);
currentClient.setVHeight(90);
currentClient.setSipTransport(true);
- this.sessionManager.updateClientByStreamId(streamid, currentClient, false, null);
+ sessionManager.updateClientByStreamId(streamid, currentClient, false, null);
SessionVariablesUtil.initClient(c, false, publicSID); //TODO not sure if this should be marked as AVClient or not
-
- Collection<Set<IConnection>> conCollection = current
- .getScope().getConnections();
+ Collection<Set<IConnection>> conCollection = current.getScope().getConnections();
for (Set<IConnection> conset : conCollection) {
for (IConnection conn : conset) {
if (conn != null) {
@@ -2879,15 +2877,10 @@ public class ScopeApplicationAdapter ext
}
if (!client.getId().equals(current.getClient().getId())) {
- // It is not needed to send back
- // that event to the actual
- // Moderator
- // as it will be already triggered
- // in the result of this Function
- // in the Client
+ // It is not needed to send back that event to the actual Moderator
+ // as it will be already triggered in the result of this Function in the Client
if (conn instanceof IServiceCapableConnection) {
((IServiceCapableConnection) conn).invoke("addNewUser", new Object[]{currentClient}, this);
- ((IServiceCapableConnection) conn).invoke("newStream", new Object[]{currentClient}, this);
log.debug("sending setSipTransport to " + conn);
}
}