Author: solomax
Date: Wed Aug 5 12:22:59 2015
New Revision: 1694199
URL: http://svn.apache.org/r1694199
Log:
[OPENMEETINGS-1100] partially fixed (need more work in conference room)
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1694199&r1=1694198&r2=1694199&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Wed Aug 5 12:22:59 2015
@@ -849,7 +849,7 @@ public class ScopeApplicationAdapter ext
return -1L;
}
- public Long setBroadCastingFlag(String publicSID, boolean value,
Integer interviewPodId) {
+ public Long setBroadCastingFlag(String publicSID, boolean value,
boolean canVideo, Integer interviewPodId) {
try {
log.debug("----------- setBroadCastingFlag: " +
publicSID);
@@ -860,6 +860,7 @@ public class ScopeApplicationAdapter ext
}
currentClient.setIsBroadcasting(value);
+ currentClient.setCanVideo(value && canVideo); //set to
false in case NOT broadcasting
currentClient.setInterviewPodId(interviewPodId);
// Put the mod-flag to true for this client
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=1694199&r1=1694198&r2=1694199&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
Wed Aug 5 12:22:59 2015
@@ -164,6 +164,8 @@ public class Client implements IDataProv
@Column(name = "can_giveaudio")
private Boolean canGiveAudio = false;
+ @Column(name = "can_video")
+ private boolean canVideo = false;
/**
* @see Client#getConnectedSince()
*/
@@ -817,6 +819,13 @@ public class Client implements IDataProv
this.canGiveAudio = canGiveAudio;
}
+ public boolean getCanVideo() {
+ return canVideo;
+ }
+
+ public void setCanVideo(boolean canVideo) {
+ this.canVideo = canVideo;
+ }
public boolean isAllowRecording() {
return allowRecording;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1694199&r1=1694198&r2=1694199&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
Wed Aug 5 12:22:59 2015
@@ -1620,6 +1620,13 @@
<entry key="1598">Security</entry>
<entry key="1599">Access denied. You have no rights to enter this
room.</entry>
<entry key="1600">Re-convert</entry>
+ <entry key="1601">Apply for audio access</entry>
+ <entry key="1602">Ask moderator to share your micro</entry>
+ <entry key="1603">would like to share his audio</entry>
+ <entry key="1604">Allow this user to publish their audio</entry>
+ <entry key="1605">Remove audio of this user</entry>
+ <entry key="1606">I would like to share my audio</entry>
+ <entry key="1607">You are allowed to share your audio</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><