Author: solomax
Date: Fri Oct 14 07:49:16 2016
New Revision: 1764825

URL: http://svn.apache.org/viewvc?rev=1764825&view=rev
Log:
[OPENMEETINGS-1376] audio/video/settings seems to work better

Added:
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/microphone_disable.png
      - copied unchanged from r1764824, 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/microphone_remove.png
    
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/microphone_disable.png
      - copied unchanged from r1764824, 
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/microphone_remove.png
Removed:
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/microphone_remove.png
    
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/microphone_remove.png
Modified:
    
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
    
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
    
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1764825&r1=1764824&r2=1764825&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
 Fri Oct 14 07:49:16 2016
@@ -339,9 +339,7 @@
                if (obj == null) {
                        obj = this.getNewVideoObjectByPos(rcl.publicSID);
                }
-               if ("n" == rcl.avsettings){
-                       obj.setVideouserProfilePic(rcl);
-               } else if ("a" == rcl.avsettings){
+               if ("n" == rcl.avsettings || "a" == rcl.avsettings) {
                        obj.setVideouserProfilePic(rcl);
                } else {
                        obj.deleteVideoConfProfilePic();
@@ -349,8 +347,7 @@
                obj.thisVars = rcl;
                obj.updateAVSettingsSymbol(rcl);
                var v = ("a" == rcl.avsettings && obj.isInterview) || ("a" != 
rcl.avsettings && rcl.avsettings != "n");
-               obj.setAttribute("visible", v);
-               obj.setAttribute("visibility", v ? "visible" : "hidden");
+               obj.setAttribute("visible", "n" != rcl.avsettings);
                if ($debug) Debug.write("setAVSettingsToClient: ", v, 
obj.visible);
        ]]>
        </method>

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx?rev=1764825&r1=1764824&r2=1764825&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
 Fri Oct 14 07:49:16 2016
@@ -65,8 +65,6 @@
 
                <attribute name="minimized" value="false" type="boolean" />
 
-               <attribute name="hidebyAudioOnly" value="false" type="boolean" 
/>
-
                <attribute name="custom" value="false" type="boolean" />
 
                <attribute name="initH" value="40" type="number" />

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1764825&r1=1764824&r2=1764825&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
 Fri Oct 14 07:49:16 2016
@@ -105,7 +105,7 @@
                canvas.editRecordStream = this;
                
                this.counterDelegate = new LzDelegate(this, "count");
-       
+
                if ($debug) Debug.write("this.myvideocontainer 
",this.myvideocontainer);
                if ($debug) Debug.write("editrecordstream 
###################### ");
 
@@ -299,12 +299,10 @@
                                break;
                        case "a":
                                
videoview.broadcast(this.currentClient.broadCastID,null,_micro);
-                               this.myvideocontainer.setAttribute("visible", 
canvas.isInterview || !this.myvideocontainer.hidebyAudioOnly);
+                               this.myvideocontainer.setAttribute("visible", 
true);
                                if(!canvas.isInterview) {
-                                       if 
(!this.myvideocontainer.hidebyAudioOnly) {
-                                               if 
(!this.myvideocontainer.minimized) {
-                                                       
this.myvideocontainer.minimize();
-                                               }
+                                       if (!this.myvideocontainer.minimized) {
+                                               
this.myvideocontainer.minimize();
                                        }
                                }
                                break;
@@ -489,7 +487,7 @@
                selectListItem(availableMics, foundStoredMic, mics.length > 0);
 
                // settings
-               var addCams = canvas.currentClient.canVideo && 
!canvas.currentRoomObj.audioOnly && cameras.length > 0;
+               var addCams = !canvas.currentRoomObj.audioOnly && 
cameras.length > 0;
                var addMics = mics.length > 0;
                if (addCams && addMics) {
                        availableSettings.addItem(canvas.getLabelName(448), 
"av");

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1764825&r1=1764824&r2=1764825&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
 Fri Oct 14 07:49:16 2016
@@ -265,21 +265,15 @@ public class RoomSidebar extends Panel {
 
        public static boolean activityAllowed(Client c, Activity a, Room room) {
                switch (a) {
+                       case broadcastAudio:
+                               return c.hasRight(Right.audio);
                        case broadcastVideo:
                                {
                                        if (room.isAudioOnly()) {
                                                return false;
                                        }
-                                       if (c.hasRight(Right.moderator)) {
-                                               return true;
-                                       }
-                                       for (Right r : new 
Right[]{Right.video}) {
-                                               if (!c.hasRight(r)) {
-                                                       return false;
-                                               }
-                                       }
+                                       return c.hasRight(Right.video);
                                }
-                               break;
                }
                return false;
        }

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java?rev=1764825&r1=1764824&r2=1764825&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
 Fri Oct 14 07:49:16 2016
@@ -26,7 +26,7 @@ public class MicActivityIcon extends Roo
        private static final long serialVersionUID = 1L;
 
        public MicActivityIcon(String id, Client client, RoomPanel room) {
-               super(id, client, Activity.broadcastVideo, room);
+               super(id, client, Activity.broadcastAudio, room);
                mainCssClass = "activity mic ";
        }
 

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1764825&r1=1764824&r2=1764825&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
 Fri Oct 14 07:49:16 2016
@@ -265,21 +265,15 @@ public class RoomSidebar extends Panel {
 
        public static boolean activityAllowed(Client c, Activity a, Room room) {
                switch (a) {
+                       case broadcastAudio:
+                               return c.hasRight(Right.audio);
                        case broadcastVideo:
                                {
                                        if (room.isAudioOnly()) {
                                                return false;
                                        }
-                                       if (c.hasRight(Right.moderator)) {
-                                               return true;
-                                       }
-                                       for (Right r : new 
Right[]{Right.video}) {
-                                               if (!c.hasRight(r)) {
-                                                       return false;
-                                               }
-                                       }
+                                       return c.hasRight(Right.video);
                                }
-                               break;
                }
                return false;
        }

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java?rev=1764825&r1=1764824&r2=1764825&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
 Fri Oct 14 07:49:16 2016
@@ -26,7 +26,7 @@ public class MicActivityIcon extends Roo
        private static final long serialVersionUID = 1L;
 
        public MicActivityIcon(String id, Client client, RoomPanel room) {
-               super(id, client, Activity.broadcastVideo, room);
+               super(id, client, Activity.broadcastAudio, room);
                mainCssClass = "activity mic ";
        }
 


Reply via email to