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 2015/01/23 13:59:58 UTC
svn commit: r1654196 - in /openmeetings:
branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/
branches/3.0.x/src/main/java/org/apache/openmeetings/remote/
trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/rem...
Author: solomax
Date: Fri Jan 23 12:59:58 2015
New Revision: 1654196
URL: http://svn.apache.org/r1654196
Log:
[OPENMEETINGS-954] Mobile videos were not recorded, listed
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1654196&r1=1654195&r2=1654196&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java Fri Jan 23 12:59:58 2015
@@ -389,6 +389,9 @@ public class Client implements IDataProv
@Column(name = "sip_transport")
private boolean sipTransport = false;
+ @Column(name = "mobile")
+ private boolean mobile = false;
+
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "server_id")
private Server server;
@@ -864,10 +867,18 @@ public class Client implements IDataProv
this.server = server;
}
+ public boolean isMobile() {
+ return mobile;
+ }
+
+ public void setMobile(boolean mobile) {
+ this.mobile = mobile;
+ }
+
@Override
public String toString() {
return "Client [streamid=" + streamid + ", publicSID=" + publicSID + ", isScreenClient=" + isScreenClient
- + ", isAVClient=" + isAVClient + ", room_id=" + room_id + ", broadCastID=" + broadCastID + ", user_id="
+ + ", isAVClient=" + isAVClient + ", isMobile = " + mobile + ", room_id=" + room_id + ", broadCastID=" + broadCastID + ", user_id="
+ user_id + ", avsettings=" + avsettings + ", isRecording=" + isRecording + ", flvRecordingId="
+ flvRecordingId + ", flvRecordingMetaDataId=" + flvRecordingMetaDataId + ", screenPublishStarted="
+ screenPublishStarted + ", interviewPodId=" + interviewPodId + ", server=" + server + "]";
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1654196&r1=1654195&r2=1654196&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java Fri Jan 23 12:59:58 2015
@@ -165,7 +165,7 @@ public class FLVRecorderService implemen
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
}
- } else if (rcl.getIsAVClient()
+ } else if ((rcl.isMobile() || rcl.getIsAVClient())
&& (rcl.getAvsettings().equals("av") || rcl.getAvsettings().equals("a") || rcl.getAvsettings().equals("v"))) {
// if the user does publish av, a, v
// But we only record av or a, video only is not interesting
@@ -335,7 +335,7 @@ public class FLVRecorderService implemen
// Update Meta Data
metaDataDao.updateFlvRecordingMetaDataEndDate(rcl.getFlvRecordingMetaDataId(), new Date());
}
- } else if (rcl.getIsAVClient()
+ } else if ((rcl.isMobile() || rcl.getIsAVClient())
&& (rcl.getAvsettings().equals("av") || rcl.getAvsettings().equals("a") || rcl.getAvsettings().equals("v"))) {
stopRecordingShow(conn, String.valueOf(rcl.getBroadCastID()).toString(), rcl.getFlvRecordingMetaDataId());
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java?rev=1654196&r1=1654195&r2=1654196&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java Fri Jan 23 12:59:58 2015
@@ -96,7 +96,7 @@ public class MobileService {
c.setUser_id(u.getUser_id());
c.setFirstname(u.getFirstname());
c.setLastname(u.getLastname());
- //c.set
+ c.setMobile(true);
sessionManager.updateClientByStreamId(streamId, c, false, null);
add(result, "sid", sd.getSession_id());
@@ -123,7 +123,7 @@ public class MobileService {
for (IConnection conn : current.getScope().getClientConnections()) {
if (conn != null && conn instanceof IServiceCapableConnection) {
Client c = sessionManager.getClientByStreamId(conn.getClient().getId(), null);
- if (c.getIsAVClient() && !Strings.isEmpty(c.getAvsettings()) && !Boolean.TRUE.equals(c.getIsScreenClient())) {
+ if ((c.isMobile() || c.getIsAVClient()) && !Strings.isEmpty(c.getAvsettings()) && !Boolean.TRUE.equals(c.getIsScreenClient())) {
Map<String, Object> map = new Hashtable<String, Object>();
add(map, "streamId", c.getStreamid());
add(map, "broadCastId", c.getBroadCastID());
@@ -200,6 +200,7 @@ public class MobileService {
c.setRoom_id(Long.parseLong(c.getScope()));
c.setRoomEnter(new Date());
c.setBroadCastID(broadcastId);
+ c.setMobile(true);
c.setIsBroadcasting(true);
sessionManager.updateClientByStreamId(c.getStreamid(), c, false, null);
result.put("broadcastId", broadcastId);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java?rev=1654196&r1=1654195&r2=1654196&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java Fri Jan 23 12:59:58 2015
@@ -164,7 +164,7 @@ public class FLVRecorderService implemen
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
}
- } else if (rcl.isAvClient()
+ } else if ((rcl.isMobile() || rcl.isAvClient())
&& (rcl.getAvsettings().equals("av") || rcl.getAvsettings().equals("a") || rcl.getAvsettings().equals("v"))) {
// if the user does publish av, a, v
// But we only record av or a, video only is not interesting
@@ -334,7 +334,7 @@ public class FLVRecorderService implemen
// Update Meta Data
metaDataDao.updateFlvRecordingMetaDataEndDate(rcl.getFlvRecordingMetaDataId(), new Date());
}
- } else if (rcl.isAvClient()
+ } else if ((rcl.isMobile() || rcl.isAvClient())
&& (rcl.getAvsettings().equals("av") || rcl.getAvsettings().equals("a") || rcl.getAvsettings().equals("v"))) {
stopRecordingShow(conn, String.valueOf(rcl.getBroadCastID()).toString(), rcl.getFlvRecordingMetaDataId());
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1654196&r1=1654195&r2=1654196&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java Fri Jan 23 12:59:58 2015
@@ -69,6 +69,7 @@ public class MobileService {
private void add(Map<String, Object> m, String key, Object v) {
m.put(key, v == null ? "" : v);
}
+
public Map<String, Object> loginUser(String login, String password) {
Map<String, Object> result = new Hashtable<String, Object>();
try {
@@ -95,7 +96,7 @@ public class MobileService {
c.setUser_id(u.getId());
c.setFirstname(u.getFirstname());
c.setLastname(u.getLastname());
- //c.set
+ c.setMobile(true);
sessionManager.updateClientByStreamId(streamId, c, false, null);
add(result, "sid", sd.getSession_id());
@@ -122,7 +123,7 @@ public class MobileService {
for (IConnection conn : current.getScope().getClientConnections()) {
if (conn != null && conn instanceof IServiceCapableConnection) {
Client c = sessionManager.getClientByStreamId(conn.getClient().getId(), null);
- if (c.isAvClient() && !Strings.isEmpty(c.getAvsettings()) && !c.isScreenClient()) {
+ if ((c.isMobile() || c.isAvClient()) && !Strings.isEmpty(c.getAvsettings()) && !c.isScreenClient()) {
Map<String, Object> map = new Hashtable<String, Object>();
add(map, "streamId", c.getStreamid());
add(map, "broadCastId", c.getBroadCastID());
@@ -199,6 +200,7 @@ public class MobileService {
c.setRoom_id(Long.parseLong(c.getScope()));
c.setRoomEnter(new Date());
c.setBroadCastID(broadcastId);
+ c.setMobile(true);
c.setIsBroadcasting(true);
sessionManager.updateClientByStreamId(c.getStreamid(), c, false, null);
result.put("broadcastId", broadcastId);
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1654196&r1=1654195&r2=1654196&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Fri Jan 23 12:59:58 2015
@@ -387,6 +387,9 @@ public class Client implements IDataProv
@Column(name = "sip_transport")
private boolean sipTransport = false;
+ @Column(name = "mobile")
+ private boolean mobile = false;
+
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "server_id")
private Server server;
@@ -854,10 +857,18 @@ public class Client implements IDataProv
this.server = server;
}
+ public boolean isMobile() {
+ return mobile;
+ }
+
+ public void setMobile(boolean mobile) {
+ this.mobile = mobile;
+ }
+
@Override
public String toString() {
return "Client [streamid=" + streamid + ", publicSID=" + publicSID + ", isScreenClient=" + screenClient
- + ", isAVClient=" + avClient + ", room_id=" + room_id + ", broadCastID=" + broadCastID + ", user_id="
+ + ", isAVClient=" + avClient + ", isMobile = " + mobile + ", room_id=" + room_id + ", broadCastID=" + broadCastID + ", user_id="
+ user_id + ", avsettings=" + avsettings + ", isRecording=" + isRecording + ", flvRecordingId="
+ flvRecordingId + ", flvRecordingMetaDataId=" + flvRecordingMetaDataId + ", screenPublishStarted="
+ screenPublishStarted + ", interviewPodId=" + interviewPodId + ", server=" + server + "]";