Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

essential-actions

Clone or download

[OBS] - Added connect/disconnect options from MotherConnection

Download Browse
+55 −9
Debayan Sutradhar (rnayabed) 2021-04-09 22:36
Debayan Sutradhar (rnayabed) 2021-04-09 22:36
d765e22a771e6dc163f593bd1bf5866f27a00b6b
f2aa0f2c975be440ee20a627aabdfcf0e80ab57b
git #essential-actions/d765e22a771e6dc163f593bd1bf5866f27a00b6b

Modified Files

List
Side by side diff
M obssuite/mother/src/main/java/mother/Mother.java
+3 −3
--- 'a/obssuite/mother/src/main/java/mother/Mother.java'
+++ b/obssuite/mother/src/main/java/mother/Mother.java
@@ -110,9 +110,9 @@ public class Mother extends NormalAction
private void connect(String url, String pass)
{
- new Thread(
- new OBSActionConnectionTask(url, pass, connectDisconnectButton)
- ).start();
+ MotherConnection.setPass(pass);
+ MotherConnection.setUrl(url);
+ new OBSActionConnectionTask(connectDisconnectButton, true);
}
@Override
M obssuite/mother/src/main/java/mother/OBSActionConnectionTask.java
+21 −5
--- 'a/obssuite/mother/src/main/java/mother/OBSActionConnectionTask.java'
+++ b/obssuite/mother/src/main/java/mother/OBSActionConnectionTask.java
@@ -15,15 +15,25 @@ public class OBSActionConnectionTask ext
String url, pass;
Button connectDisconnectButton;
- public OBSActionConnectionTask(String url, String pass, Button connectDisconnectButton)
+ public OBSActionConnectionTask(Button connectDisconnectButton,
+ boolean runAsync)
{
- this.url = url;
- this.pass = pass;
- this.connectDisconnectButton = connectDisconnectButton;
+ this.url = MotherConnection.getUrl();
+ this.pass = MotherConnection.getPass();
+ this.connectDisconnectButton = connectDisconnectButton;
+
+ if(runAsync)
+ {
+ new Thread(this).start();
+ }
+ else
+ {
+ call();
+ }
}
@Override
- protected Void call() throws Exception
+ protected Void call()
{
try
{
@@ -86,11 +96,17 @@ public class OBSActionConnectionTask ext
private void setConnectDisconnectButtonText(String text)
{
+ if(connectDisconnectButton == null)
+ return;
+
Platform.runLater(()-> connectDisconnectButton.setText(text));
}
private void setConnectDisconnectButtonDisable(boolean disable)
{
+ if(connectDisconnectButton == null)
+ return;
+
Platform.runLater(()-> connectDisconnectButton.setDisable(disable));
}
M obssuite/mother/src/main/java/mother/motherconnection/MotherConnection.java
+31 −1
--- 'a/obssuite/mother/src/main/java/mother/motherconnection/MotherConnection.java'
+++ b/obssuite/mother/src/main/java/mother/motherconnection/MotherConnection.java
@@ -3,14 +3,44 @@ package mother.motherconnection;
import com.stream_pi.util.alert.StreamPiAlert;
import com.stream_pi.util.alert.StreamPiAlertType;
+import mother.OBSActionConnectionTask;
import net.twasi.obsremotejava.OBSRemoteController;
import net.twasi.obsremotejava.callbacks.Callback;
-import net.twasi.obsremotejava.requests.ResponseBase;
public class MotherConnection
{
private static OBSRemoteController obsRemoteController = null;
+ private static String url = null;
+ private static String pass = null;
+
+ public static void setUrl(String url) {
+ MotherConnection.url = url;
+ }
+
+ public static void setPass(String pass) {
+ MotherConnection.pass = pass;
+ }
+
+ public static String getUrl() {
+ return url;
+ }
+
+ public static String getPass() {
+ return pass;
+ }
+
+ public void connect()
+ {
+ connect(true);
+ }
+
+ public void connect(boolean runAsync)
+ {
+ new OBSActionConnectionTask( null, runAsync);
+ }
+
+
public static OBSRemoteController getRemoteController()
{
return obsRemoteController;