BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- a little cleanup

Browse Source
This commit is contained in:
Richard Alam 2014-07-16 13:12:10 -07:00
parent 7fd7b13088
commit 412e2c51a6
4 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
View File

@ -59,14 +59,9 @@ class MeetingActor(val meetingID: String, meetingName: String, val recorded: Boo
case msg: MuteMeetingRequest => handleMuteMeetingRequest(msg)
case msg: IsMeetingMutedRequest => handleIsMeetingMutedRequest(msg)
case msg: MuteUserRequest => handleMuteUserRequest(msg)
case msg: LockUserRequest => handleLockUserRequest(msg)
case msg: EjectUserRequest => handleEjectUserRequest(msg)
case msg: SetLockSettings => handleSetLockSettings(msg)
case msg: InitLockSettings => handleInitLockSettings(msg)
case msg: LockUser => handleLockUser(msg)
case msg: LockAllUsers => handleLockAllUsers(msg)
case msg: GetLockSettings => handleGetLockSettings(msg)
case msg: IsMeetingLocked => handleIsMeetingLocked(msg)
case msg: GetChatHistoryRequest => handleGetChatHistoryRequest(msg)
case msg: SendPublicMessageRequest => handleSendPublicMessageRequest(msg)
case msg: SendPrivateMessageRequest => handleSendPrivateMessageRequest(msg)

4
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
View File

@ -12,7 +12,7 @@ trait LayoutApp {
private var setByUser:String = "system";
private var currentLayout = "";
private var layoutLocked = false
private var viewersOnly = false
private var viewersOnly = true
def handleGetCurrentLayoutRequest(msg: GetCurrentLayoutRequest) {
outGW.send(new GetCurrentLayoutReply(msg.meetingID, recorded, msg.requesterID, currentLayout, permissions.lockedLayout, setByUser))
@ -24,7 +24,7 @@ trait LayoutApp {
outGW.send(new LockLayoutEvent(msg.meetingID, recorded, msg.setById, msg.lock, affectedUsers))
msg.layout foreach {l=>
msg.layout foreach {l =>
currentLayout = l
broadcastSyncLayout(msg.meetingID, msg.setById)
}

21
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
View File

@ -96,10 +96,6 @@ trait UsersApp {
}
}
def handleLockUserRequest(msg: LockUserRequest) {
// users2.lockVoice(msg.userID, msg.lock)
}
def handleEjectUserRequest(msg: EjectUserRequest) {
println("Received eject user request uid=[" + msg.userID + "]")
users.getUser(msg.userID) match {
@ -108,22 +104,7 @@ trait UsersApp {
}
}
def handleLockUser(msg: LockUser) {
}
def handleLockAllUsers(msg: LockAllUsers) {
}
def handleGetLockSettings(msg: GetLockSettings) {
}
def handleIsMeetingLocked(msg: IsMeetingLocked) {
}
def handleSetLockSettings(msg: SetLockSettings) {
println("*************** Received new lock settings ********************")
if (!permissionsEqual(msg.settings)) {

4
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml Executable file → Normal file
View File

@ -47,8 +47,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import flexlib.mdi.events.MDIWindowEvent;
import mx.core.UIComponent;
import mx.events.ResizeEvent;
import mx.events.ResizeEvent;
import org.bigbluebutton.common.Images;
import org.bigbluebutton.common.LogUtil;
import org.bigbluebutton.common.Role;
@ -57,7 +56,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.core.EventConstants;
import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.core.events.CoreEvent;
import org.bigbluebutton.core.events.SwitchedLayoutEvent;
import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.main.events.BBBEvent;
import org.bigbluebutton.main.events.MadePresenterEvent;