You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2014/05/16 12:23:48 UTC
svn commit: r1595149 - in /openmeetings/branches/3.0.x/src/screenshare:
java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
resources/logback.xml
Author: vdegtyarev
Date: Fri May 16 10:23:48 2014
New Revision: 1595149
URL: http://svn.apache.org/r1595149
Log:
Minor changes for Screen share buttons.
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
openmeetings/branches/3.0.x/src/screenshare/resources/logback.xml
Modified: openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1595149&r1=1595148&r2=1595149&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java (original)
+++ openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java Fri May 16 10:23:48 2014
@@ -240,7 +240,8 @@ public class CoreScreenShare implements
if (!isConnected) {
instance.connect(host, port, app, this);
- } else {
+ }
+ if (isConnected) {
setConnectionAsSharingClient();
}
} catch (Exception err) {
@@ -279,18 +280,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;
@@ -645,7 +646,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/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1595149&r1=1595148&r2=1595149&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java (original)
+++ openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java Fri May 16 10:23:48 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/branches/3.0.x/src/screenshare/resources/logback.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/resources/logback.xml?rev=1595149&r1=1595148&r2=1595149&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare/resources/logback.xml (original)
+++ openmeetings/branches/3.0.x/src/screenshare/resources/logback.xml Fri May 16 10:23:48 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" />