Author: sebawagner
Date: Fri Apr 13 14:22:41 2012
New Revision: 1325782
URL: http://svn.apache.org/viewvc?rev=1325782&view=rev
Log:
OPENMEETINGS-163 Recording does no more work if you start to share audio/video
AFTER starting the recording
+ Fix recording time line in UI
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx?rev=1325782&r1=1325781&r2=1325782&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx
Fri Apr 13 14:22:41 2012
@@ -21,7 +21,7 @@
<library>
<class name="flvMetaInfoContentArea" extends="view"
- width="${ parent.width }" height="178" clip="true">
+ width="${ parent.width }" height="168" clip="true">
<attribute name="baseWidthForPointer" value="0" type="number"/>
@@ -40,7 +40,7 @@
this.contentDevider._pointer.setAttribute("x",0);
</method>
- <view name="content" width="${ parent.width }" height="178">
+ <view name="content" width="${ parent.width }" height="168">
<view name="content" layout="axis:y;spacing:2" />
@@ -100,7 +100,7 @@
View for recorded contents list.
When you select 'Recordings' on the top menu, this class shows the list.
-->
-<class name="lzRecordingsViewBottom" extends="basePropertyPanel" labelid="859"
height="200"
+<class name="lzRecordingsViewBottom" extends="basePropertyPanel" labelid="859"
height="190"
y="${ canvas.height - canvas.naviHeightDelta - this.height
}"
x="${ parent._navigationArea.width +
parent._navigationArea.x }"
width="${ canvas.width - parent._navigationArea.width -
parent._navigationArea.x }">
@@ -211,8 +211,8 @@
]]>
</method>
- <view name="content" visibility="hidden" y="22" bgcolor="0xFFFFFF"
- width="${ parent.width }" height="178">
+ <view name="content" visibility="visible" y="22" bgcolor="0xFFFFFF"
+ width="${ parent.width }" height="168">
<method name="clearContent">
this._content.destroy();
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1325782&r1=1325781&r2=1325782&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Fri Apr 13 14:22:41 2012
@@ -716,9 +716,13 @@ public class ScopeApplicationAdapter ext
RoomClient currentClient = this.clientListManager
.getClientByStreamId(streamid);
+ //We make a second object the has the reference to the
object
+ //that we will use to send to all participents
+ RoomClient clientObjectSendToSync = currentClient;
+
// Notify all the clients that the stream had been
started
log.debug("start streamPublishStart broadcast start: "
- + stream.getPublishedName() + "CONN " +
current);
+ + stream.getPublishedName() + " CONN "
+ current);
// In case its a screen sharing we start a new Video
for that
if (currentClient.getIsScreenClient()) {
@@ -731,11 +735,11 @@ public class ScopeApplicationAdapter ext
//If its an audio/video client then send the session
object with the full
//data to everybody
else if (currentClient.getIsAVClient() != null &&
currentClient.getIsAVClient()) {
- currentClient =
this.clientListManager.getClientByPublicSID(
+ clientObjectSendToSync =
this.clientListManager.getClientByPublicSID(
currentClient.getPublicSID(), false);
}
- log.debug("newStream SEND");
+ log.debug("newStream SEND: "+currentClient);
// Notify all users of the same Scope
// We need to iterate through the streams to catch if
anybody is recording
@@ -786,7 +790,7 @@ public class ScopeApplicationAdapter ext
IServiceCapableConnection iStream = (IServiceCapableConnection) conn;
iStream.invoke("newStream",
- new
Object[] { currentClient },
+ new
Object[] { clientObjectSendToSync },
this);
}
@@ -1501,10 +1505,8 @@ public class ScopeApplicationAdapter ext
currentClient.getMail(),
currentClient.getFirstname(),
currentClient.getLastname());
- log.debug("##### setRoomValues : " +
currentClient.getUsername()
- + " " + currentClient.getStreamid());
// just a unique
-
// number
-
+ log.debug("##### setRoomValues : " + currentClient);
+
// Check for Moderation LogicalRoom ENTER
HashMap<String, RoomClient> clientListRoom =
this.clientListManager
.getRoomClients(room_id);
