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

Finished implementing view side webcam.

Browse Source 
TODO: Testing and code cleaning
This commit is contained in:
Hugo Lazzari 2013-07-02 10:10:27 -03:00
parent d0bdc1f03b
commit 1941989c98
4 changed files with 68 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-client/src/org/bigbluebutton/main/events/StoppedViewingWebcamEvent.as
View File

@ -27,6 +27,9 @@ package org.bigbluebutton.main.events
// The userID of the webcam being viewed.
public var webcamUserID:String;
// The streamName of the user
public var streamName:String;
public function StoppedViewingWebcamEvent(bubbles:Boolean=true, cancelable:Boolean=false)
{
super(STOPPED_VIEWING_WEBCAM, bubbles, cancelable);

4
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
View File

@ -80,8 +80,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function onCreationComplete():void {
changeDefaultCamForMac();
if(defaultCamera != null) {
var indexDefault:int = 0;
for (var i:int = 0; i < Camera.names.length; i++){
@ -139,7 +137,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
_camera = null;
_camera = Camera.getCamera(camerasAvaiable.getItemAt(cmbCameraSelector.selectedIndex).index);
changeDefaultCamForMac();
if (_camera == null) {
_videoHolder.showWarning('bbb.video.publish.hint.cantOpenCamera');
return;

59
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
View File

@ -220,7 +220,7 @@ package org.bigbluebutton.modules.videoconf.maps
}
private function closeWindow(userID:String):void {
LogUtil.debug("FECHANDO AQUI");
if (! webcamWindows.hasWindow(userID)) {
trace("VideoEventMapDelegate:: [" + me + "] closeWindow:: No window for [" + userID + "] [" + UsersUtil.getUserName(userID) + "]");
return;
@ -241,7 +241,7 @@ package org.bigbluebutton.modules.videoconf.maps
}
}
private function closeWindowWithStream(userID:String, stream:String):int {
private function closePublishWindowWithStream(userID:String, stream:String):int {
var camIndex:int = -1;
var listOfWindows:ArrayList = webcamWindows.getAllWindow(userID);
@ -265,21 +265,39 @@ package org.bigbluebutton.modules.videoconf.maps
private function openViewWindowFor(userID:String):void {
trace("VideoEventMapDelegate:: [" + me + "] openViewWindowFor:: Opening VIEW window for [" + userID + "] [" + UsersUtil.getUserName(userID) + "]");
//if(numberOfWindows[userID] != null) {
// for(var i:int = 0; i < numberOfWindows[userID]; i++) {
// closeWindow(userID + "-" + String(i));
// }
//}
var bbbUser:BBBUser = UsersUtil.getUser(userID);
LogUtil.debug("REMOTE Userid: " + userID + " streamName: " + bbbUser.streamName);
var streamNames:Array = bbbUser.streamName.split("|");
for (var i:int = 0; i < streamNames.length; i++)
var listOfWindows:ArrayList = webcamWindows.getAllWindow(userID);
for (var i:int = 0; i < listOfWindows.length; i++)
{
var win:VideoWindowItf = VideoWindowItf(listOfWindows.getItemAt(i));
if(win != null) {
var stream:String = VideoWindow(win).streamName;
var index:int = int(streamNames.indexOf(stream));
if(index != -1) {
LogUtil.debug("JA EXISTEM - remove - " + index + " " + streamNames[i]);
streamNames.splice(index, 1);
}
else {
LogUtil.debug("FECHA A JANELA REMOTA");
webcamWindows.removeWin(win);
win.close();
var cwe:CloseWindowEvent = new CloseWindowEvent();
cwe.window = win;
_dispatcher.dispatchEvent(cwe);
}
}
}
for (var j:int = 0; j < streamNames.length; j++)
{
LogUtil.debug("ABRE A JANELA REMOTA: " + streamNames[j]);
var window:VideoWindow = new VideoWindow();
window.userID = userID;
window.videoOptions = options;
window.resolutions = options.resolutions.split(",");
window.title = UsersUtil.getUserName(userID);
window.startVideo(proxy.connection, streamNames[i]);
window.startVideo(proxy.connection, String(streamNames[j]));
webcamWindows.addWindow(window);
openWindow(window);
dockWindow(window);
@ -402,7 +420,7 @@ package org.bigbluebutton.modules.videoconf.maps
private function stopOneStreamBroadCasting(stream:String):void {
proxy.stopBroadcasting(stream);
var camId:int = closeWindowWithStream(UsersUtil.getMyUserID(), streamName);
var camId:int = closePublishWindowWithStream(UsersUtil.getMyUserID(), streamName);
if (proxy.videoOptions.showButton) {
//Make toolbar button enabled again
@ -429,7 +447,7 @@ package org.bigbluebutton.modules.videoconf.maps
_dispatcher.dispatchEvent(broadcastEvent);
var camId:int = closeWindowWithStream(UsersUtil.getMyUserID(), stream);
var camId:int = closePublishWindowWithStream(UsersUtil.getMyUserID(), stream);
if (proxy.videoOptions.showButton) {
//Make toolbar button enabled again
@ -553,10 +571,27 @@ package org.bigbluebutton.modules.videoconf.maps
openPublishWindowFor(UsersUtil.getMyUserID(), cameraIndex, camWidth, camHeight);
}
private function closeViewWindowWithStream(userID:String, stream:String):void {
var listOfWindows:ArrayList = webcamWindows.getAllWindow(userID);
for(var i:int = 0; i < listOfWindows.length; i++) {
var win:VideoWindowItf = VideoWindowItf(listOfWindows.getItemAt(i));
if(win != null) {
if(VideoWindow(win).getStreamName() == stream) {
webcamWindows.removeWin(win);
trace("VideoEventMapDelegate:: [" + me + "] closeWindow:: Closing [" + win.getWindowType() + "] for [" + userID + "] [" + UsersUtil.getUserName(userID) + "]");
win.close();
var cwe:CloseWindowEvent = new CloseWindowEvent();
cwe.window = win;
_dispatcher.dispatchEvent(cwe);
}
}
}
}
public function handleStoppedViewingWebcamEvent(event:StoppedViewingWebcamEvent):void {
trace("VideoEventMapDelegate::handleStoppedViewingWebcamEvent [" + me + "] received StoppedViewingWebcamEvent for user [" + event.webcamUserID + "]");
closeWindow(event.webcamUserID);
closeViewWindowWithStream(event.webcamUserID, event.streamName);
if (options.displayAvatar && UsersUtil.hasUser(event.webcamUserID) && ! UsersUtil.isUserLeaving(event.webcamUserID)) {
trace("VideoEventMapDelegate::handleStoppedViewingWebcamEvent [" + me + "] Opening avatar for user [" + event.webcamUserID + "]");

5
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
View File

@ -132,6 +132,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
updateControlButtons();
}
public function getStreamName():String {
return this.streamName;
}
private function handleNewRoleEvent(event:Event):void {
updateControlButtons();
}
@ -150,6 +154,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
_closing = true;
var stopEvent:StoppedViewingWebcamEvent = new StoppedViewingWebcamEvent();
stopEvent.webcamUserID = userID;
stopEvent.streamName = streamName;
globalDispatcher.dispatchEvent(stopEvent);
if (UserManager.getInstance().getConference().hasUser(userID)) {