Author: solomax
Date: Wed Apr 20 12:33:53 2016
New Revision: 1740138
URL: http://svn.apache.org/viewvc?rev=1740138&view=rev
Log:
[OPENMEETINGS-1376] user speaks is partially implemented
Added:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/speaking.png
(with props)
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/speaking.png
(with props)
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStreamDevice.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1740138&r1=1740137&r2=1740138&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Wed Apr 20 12:33:53 2016
@@ -1117,7 +1117,8 @@
if (value[0]=='audioActivity'){
//canvas.currentModApply
//if ($debug) Debug.write("audioActivity Client
",value[1],value[2]);
-
canvas._videocontainer.setSpeakingByPos(value[2],value[1]);
+
canvas.commonVideoViewContent.setSpeakingByPos(value[2], value[1]);
+ ExternalInterface.call("audioActivity",
value[2], value[1]);
} else if (value[0]=='typingActivity'){
if ($debug) Debug.write("!!!typingActivity ::",
value[1],
canvas._videocontainer._participants.getUserListItemByPublicSID(value[2]));
canvas._videocontainer._participants.getUserListItemByPublicSID(value[2]).userTyping(value[1]);
@@ -1317,16 +1318,6 @@
]]>
</method>
- <method name="newPoll" args="value">
- <![CDATA[
- //The onResult-Handler will be called by the rtmpconnection
- if ($debug) Debug.write("newPoll : ", value);
- if (canvas.userId != value.creator.id) {
- ExternalInterface.call("vote", canvas.publicSID);
- }
- ]]>
- </method>
-
<method name="sendVarsToModeratorGeneral" args="value">
<![CDATA[
//The onResult-Handler will be called be the
rtmpconnection
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStreamDevice.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStreamDevice.lzx?rev=1740138&r1=1740137&r2=1740138&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStreamDevice.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStreamDevice.lzx
Wed Apr 20 12:33:53 2016
@@ -15,12 +15,12 @@
which are thrown, once a device was set -->
<class name="baseVideoStreamDevice" extends="baseVideoStream">
-
<switch>
<when property="$as3">
<passthrough>
import flash.events.StatusEvent;
import flash.events.ActivityEvent;
+ import flash.external.ExternalInterface;
</passthrough>
</when>
</switch>
@@ -159,6 +159,7 @@
this.objMessage[0] = 'audioActivity';
this.objMessage[1] = this.isgreater;
this.objMessage[2] = parent.parent.publicSID;
+ ExternalInterface.call("audioActivity",
parent.parent.publicSID, this.isgreater);
//if ($debug) Debug.write("Level sendNotification
",this.objMessage);
this.sendMessage.doCall();
</method>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1740138&r1=1740137&r2=1740138&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
Wed Apr 20 12:33:53 2016
@@ -193,10 +193,6 @@
canvas.commonVideoViewContent.updateMuteStatusVideoView(roomClient);
</method>
- <method name="setSpeakingByPos" args="publicSID,bool">
- canvas.commonVideoViewContent.setSpeakingByPos(publicSID, bool);
- </method>
-
<method name="receiveExclusiveAudioFlag" args="publicSID">
<![CDATA[
if ($debug) Debug.write("receiveExclusiveAudioFlag: ",publicSID);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx?rev=1740138&r1=1740137&r2=1740138&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
Wed Apr 20 12:33:53 2016
@@ -201,14 +201,6 @@
]]>
</method>
- <method name="setSpeakingByPos" args="publicSID,bool">
- var tObj = this._participants.getUserListItemByPublicSID(publicSID);
- if (tObj != null) {
- tObj._miniIcons._loudness.loudness.setAttribute('opacity', bool
? 1 : 0.2);
- }
- canvas.commonVideoViewContent.setSpeakingByPos(publicSID, bool);
- </method>
-
<method name="closeStreamClient" args="publicSID">
canvas.commonVideoViewContent.closeStreamClient(publicSID);
</method>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx?rev=1740138&r1=1740137&r2=1740138&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
Wed Apr 20 12:33:53 2016
@@ -234,10 +234,6 @@
canvas.commonVideoViewContent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight);
</method>
- <method name="setSpeakingByPos" args="publicSID,bool">
- canvas.commonVideoViewContent.setSpeakingByPos(publicSID, bool);
- </method>
-
<method name="closeStreamClient" args="publicSID">
canvas.commonVideoViewContent.closeStreamClient(publicSID);
</method>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1740138&r1=1740137&r2=1740138&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
Wed Apr 20 12:33:53 2016
@@ -51,3 +51,13 @@ function startPrivateChat(el) {
openChat();
$('#chatMessage .wysiwyg-editor').click();
}
+
+/***** functions required by SWF ******/
+function audioActivity(uid, active) {
+ var u = $('#user' + uid + ' .user.actions .audio.activity.ui-icon');
+ if (active) {
+ u.addClass("speaking");
+ } else {
+ u.removeClass("speaking");
+ }
+}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1740138&r1=1740137&r2=1740138&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
Wed Apr 20 12:33:53 2016
@@ -28,7 +28,8 @@
<span wicket:id="status" class="ui-icon
align-right"></span>
<div wicket:id="name" class="user name"></div>
<div class="user actions">
- <span wicket:id="privateChat"
class="private-chat om-icon align-right clickable" wicket:message="title:1493"
onclick="startPrivateChat($(this));"></span>
+ <span class="ui-icon align-right audio
activity" wicket:message="title:372" ></span> <!-- TODO exclusive audio
onclick="startPrivateChat($(this));" -->
+ <span wicket:id="privateChat"
class="private-chat ui-icon align-right clickable" wicket:message="title:1493"
onclick="startPrivateChat($(this));"></span>
<div class="clear"></div>
</div>
</div>
Added:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/speaking.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/speaking.png?rev=1740138&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/speaking.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css?rev=1740138&r1=1740137&r2=1740138&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
Wed Apr 20 12:33:53 2016
@@ -101,7 +101,16 @@
height: 18px;
padding: 0;
}
-.private-chat.om-icon {
+.audio.activity.ui-icon, .audio.activity.ui-icon.speaking {
+ background-image: url(images/speaking.png);
+}
+.user .user.actions .audio.activity.ui-icon {
+ opacity: 0.2;
+}
+.user .user.actions .audio.activity.ui-icon.speaking {
+ opacity: 1;
+}
+.private-chat.ui-icon {
background-image: url(images/page_edit.png);
}
.room.sidebar.left .tabs, .room.sidebar.left .tabs #utab, .room.sidebar.left
.tabs #ftab {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1740138&r1=1740137&r2=1740138&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
Wed Apr 20 12:33:53 2016
@@ -57,7 +57,7 @@ function initVideo(_options) {
}
function setHeight() {
- var h = $(window).height() - $('#roomMenu').height();
+ var h = $(window).height() - $('#menu').height();
$(".room.sidebar.left").height(h);
var p = $(".room.sidebar.left .tabs");
p.height(h - 5); //FIXME hacks
@@ -84,9 +84,20 @@ function roomLoad() {
$(".room.wb.area .wb").width(w);
}
});
+ setHeight();
}
function startPrivateChat(el) {
addChatTab('chatTab-u' + el.parent().parent().data("userid"),
el.parent().parent().find('.user.name').text());
openChat();
$('#chatMessage .wysiwyg-editor').click();
}
+
+/***** functions required by SWF ******/
+function audioActivity(uid, active) {
+ var u = $('#user' + uid + ' .user.actions .audio.activity.ui-icon');
+ if (active) {
+ u.addClass("speaking");
+ } else {
+ u.removeClass("speaking");
+ }
+}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1740138&r1=1740137&r2=1740138&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
Wed Apr 20 12:33:53 2016
@@ -28,7 +28,8 @@
<span wicket:id="status" class="ui-icon
align-right"></span>
<div wicket:id="name" class="user name"></div>
<div class="user actions">
- <span wicket:id="privateChat"
class="private-chat om-icon align-right clickable" wicket:message="title:1493"
onclick="startPrivateChat($(this));"></span>
+ <span class="ui-icon align-right audio
activity" wicket:message="title:372" ></span> <!-- TODO exclusive audio
onclick="startPrivateChat($(this));" -->
+ <span wicket:id="privateChat"
class="private-chat ui-icon align-right clickable" wicket:message="title:1493"
onclick="startPrivateChat($(this));"></span>
<div class="clear"></div>
</div>
</div>
Added:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/speaking.png
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/speaking.png?rev=1740138&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/speaking.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css?rev=1740138&r1=1740137&r2=1740138&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
Wed Apr 20 12:33:53 2016
@@ -101,7 +101,16 @@
height: 18px;
padding: 0;
}
-.private-chat.om-icon {
+.audio.activity.ui-icon, .audio.activity.ui-icon.speaking {
+ background-image: url(images/speaking.png);
+}
+.user .user.actions .audio.activity.ui-icon {
+ opacity: 0.2;
+}
+.user .user.actions .audio.activity.ui-icon.speaking {
+ opacity: 1;
+}
+.private-chat.ui-icon {
background-image: url(images/page_edit.png);
}
.room.sidebar.left .tabs, .room.sidebar.left .tabs #utab, .room.sidebar.left
.tabs #ftab {
