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 2018/08/03 03:17:59 UTC

[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1142] CSS is improved for old browsers, recording is improved

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

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
     new 14a9581  [OPENMEETINGS-1142] CSS is improved for old browsers, recording is improved
14a9581 is described below

commit 14a95810dd957b861cc708fdbc3c89424822f3c3
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Aug 3 10:17:50 2018 +0700

    [OPENMEETINGS-1142] CSS is improved for old browsers, recording is improved
---
 .../apache/openmeetings/core/converter/InterviewConverter.java    | 8 ++++----
 openmeetings-web/src/main/webapp/css/raw-room.css                 | 2 +-
 2 files changed, 5 insertions(+), 5 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 95150f7..e648154 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
@@ -196,7 +196,7 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
 			} else {
 				/* Creating grid
 				 * ffmpeg -i top_l.mp4 -i top_r.mp4 -i bottom_l.mp4 -i bottom_r.mp4 -i audio.mp4 \
-				 *	-filter_complex "[0:v][1:v]hstack[t];[2:v][3:v]hstack[b];[t][b]vstack[v]" \
+				 *	-filter_complex "[0:v][1:v]hstack=inputs=2[t];[2:v][3:v]hstack=inputs=2[b];[t][b]vstack=inputs=2[v]" \
 				 *	-map "[v]" -map 4:a -c:a copy -shortest output.mp4
 				 */
 				StringBuilder cols = new StringBuilder();
@@ -206,15 +206,15 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
 					args.add(pods.get(i));
 					cols.append('[').append(i).append(":v]");
 					if (i != 0 && i % w == 0) {
-						cols.append("hstack[c").append(j).append("];");
+						cols.append("hstack=inputs=").append(w).append("[c").append(j).append("];");
 						rows.append("[c").append(j).append(']');
 						j++;
 					}
 					if (i == N - 1) {
 						if (j == 0) {
-							cols.append("hstack[v]");
+							cols.append("hstack=inputs=").append(i).append("[v]");
 						} else {
-							rows.append("vstack[v]");
+							rows.append("vstack=inputs=").append(j).append("[v]");
 						}
 					}
 				}
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css b/openmeetings-web/src/main/webapp/css/raw-room.css
index e5fe6e7..4b35489 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -472,7 +472,7 @@ ul.settings-menu {
 }
 .pod-area .pod-big {
 	grid-area: a;
-	border: 1px solid #cccc;
+	border: 1px solid #cccccc;
 	border-radius: 8px;
 	background-image: url(images/drop.png);
 	background-repeat: no-repeat;