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

Merge branch 'master' into display-avatar-when-cam-is-not-on

Browse Source
This commit is contained in:
Richard Alam 2012-12-04 19:16:53 +00:00
commit 3604c95601
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
View File

@ -39,6 +39,9 @@ package org.bigbluebutton.main.api
var payload:Object = new Object();
payload.eventName = EventConstants.USER_JOINED_VOICE;
payload.userID = UsersUtil.internalUserIDToExternalUserID(event.payload.userID);
LogUtil.debug("Notifying external API that [" + UsersUtil.getUserName(event.payload.userID) + "] has joined the voice conference.");
broadcastEvent(payload);
}
@ -47,6 +50,8 @@ package org.bigbluebutton.main.api
payload.eventName = EventConstants.USER_MUTED_VOICE;
payload.userID = UsersUtil.internalUserIDToExternalUserID(event.payload.userID);
payload.muted = event.payload.muted;
LogUtil.debug("Notifying external API that [" + UsersUtil.getUserName(event.payload.userID) + "] is now muted=[" + payload.muted + "]");
broadcastEvent(payload);
}
@ -55,6 +60,8 @@ package org.bigbluebutton.main.api
payload.eventName = EventConstants.USER_LOCKED_VOICE;
payload.userID = UsersUtil.internalUserIDToExternalUserID(event.payload.userID);
payload.locked = event.payload.locked;
LogUtil.debug("Notifying external API that [" + UsersUtil.getUserName(event.payload.userID) + "] is now locked=[" + payload.locked + "]");
broadcastEvent(payload);
}
@ -62,6 +69,9 @@ package org.bigbluebutton.main.api
var payload:Object = new Object();
payload.eventName = EventConstants.USER_LEFT_VOICE;
payload.userID = UsersUtil.internalUserIDToExternalUserID(event.payload.userID);
LogUtil.debug("Notifying external API that [" + UsersUtil.getUserName(event.payload.userID) + "] has left the voice conference.");
broadcastEvent(payload);
}

5
bigbluebutton-client/src/org/bigbluebutton/modules/listeners/business/ListenersSOService.as
View File

@ -172,6 +172,8 @@ package org.bigbluebutton.modules.listeners.business
if (bu != null) {
bu.voiceMuted = l.muted;
LogUtil.debug("[" + bu.name + "] is now muted=[" + bu.voiceMuted + "]");
var bbbEvent:BBBEvent = new BBBEvent(BBBEvent.USER_VOICE_MUTED);
bbbEvent.payload.muted = mute;
bbbEvent.payload.userID = bu.userID;
@ -184,7 +186,7 @@ package org.bigbluebutton.modules.listeners.business
var l:Listener = _listeners.getListener(userId);
if (l != null) {
l.locked = locked;
LogUtil.debug(LOGNAME + 'Lock Un/Muting user ' + userId + " locked=" + locked);
/**
* Let's store the voice userid so we can do push to talk.
*/
@ -195,6 +197,7 @@ package org.bigbluebutton.modules.listeners.business
var bu:BBBUser = UsersUtil.getVoiceUser(userId)
if (bu != null) {
bu.voiceLocked = l.locked;
LogUtil.debug("[" + bu.name + "] is now locked=[" + bu.voiceLocked + "] muted=[" + bu.voiceMuted + "]");
var bbbEvent:BBBEvent = new BBBEvent(BBBEvent.USER_VOICE_LOCKED);
bbbEvent.payload.locked = bu.voiceLocked;

6
record-and-playback/presentation/playback/presentation/lib/writing.js
View File

@ -315,8 +315,10 @@ function runPopcorn() {
else var thisimg = svgobj.getSVGDocument('svgfile').getElementById(current_image);
var offsets = thisimg.getBoundingClientRect();
imageXOffset = (1600 - parseInt(thisimg.getAttribute("width"), 10))/2;
imageYOffset = (1200 - parseInt(thisimg.getAttribute("height"), 10))/2;
// Offsets divided by 4. By 2 because of the padding and by 2 again because 800x600 is half 1600x1200
imageXOffset = (1600 - parseInt(thisimg.getAttribute("width"), 10))/4;
imageYOffset = (1200 - parseInt(thisimg.getAttribute("height"), 10))/4;
var vboxVal = getViewboxAtTime(t);
if(vboxVal !== undefined) {

5
record-and-playback/presentation/scripts/publish/presentation.rb
View File

@ -155,7 +155,7 @@ def processClearEvents
$pageCleared = clearEvent.xpath(".//pageNumber")[0].text()
slideFolder = clearEvent.xpath(".//presentation")[0].text()
#$clearPageTimes[clearTime] = [$pageCleared, $canvas_number, "presentation/#{slideFolder}/slide-#{$pageCleared.to_i+1}.png", nil]
$clearPageTimes[($prev_clear_time..clearTime)] = [$pageCleared, $canvas_number, "presentation/#{slideFolder}/slide-#{$pageCleared.to_i+1}.png", nil]
$clearPageTimes[($prev_clear_time..clearTime)] = [$pageCleared, $canvas_number, "presentation/#{slideFolder}/slide-#{$pageCleared}.png", nil]
$prev_clear_time = clearTime
$canvas_number+=1
end
@ -469,7 +469,7 @@ def processShapesAndClears
# Print out the gathered/detected images.
$slides_compiled.each do |key, val|
$val = val
$xml.image(:id => "image#{$val[2].to_i}", :in => $val[0].join(' '), :out => $val[1].join(' '), 'xlink:href' => key[0], :height => key[1], :width => key[2], :visibility => :hidden, :text => $val[3])
$xml.image(:id => "image#{$val[2].to_i}", :in => $val[0].join(' '), :out => $val[1].join(' '), 'xlink:href' => key[0], :height => key[1], :width => key[2], :visibility => :hidden, :text => $val[3], :x => 0)
$canvas_number+=1
$xml.g(:class => :canvas, :id => "canvas#{$val[2].to_i}", :image => "image#{$val[2].to_i}", :display => :none) do
@ -792,3 +792,4 @@ end
performance_end = Time.now