Revision: 4186
Author: solomax666
Date: Sun Sep 4 08:23:41 2011
Log: - code cleanup
http://code.google.com/p/openmeetings/source/detail?r=4186
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/StreamService.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/StreamService.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/StreamService.java
Sun Sep 4 08:23:41 2011
@@ -261,12 +261,8 @@
RoomClient currentClient = this.clientListManager
.getClientByStreamId(current.getClient().getId());
- RoomRecording roomRecording = roomRecordingList
- .get(roomrecordingName);
Long room_id = currentClient.getRoom_id();
- String conferenceType =
roomRecording.getConferenceType();
-
// get all stream and stop recording them
// Todo: Check that nobody does Recording at the same
time Issue 253
Collection<Set<IConnection>> conCollection =
current.getScope()
@@ -771,7 +767,6 @@
.get(roomrecordingName);
Date recordingsStartTime = roomRecording.getStarttime();
Date currentDate = new Date();
- List<RoomStream> roomStreams =
roomRecording.getRoomStreams();
RoomStream roomStream = new RoomStream();
roomStream.setStreamName("");
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Sun Sep 4 08:23:41 2011
@@ -579,45 +579,8 @@
+ room.getClients().size() + " " +
room.getContextPath()
+ " " + room.getName());
- // IConnection current = Red5.getConnectionLocal();
-
RoomClient currentClient = this.clientListManager
.getClientByStreamId(client.getId());
-
- // //In case its a screen sharing we start a new Video
for that
- // if (currentClient != null &&
currentClient.getIsScreenClient() !=
- // null && currentClient.getIsScreenClient()) {
- //
- // log.debug("start streamPublishStart Is Screen Sharing --
Stop ");
- //
- // //Notify all users of the same Scope
- // Collection<Set<IConnection>> conCollection =
- // current.getScope().getConnections();
- // for (Set<IConnection> conset : conCollection) {
- // for (IConnection conn : conset) {
- // if (conn != null) {
- // if (conn instanceof IServiceCapableConnection) {
- // if (conn.equals(current)){
- // continue;
- // } else {
- // RoomClient rcl =
- //
this.clientListManager.getClientByStreamId(conn.getClient().getId());
- // //log.debug("is this users still alive? :"+rcl);
- // //Check if the Client is in the same room and same
domain
- // IServiceCapableConnection iStream =
(IServiceCapableConnection)
- // conn;
- // //log.info("IServiceCapableConnection ID " +
- // iStream.getClient().getId());
- // iStream.invoke("stopRed5ScreenSharing",new Object[] {
- // currentClient }, this);
- // log.debug("send Notification to");
- // }
- // }
- // }
- // }
- // }
- //
- // }
// The Room Client can be null if the Client left the
room by using
// logicalRoomLeave
@@ -771,17 +734,6 @@
log.debug("###########[roomLeave]");
if (rcl.getIsRecording()) {
log.debug("*** roomLeave Any Client is Recording - stop that");
-
// StreamService.addRoomClientEnterEventFunc(rcl,
-
// rcl.getRoomRecordingName(),
-
// rcl.getUserip(), false);
-
// StreamService.stopRecordingShowForClient(cons,
-
// currentClient,
-
// rcl.getRoomRecordingName(),
-
// false);
-
-
// this.flvRecorderService.stopRecordingShowForClient(cons,
-
// currentClient, false);
-
this.flvRecorderService
.stopRecordingShowForClient(
cons, currentClient);
--
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.
