Revision: 2797
Author: seba.wagner
Date: Tue Jan 19 11:54:27 2010
Log: Fixes Issue 1088
http://code.google.com/p/openmeetings/source/detail?r=2797
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
Sun Jan 17 07:43:00 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/converter/FlvRecorderConverter.java
Tue Jan 19 11:54:27 2010
@@ -228,6 +228,11 @@
float gapSeconds =
flvRecordingMetaDelta.getDeltaTime()/1000;
float posSeconds = ( flvRecordingMetaDelta.getTimeStamp() -
flvRecordingMetaDelta.getDeltaTime() - 50 ) /1000;
+ if (posSeconds < 0) {
+ log.error("posSeconds is Negative, this should never happen!
flvRecordingMetaDeltaId ::"+flvRecordingMetaDelta.getFlvRecordingMetaDeltaId()+"
posSeconds :: "+posSeconds);
+ posSeconds = 0;
+ }
+
//Add the item
in-between
argv_sox = new String[]
{ this.getPathToSoX(),
inputFile,
outputGapFullWav, "pad",
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
Mon Jan 18 11:06:41 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
Tue Jan 19 11:54:27 2010
@@ -57,6 +57,8 @@
clientList.put(rcm.getStreamid(),rcm);
+ //log.error(" :: addClientListItem ::
"+clientList.size());
+
return rcm;
} catch (Exception err) {
log.error("[addClientListItem]",err);
@@ -114,6 +116,7 @@
try {
if (clientList.containsKey(streamId)){
clientList.remove(streamId);
+ //log.debug(":: removeClient
::"+clientList.size());
return true;
} else {
log.debug("Tried to remove a non existing Client
"+streamId);
@@ -137,11 +140,11 @@
try {
for (Iterator<String>
iter=clientList.keySet().iterator();iter.hasNext();) {
String key = (String) iter.next();
- log.debug("getClientList key: "+key);
+ //log.debug("getClientList key: "+key);
RoomClient rcl = clientList.get(key);
//same room, same domain
if (room_id!=null &&
room_id.equals(rcl.getRoom_id())) {
- if (rcl.getIsScreenClient() != null &&
!rcl.getIsScreenClient()) {
+ if (rcl.getIsScreenClient() != null &&
rcl.getIsScreenClient()) {
//continue
} else {
roomClientList.put(key, rcl);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Mon Jan 18 11:06:41 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Tue Jan 19 11:54:27 2010
@@ -483,7 +483,8 @@
RoomClient currentClient =
this.clientListManager.getClientByStreamId(client.getId());
- log.debug("currentClient :1:
"+currentClient.getIsScreenClient());
+ log.debug("currentClient :1a: "+currentClient);
+ log.debug("currentClient :1b:
"+currentClient.getIsScreenClient());
log.debug("currentClient :2:
"+currentClient.getStreamPublishName());
log.debug("currentClient :3:
"+currentClient.getSwfurl());
@@ -1301,7 +1302,7 @@
if (room.getIsModeratedRoom()) {
//if this is a Moderated Room then the Room can be only locked off by
the Moderator Bit
- List<RoomClient> clientModeratorListRoom =
this.clientListManager.getCurrentModeratorByRoom(room_id);
+ //List<RoomClient> clientModeratorListRoom =
this.clientListManager.getCurrentModeratorByRoom(room_id);
//If there is no Moderator yet we have to check if the current User
has the Bit set to true to
//become one, otherwise he won't get
Moderation and has to wait
@@ -1552,13 +1553,15 @@
try {
HashMap <String,RoomClient> roomClientList = new
HashMap<String,RoomClient>();
+
+ //log.debug("roomClientList :: Number of
Users :: "+roomClientList.size()+" ::room_id:: "+room_id);
HashMap<String,RoomClient> clientListRoom =
this.clientListManager.getClientListByRoom(room_id);
for (Iterator<String>
iter=clientListRoom.keySet().iterator();iter.hasNext();) {
String key = (String) iter.next();
RoomClient rcl =
this.clientListManager.getClientByStreamId(key);
- log.debug("#+#+#+#+##+## logicalRoomEnter ClientList
key: "+rcl.getRoom_id()+" "+room_id);
- log.debug("set to ++ for client:
"+rcl.getStreamid());
+ //log.debug("#+#+#+#+##+## logicalRoomEnter ClientList
key: "+rcl.getRoom_id()+" "+room_id);
+ //log.debug("set to ++ for client:
"+rcl.getStreamid());
//Add user to List
roomClientList.put(key, rcl);
}
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
