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

reverted some unwanted changes done during the merge; fixed the total bytes counter

Browse Source
This commit is contained in:
Felipe Cecagno 2012-12-07 17:35:14 -02:00
parent 4bed1f8fb6
commit b5ae953c1e
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bigbluebutton-client/src/org/bigbluebutton/core/managers/StreamManager.as
View File

@ -38,7 +38,7 @@ package org.bigbluebutton.core.managers
private var _netmon:NetMonitor;
private var _heartbeat:Timer = new Timer( 2000 );
private var _globalDispatcher:Dispatcher = new Dispatcher();
private var _totalByteCount:Dictionary = new Dictionary();
private var _totalBytesCounter:Dictionary = new Dictionary();
/**
* This class is a singleton. Please initialize it using the getInstance() method.
@ -189,21 +189,22 @@ package org.bigbluebutton.core.managers
totalReg.streamName = streamName;
totalReg.remote = remote;
totalReg.byteCount = streams[i].info["byteCount"];
if (_totalByteCount.hasOwnProperty(streamName) && _totalByteCount[streamName].byteCount > totalReg.byteCount) {
if (_totalBytesCounter.hasOwnProperty(streamName) && _totalBytesCounter[streamName].byteCount > totalReg.byteCount) {
var curTime:Number = new Date().getTime();
var newStreamName:String = streamName + "_" + curTime;
_totalByteCount[streamName].streamName = newStreamName;
_totalByteCount[newStreamName] = _totalByteCount[streamName];
delete _totalByteCount[streamName];
_totalBytesCounter[streamName].streamName = newStreamName;
_totalBytesCounter[newStreamName] = _totalBytesCounter[streamName];
delete _totalBytesCounter[streamName];
}
_totalByteCount[streamName] = totalReg;
_totalBytesCounter[streamName] = totalReg;
}
for each (var value:Object in _totalByteCount) {
download["byteCount"] = upload["byteCount"] = 0;
for each (var value:Object in _totalBytesCounter) {
if (value.remote)
download["byteCount"] = value.byteCount;
download["byteCount"] += value.byteCount;
else
upload["byteCount"] = value.byteCount;
upload["byteCount"] += value.byteCount;
log(value.streamName + ": " + value.byteCount);
}

9
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
View File

@ -114,12 +114,15 @@
}
private function handleAddToolbarButtonEvent(event:ToolbarButtonEvent):void {
addedBtns.addChild(event.button as UIComponent);
realignButtons();
if (event.location == ToolbarButtonEvent.TOP_TOOLBAR) {
addedBtns.addChild(event.button as UIComponent);
realignButtons();
}
}
private function handleRemoveToolbarButtonEvent(event:ToolbarButtonEvent):void {
addedBtns.removeChild(event.button as UIComponent);
if (addedBtns.contains(event.button as UIComponent))
addedBtns.removeChild(event.button as UIComponent);
}
private function realignButtons():void{

2
bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
View File

@ -25,7 +25,7 @@
<MDIWindow xmlns="flexlib.mdi.containers.*"
xmlns:mx="http://www.adobe.com/2006/mxml"
xmlns:mate="http://mate.asfusion.com/"
title="Network statistics"
title="Network monitor"
creationComplete="onCreationComplete()"
resizable="false"
implements="org.bigbluebutton.common.IBbbModuleWindow"