Author: vdegtyarev
Date: Fri May 16 10:53:12 2014
New Revision: 1595152
URL: http://svn.apache.org/r1595152
Log:
Minor changes for Screen share buttons.
Modified:
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xml
Modified:
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1595152&r1=1595151&r2=1595152&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Fri May 16 10:53:12 2014
@@ -251,9 +251,10 @@ public class CoreScreenShare implements
if (!isConnected) {
instance.connect(host, port, app, this);
- } else {
- setConnectionAsSharingClient();
- }
+ }
+ if (isConnected) {
+ setConnectionAsSharingClient();
+ }
} catch (Exception err) {
log.error("captureScreenStart Exception: ", err);
frame.setStatus("Exception: " + err);
@@ -290,18 +291,18 @@ public class CoreScreenShare implements
}
public void stopStreaming() {
- startStreaming = false;
frame.setSharingStatus(false, !startPublishing &&
!startRecording && !startStreaming);
+ startStreaming = false;
}
public void stopRecording() {
- startRecording = false;
frame.setRecordingStatus(false, !startPublishing &&
!startRecording && !startStreaming);
+ startRecording = false;
}
public void stopPublishing() {
- startPublishing = false;
frame.setPublishingStatus(false, !startPublishing &&
!startRecording && !startStreaming);
+ startPublishing = false;
if (publishClient != null) {
publishClient.disconnect();
publishClient = null;
@@ -660,7 +661,7 @@ public class CoreScreenShare implements
log.debug("createPublishStream result
stream id: {}; name: {}", getCapture().getStreamId(), publishName);
instance.publish(getCapture().getStreamId(), publishName, "live", this);
- log.debug("setup capture thread
spinnerWidth = {}; spinnerHeight = {];", spinnerWidth, spinnerHeight);
+ log.debug("setup capture thread
spinnerWidth = {}; spinnerHeight = {};", spinnerWidth, spinnerHeight);
getCapture().setSendCursor(true);
getCapture().start();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1595152&r1=1595151&r2=1595152&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
Fri May 16 10:53:12 2014
@@ -269,7 +269,7 @@ public class ScreenSharerFrame extends J
if (sharingStarted) {
if (!sharingActionRequested) {
sharingActionRequested = true;
- core.streamingStop();;
+ core.streamingStop();
} else {
logger.warn("Sharing action is
already requested");
}
@@ -598,6 +598,7 @@ public class ScreenSharerFrame extends J
if (status != sharingStarted) {
sharingActionRequested = false;
}
+ logger.debug("sharingActionRequested=" +
sharingActionRequested);
sharingStarted = status;
btnStartStopSharing.setIcon(status ? stopIcon : startIcon);
btnStartStopSharing.setText(status ? stopSharingLabel :
startSharingLabel);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xml?rev=1595152&r1=1595151&r2=1595152&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/logback.xml
Fri May 16 10:53:12 2014
@@ -43,6 +43,9 @@
<logger name="org.apache.openmeetings">
<level value="DEBUG" />
</logger>
+ <logger name="org.red5.server.net.rtmp.codec.RTMPProtocolDecoder">
+ <level value="OFF" />
+ </logger>
<root>
<level value="INFO" />
<appender-ref ref="FLOG2" />
