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

add warning to Flash for WebRTC SS in FF on Mac

Browse Source
This commit is contained in:
Chad Pilkey 2018-08-31 13:44:18 -07:00
parent 6f4e00aed1
commit 44ec61c9ce
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bigbluebutton-client/locale/en_US/bbbResources.properties
View File

@ -456,6 +456,7 @@ bbb.screenshareView.actualSize = Display actual size
bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
bbb.screenshareView.warning.ffMacWebRTC = We recommend that you switch to Chrome on Mac for a better screenshare viewing quality.
bbb.toolbar.phone.toolTip.start = Enable Audio (microphone or listen only) bbb.toolbar.phone.toolTip.start = Enable Audio (microphone or listen only)
bbb.toolbar.phone.toolTip.stop = Disable Audio bbb.toolbar.phone.toolTip.stop = Disable Audio
bbb.toolbar.phone.toolTip.mute = Stop listening the conference bbb.toolbar.phone.toolTip.mute = Stop listening the conference

9
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/utils/WebRTCScreenshareUtility.as
View File

@ -20,13 +20,14 @@
package org.bigbluebutton.modules.screenshare.utils package org.bigbluebutton.modules.screenshare.utils
{ {
import flash.external.ExternalInterface; import flash.external.ExternalInterface;
import flash.system.Capabilities;
import org.as3commons.lang.StringUtils; import org.as3commons.lang.StringUtils;
import org.as3commons.logging.api.ILogger; import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger; import org.as3commons.logging.api.getClassLogger;
import org.bigbluebutton.core.Options; import org.bigbluebutton.core.Options;
import org.bigbluebutton.modules.screenshare.model.ScreenshareOptions; import org.bigbluebutton.modules.screenshare.model.ScreenshareOptions;
import org.bigbluebutton.util.browser.BrowserCheck; import org.bigbluebutton.util.browser.BrowserCheck;
public class WebRTCScreenshareUtility { public class WebRTCScreenshareUtility {
private static const LOGGER:ILogger = getClassLogger(WebRTCScreenshareUtility); private static const LOGGER:ILogger = getClassLogger(WebRTCScreenshareUtility);
@ -66,7 +67,11 @@ package org.bigbluebutton.modules.screenshare.utils
// if its firefox go ahead and let webrtc handle it // if its firefox go ahead and let webrtc handle it
if (BrowserCheck.isFirefox()) { if (BrowserCheck.isFirefox()) {
webRTCWorksAndConfigured("Firefox, lets try"); if (Capabilities.os.indexOf("Mac") >= 0) {
cannotUseWebRTC("Firefox on Mac performs poorly fallback to Java");
} else {
webRTCWorksAndConfigured("Firefox, lets try");
}
return; return;
// if its chrome we need to check for the extension // if its chrome we need to check for the extension

18
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopViewWindow.mxml
View File

@ -67,6 +67,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.modules.screenshare.model.ScreenshareOptions; import org.bigbluebutton.modules.screenshare.model.ScreenshareOptions;
import org.bigbluebutton.modules.screenshare.services.red5.WebRTCConnectionEvent; import org.bigbluebutton.modules.screenshare.services.red5.WebRTCConnectionEvent;
import org.bigbluebutton.util.ConnUtil; import org.bigbluebutton.util.ConnUtil;
import org.bigbluebutton.util.browser.BrowserCheck;
import org.bigbluebutton.util.i18n.ResourceUtil; import org.bigbluebutton.util.i18n.ResourceUtil;
public static const LOG:String = "Deskshare::DesktopViewWindow - "; public static const LOG:String = "Deskshare::DesktopViewWindow - ";
@ -111,6 +112,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
videoHolder.addEventListener(MouseEvent.MOUSE_OUT, videoHolder_mouseOutHanlder); videoHolder.addEventListener(MouseEvent.MOUSE_OUT, videoHolder_mouseOutHanlder);
addEventListener(MDIWindowEvent.RESIZE_END, onResizeEndEvent); addEventListener(MDIWindowEvent.RESIZE_END, onResizeEndEvent);
if (BrowserCheck.isFirefox() && Capabilities.os.indexOf("Mac") >= 0) {
ffMacWarning.visible = ffMacWarning.includeInLayout = true;
}
resourcesChanged(); resourcesChanged();
} }
@ -470,5 +475,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
mouseOver="btnActualSize.alpha = 1" mouseOver="btnActualSize.alpha = 1"
label="{ btnActualSize.selected ? ResourceUtil.getInstance().getString('bbb.screenshareView.fitToWindow') : ResourceUtil.getInstance().getString('bbb.screenshareView.actualSize') }" label="{ btnActualSize.selected ? ResourceUtil.getInstance().getString('bbb.screenshareView.fitToWindow') : ResourceUtil.getInstance().getString('bbb.screenshareView.actualSize') }"
toolTip="{ btnActualSize.selected ? ResourceUtil.getInstance().getString('bbb.screenshareView.fitToWindow') : ResourceUtil.getInstance().getString('bbb.screenshareView.actualSize') }"/> toolTip="{ btnActualSize.selected ? ResourceUtil.getInstance().getString('bbb.screenshareView.fitToWindow') : ResourceUtil.getInstance().getString('bbb.screenshareView.actualSize') }"/>
<mx:Box id="ffMacWarning"
visible="false"
includeInLayout="false"
width="260"
styleName="lockSettingsHintBoxStyle"
horizontalCenter="0"
top="{VIDEO_HEIGHT_PADDING*2+btnActualSize.height}">
<mx:Text width="100%"
textAlign="center"
styleName="lockSettingHintTextStyle"
text="{ResourceUtil.getInstance().getString('bbb.screenshareView.warning.ffMacWebRTC')}" />
</mx:Box>
</CustomMdiWindow> </CustomMdiWindow>