This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch OPENMEETINGS-1649-kurento
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/OPENMEETINGS-1649-kurento by 
this push:
     new 2b75a61  [OPENMEETINGS-1837] audio-only steams are being recorded as 
expected
2b75a61 is described below

commit 2b75a6173c6a5b835e28436684f8806a9d675f05
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Thu Mar 8 11:11:22 2018 +0700

    [OPENMEETINGS-1837] audio-only steams are being recorded as expected
---
 .../apache/openmeetings/core/converter/InterviewConverter.java    | 4 ++--
 .../apache/openmeetings/core/remote/ScopeApplicationAdapter.java  | 4 +++-
 .../java/org/apache/openmeetings/web/app/StreamClientManager.java | 8 ++++++--
 .../java/org/apache/openmeetings/web/room/RoomBroadcaster.java    | 2 --
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
index 3e87277..cdaa4c5 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
@@ -100,7 +100,7 @@ public class InterviewConverter extends BaseConverter 
implements IRecordingConve
                Recording r = null;
                try {
                        r = recordingDao.get(id);
-                       log.debug("recording " + r.getId());
+                       log.debug("recording {}", r.getId());
                        if (Strings.isEmpty(r.getHash())) {
                                r.setHash(UUID.randomUUID().toString());
                        }
@@ -172,7 +172,7 @@ public class InterviewConverter extends BaseConverter 
implements IRecordingConve
                                                        , "-v", "error"
                                                        , "-f", "null"
                                                        , "file.null"};
-                                       ProcessResult res = 
ProcessHelper.executeScript("checkFlvPod_" + pod , args);
+                                       ProcessResult res = 
ProcessHelper.executeScript("checkFlvPod_" + pod , args, true);
                                        logs.add(res);
                                        if (res.isOk()) {
                                                long diff = 
diff(meta.getRecordStart(), meta.getRecording().getRecordStart());
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 5fd61f7..967faed 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
@@ -470,7 +470,9 @@ public class ScopeApplicationAdapter /*extends 
MultiThreadedApplicationAdapter i
                        c.setBroadcastId(streamName);
 
                        if (Client.Type.sharing != c.getType() && 
Client.Type.mobile != c.getType()) {
-                               c.setAvsettings("av");
+                               if (Strings.isEmpty(c.getAvsettings()) || 
"n".equals(c.getAvsettings())) {
+                                       c.setAvsettings("av");
+                               }
                                c.setBroadcasting(true);
                                if (c.getWidth() == 0 || c.getHeight() == 0) {
                                        c.setWidth(320);
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
index a9c6b00..8280eac 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
@@ -71,6 +71,8 @@ public class StreamClientManager implements 
IStreamClientManager {
        @Autowired
        private ClientManager clientManager;
        @Autowired
+       private StreamClientManager streamClientManager;
+       @Autowired
        private SessiondataDao sessionDao;
        @Autowired
        private UserDao userDao;
@@ -178,10 +180,10 @@ public class StreamClientManager implements 
IStreamClientManager {
                rcl.setEmail(u.getAddress() == null ? null : 
u.getAddress().getEmail());
                rcl.setSuperMod(client.hasRight(Right.superModerator));
                rcl.setMod(client.hasRight(Right.moderator));
-               if (client.hasActivity(Activity.broadcastA) && client.getMic() 
< 0) {
+               if (client.hasActivity(Activity.broadcastA) && 
!client.isMicEnabled()) {
                        client.remove(Activity.broadcastA);
                }
-               if (client.hasActivity(Activity.broadcastV) && client.getCam() 
< 0) {
+               if (client.hasActivity(Activity.broadcastV) && 
!client.isCamEnabled()) {
                        client.remove(Activity.broadcastV);
                }
                if (client.hasActivity(Activity.broadcastA) || 
client.hasActivity(Activity.broadcastV)) {
@@ -207,6 +209,8 @@ public class StreamClientManager implements 
IStreamClientManager {
                        rcl.setAvsettings("n");
                        rcl.setBroadcasting(false);
                }
+               clientManager.update(client);
+               streamClientManager.update(rcl);
                return rcl;
        }
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
index e3615c1..91e5709 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
@@ -61,8 +61,6 @@ public class RoomBroadcaster {
                if (rcl == null) {
                        return;
                }
-
-               // Put the mod-flag to true for this client
                getBean(StreamClientManager.class).update(rcl);
        }
 }

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.

Reply via email to