ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: "customLayout" JSON field returned for GET sessions and recordings

pull/87/merge
pabloFuente 2018-07-17 13:50:27 +02:00
parent 24d11f259d
commit 2a435db320
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java
View File

@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
import io.openvidu.client.OpenViduException; import io.openvidu.client.OpenViduException;
import io.openvidu.client.OpenViduException.Code; import io.openvidu.client.OpenViduException.Code;
import io.openvidu.client.internal.ProtocolElements; import io.openvidu.client.internal.ProtocolElements;
import io.openvidu.java.client.RecordingLayout;
import io.openvidu.java.client.SessionProperties; import io.openvidu.java.client.SessionProperties;
import io.openvidu.server.cdr.CallDetailRecord; import io.openvidu.server.cdr.CallDetailRecord;
import io.openvidu.server.config.OpenviduConfig; import io.openvidu.server.config.OpenviduConfig;
@ -375,11 +376,10 @@ public class KurentoSession implements Session {
json.put("sessionId", this.sessionId); json.put("sessionId", this.sessionId);
json.put("mediaMode", this.sessionProperties.mediaMode().name()); json.put("mediaMode", this.sessionProperties.mediaMode().name());
json.put("recordingMode", this.sessionProperties.recordingMode().name()); json.put("recordingMode", this.sessionProperties.recordingMode().name());
if (this.sessionProperties.defaultCustomLayout() != null json.put("defaultRecordingLayout", this.sessionProperties.defaultRecordingLayout().name());
&& !this.sessionProperties.defaultCustomLayout().isEmpty()) { if (RecordingLayout.CUSTOM.equals(this.sessionProperties.defaultRecordingLayout())) {
json.put("defaultCustomLayout", this.sessionProperties.defaultCustomLayout()); json.put("defaultCustomLayout", this.sessionProperties.defaultCustomLayout());
} }
json.put("defaultRecordingLayout", this.sessionProperties.defaultRecordingLayout().name());
JSONObject connections = new JSONObject(); JSONObject connections = new JSONObject();
JSONArray participants = new JSONArray(); JSONArray participants = new JSONArray();
this.participants.values().forEach(p -> { this.participants.values().forEach(p -> {

3
openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java
View File

@ -161,6 +161,9 @@ public class Recording {
json.put("id", this.id); json.put("id", this.id);
json.put("name", this.recordingProperties.name()); json.put("name", this.recordingProperties.name());
json.put("recordingLayout", this.recordingProperties.recordingLayout().name()); json.put("recordingLayout", this.recordingProperties.recordingLayout().name());
if (RecordingLayout.CUSTOM.equals(this.recordingProperties.recordingLayout())) {
json.put("customLayout", this.recordingProperties.customLayout());
}
json.put("sessionId", this.sessionId); json.put("sessionId", this.sessionId);
json.put("createdAt", this.createdAt); json.put("createdAt", this.createdAt);
json.put("size", this.size); json.put("size", this.size);