Repository: openmeetings Updated Branches: refs/heads/master d0136edcb -> 083fa4fd9
[OPENMEETINGS-1670] recording is finalized and converted as expected Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/083fa4fd Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/083fa4fd Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/083fa4fd Branch: refs/heads/master Commit: 083fa4fd99482c27e5617a2d2e5034fe1c736951 Parents: d0136ed Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Tue Aug 8 15:34:02 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Tue Aug 8 15:34:02 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/core/remote/RecordingService.java | 4 ++-- .../openmeetings/core/remote/ScopeApplicationAdapter.java | 8 ++++---- .../openmeetings/db/dao/record/RecordingMetaDataDao.java | 7 ++----- 3 files changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/083fa4fd/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java index e29c87d..0b086d5 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java @@ -145,7 +145,7 @@ public class RecordingService implements IPendingServiceCallback { // If its the recording client we need another type of Meta Data if (Client.Type.sharing == rcl.getType()) { - if (rcl.getRecordingId() != null && rcl.isSharingStarted()) { + if (rcl.getRecordingId() != null && (rcl.isSharingStarted() || rcl.isRecordingStarted())) { String streamName_Screen = generateFileName(recordingId, rcl.getBroadCastId()); Long metaDataId = metaDataDao.add( @@ -323,7 +323,7 @@ public class RecordingService implements IPendingServiceCallback { log.debug("is this users still alive? stop it :" + rcl); if (Client.Type.sharing == rcl.getType()) { - if (rcl.getRecordingId() != null && rcl.isSharingStarted()) { + if (rcl.getRecordingId() != null && (rcl.isSharingStarted() || rcl.isRecordingStarted())) { // Stop FLV Recording stopRecordingShow(scope, rcl.getBroadCastId(), rcl.getMetaId()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/083fa4fd/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java index 7212137..b531e8e 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java @@ -367,10 +367,6 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp if (startRecording) { if (!alreadyRecording) { returnMap.put("modus", "startRecording"); - - String recordingName = "Recording " + CalendarPatterns.getDateWithTimeByMiliSeconds(new Date()); - - recordingService.recordMeetingStream(current, client, recordingName, "", false); } else { _log.warn("Recording is already started for the client id={}. Second request is ignored.", client.getId()); } @@ -508,6 +504,10 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp c.setLastname(getSipTransportLastname(c.getRoomId())); } sessionManager.update(c); + if (Client.Type.sharing == c.getType() && c.isRecordingStarted()) { + String recordingName = "Recording " + CalendarPatterns.getDateWithTimeByMiliSeconds(new Date()); + recordingService.recordMeetingStream(current, c, recordingName, "", false); + } _log.debug("newStream SEND: {}", c); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/083fa4fd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java index d7188ee..a3f8855 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java @@ -116,11 +116,8 @@ public class RecordingMetaDataDao { metaData.setInteriewPodId(interiewPodId); - metaData = em.merge(metaData); - Long metaDataId = metaData.getId(); - - return metaDataId; - + metaData = update(metaData); + return metaData.getId(); } catch (Exception ex2) { log.error("[add]: ", ex2); }
