You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/05/18 11:31:36 UTC
svn commit: r1744393 - in /openmeetings/application:
branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/
branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/
trunk/ope...
Author: solomax
Date: Wed May 18 11:31:35 2016
New Revision: 1744393
URL: http://svn.apache.org/viewvc?rev=1744393&view=rev
Log:
[OPENMEETINGS-1358] code clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1744393&r1=1744392&r2=1744393&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java Wed May 18 11:31:35 2016
@@ -19,7 +19,6 @@
package org.apache.openmeetings.screen.webstart;
import org.red5.client.net.rtmps.RTMPSClient;
-import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.net.ICommand;
import org.red5.server.net.rtmp.Channel;
import org.red5.server.net.rtmp.RTMPConnection;
@@ -33,18 +32,10 @@ public class RTMPSScreenShare extends RT
private final CoreScreenShare core;
public RTMPSScreenShare(CoreScreenShare core) {
+ protocol = "rtmps"; //FIXME TODO need to be removed after fix in red5
this.core = core;
};
- @Override
- public void connect(String server, int port, String application, IPendingServiceCallback connectCallback) {
- try { //FIXME need to be removed
- super.connect(server, port, application, connectCallback);
- } catch (NullPointerException npe) {
- //no op, since RTMPSClient throws NPE
- }
- }
-
// ------------------------------------------------------------------------
//
// Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1744393&r1=1744392&r2=1744393&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java Wed May 18 11:31:35 2016
@@ -19,7 +19,6 @@
package org.apache.openmeetings.screen.webstart;
import org.red5.client.net.rtmps.RTMPSClient;
-import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.net.ICommand;
import org.red5.server.net.rtmp.Channel;
import org.red5.server.net.rtmp.RTMPConnection;
@@ -33,18 +32,10 @@ public class RTMPSScreenShare extends RT
private final CoreScreenShare core;
public RTMPSScreenShare(CoreScreenShare core) {
+ protocol = "rtmps"; //FIXME TODO need to be removed after fix in red5
this.core = core;
};
- @Override
- public void connect(String server, int port, String application, IPendingServiceCallback connectCallback) {
- try { //FIXME need to be removed
- super.connect(server, port, application, connectCallback);
- } catch (NullPointerException npe) {
- //no op, since RTMPSClient throws NPE
- }
- }
-
// ------------------------------------------------------------------------
//
// Override
Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1744393&r1=1744392&r2=1744393&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java Wed May 18 11:31:35 2016
@@ -19,7 +19,6 @@
package org.apache.openmeetings.screen.webstart;
import org.red5.client.net.rtmps.RTMPSClient;
-import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.net.ICommand;
import org.red5.server.net.rtmp.Channel;
import org.red5.server.net.rtmp.RTMPConnection;
@@ -33,18 +32,10 @@ public class RTMPSScreenShare extends RT
private final CoreScreenShare core;
public RTMPSScreenShare(CoreScreenShare core) {
+ protocol = "rtmps"; //FIXME TODO need to be removed after fix in red5
this.core = core;
};
- @Override
- public void connect(String server, int port, String application, IPendingServiceCallback connectCallback) {
- try { //FIXME need to be removed
- super.connect(server, port, application, connectCallback);
- } catch (NullPointerException npe) {
- //no op, since RTMPSClient throws NPE
- }
- }
-
// ------------------------------------------------------------------------
//
// Override