essential-actions

updated audio clip action to not throw NPE when nothing is running on shutdown

Download Browse

obs mother and setprofileaction now work

+13 −10

Author

Debayan Sutradhar (rnayabed) 2021-04-02 20:12

Committer

Debayan Sutradhar (rnayabed) 2021-04-02 20:12

Hash dc949313bce54dd81a041afd59b1025ab5dc5fc6

Parent d1b008f34d242a2a59e7cfc7aa9b92114cbf9316

Reference git #essential-actions/dc949313bce54dd81a041afd59b1025ab5dc5fc6

Modified Files

List

Side by side diff

Inline diff

M obssuite/mother/pom.xml

+1 −1

<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0"

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<groupId>com.stream-pi</groupId>

<artifactId>obssuite_motheraction</artifactId>

<build>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-jar-plugin</artifactId>

<phase>package</phase>

<goals>

</goals>

</execution>

</executions>

</plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-compiler-plugin</artifactId>

</configuration>

</plugin>

</plugins>

</build>

<ActionAPIVersion>1.0.0-SNAPSHOT</ActionAPIVersion>

<UtilVersion>1.0.0-SNAPSHOT</UtilVersion>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>11</maven.compiler.source>

<maven.compiler.target>11</maven.compiler.target>

</properties>

<groupId>com.stream-pi</groupId>

<version>${UtilVersion}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<artifactId>action-api</artifactId>

<version>${ActionAPIVersion}</version>

</dependency>

<groupId>net.twasi</groupId>

<artifactId>obs-websocket-java</artifactId>

<version>${OBSWebsocketJavaVersion}</version>

</dependency>

<groupId>org.eclipse.jetty.websocket</groupId>

<artifactId>websocket-client</artifactId>

</dependency>

<groupId>com.google.code.gson</groupId>

</dependency>

</dependencies>

</project>

M obssuite/mother/src/main/java/module-info.java

+1 −1

module com.stream_pi.obssuite.motheraction

{

requires com.stream_pi.action_api;

requires com.stream_pi.util;

requires transitive obs.websocket.java;

requires transitive org.eclipse.jetty.client;

requires transitive org.eclipse.jetty.websocket.api;

requires transitive org.eclipse.jetty.http;

requires transitive org.eclipse.jetty.util;

requires transitive org.eclipse.jetty.websocket.client;

requires transitive org.eclipse.jetty.websocket.common;

requires transitive org.eclipse.jetty.io;

requires transitive com.google.gson;

exports mother.motherconnection;

provides com.stream_pi.action_api.normalaction.NormalAction with mother.Mother;

provides com.stream_pi.action_api.externalplugin.ExternalPlugin with mother.Mother;

}

M obssuite/mother/src/main/java/mother/Mother.java

+2 −2

package mother;

import com.stream_pi.action_api.actionproperty.property.Property;

import com.stream_pi.action_api.actionproperty.property.Type;

import com.stream_pi.action_api.normalaction.NormalAction;

import com.stream_pi.action_api.externalplugin.NormalAction;

import com.stream_pi.util.version.Version;

import com.stream_pi.util.exception.MinorException;

import mother.motherconnection.MotherConnection;

import javafx.scene.control.Button;

public class Mother extends NormalAction

{

public Mother()

{

setName("OBS Plugin");

setCategory("OBS");

setVisibilityInPluginsPane(false);

setAuthor("rnayabed");

setHelpLink("https://github.com/Stream-Pi/EssentialActions");

setVersion(new Version(1,0,0));

connectDisconnectButton = new Button("Connect");

setButtonBar(connectDisconnectButton);

setServerSettingsButtonBar(connectDisconnectButton);

}

private Button connectDisconnectButton;

@Override

public void initProperties() throws Exception {

Property urlProperty = new Property("url", Type.STRING);

urlProperty.setDisplayName("URL");

urlProperty.setDefaultValueStr("ws://localhost:4444");

urlProperty.setCanBeBlank(false);

Property passwordProperty = new Property("pass", Type.STRING);

passwordProperty.setDisplayName("Password");

Property connectOnStartupProperty = new Property("connect_on_startup", Type.BOOLEAN);

connectOnStartupProperty.setDisplayName("Connect On Startup");

connectOnStartupProperty.setDefaultValueBoolean(false);

addServerProperties(

urlProperty,

passwordProperty,

connectOnStartupProperty

);

}

@Override

public void initAction() throws Exception {

connectDisconnectButton.setOnAction(action->{

try

{

if(MotherConnection.getRemoteController() == null)

{

connect(getURL(), getPassword());

}

else

{

MotherConnection.getRemoteController().disconnect();

}

catch (Exception e)

{

e.printStackTrace();

}

});

if(isConnectOnStartup() && firstRun)

{

connect(getURL(), getPassword());

}

firstRun = false;

}

private boolean firstRun = true;

private String getURL() throws MinorException

{

return getServerProperties().getSingleProperty("url").getStringValue();

}

private String getPassword() throws MinorException

{

return getServerProperties().getSingleProperty("pass").getStringValue();

}

private boolean isConnectOnStartup() throws MinorException

{

return getServerProperties().getSingleProperty("connect_on_startup").getBoolValue();

}

private void connect(String url, String pass)

{

new Thread(

new OBSActionConnectionTask(url, pass, connectDisconnectButton)

).start();

}

@Override

public void onActionClicked() throws Exception {

// TODO Auto-generated method stub

}

@Override

public void onShutDown() throws Exception

{

if(MotherConnection.getRemoteController() != null)

{

MotherConnection.getRemoteController().disconnect();

}

M obssuite/mother/src/main/java/mother/motherconnection/MotherConnection.java

+2 −2

package mother.motherconnection;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

import net.twasi.obsremotejava.OBSRemoteController;

import net.twasi.obsremotejava.callbacks.Callback;

import net.twasi.obsremotejava.requests.ResponseBase;

public class MotherConnection {

public class MotherConnection

{

private static OBSRemoteController obsRemoteController = null;

public static OBSRemoteController getRemoteController() {

return obsRemoteController;

}

public static void setRemoteController(OBSRemoteController obsRemoteController) {

MotherConnection.obsRemoteController = obsRemoteController;

}

public static Callback getDefaultCallBack(String head, String content) {

return new Callback() {

@Override

public void run(ResponseBase response) {

if(response.getStatus().equals("error"))

{

new StreamPiAlert(head, content, StreamPiAlertType.ERROR).show();

}

};

}

M obssuite/setcurrentprofile/src/main/java/module-info.java

+1 −1

module com.stream_pi.obssuite.setcurrentprofileaction

{

requires com.stream_pi.action_api;

requires com.stream_pi.util;

requires com.stream_pi.obssuite.motheraction;

provides com.stream_pi.action_api.normalaction.NormalAction with setcurrentprofile.SetCurrentProfile;

provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setcurrentprofile.SetCurrentProfile;

}

M obssuite/setcurrentprofile/src/main/java/setcurrentprofile/SetCurrentProfile.java

+1 −1

package setcurrentprofile;

import com.stream_pi.action_api.actionproperty.property.Property;

import com.stream_pi.action_api.actionproperty.property.Type;

import com.stream_pi.action_api.normalaction.NormalAction;

import com.stream_pi.action_api.externalplugin.NormalAction;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.version.Version;

import mother.motherconnection.MotherConnection;

import net.twasi.obsremotejava.OBSRemoteController;

public class SetCurrentProfile extends NormalAction

{

public SetCurrentProfile() {

setName("Set Current Profile");

setCategory("OBS");

setVisibilityInServerSettingsPane(false);

setAuthor("rnayabed");

setVersion(new Version(1, 0, 0));

}

@Override

public void initProperties() throws Exception {

// TODO Auto-generated method stub

Property currentProfileProperty = new Property("current_profile", Type.STRING);

currentProfileProperty.setDisplayName("Profile Name");

addClientProperties(currentProfileProperty);

}

@Override

public void initAction() throws Exception {

// TODO Auto-generated method stub

}

@Override

public void onActionClicked() throws Exception {

// TODO Auto-generated method stub

OBSRemoteController controller = MotherConnection.getRemoteController();

if (controller == null) {

new StreamPiAlert("Is OBS Connected?",

"It seems there is no connection to OBS, please connect it in Settings", StreamPiAlertType.WARNING)

.show();

} else {

controller.setCurrentProfile(getClientProperties().getSingleProperty("current_profile").getStringValue(), MotherConnection.getDefaultCallBack(

"Unable to Set Current Profile","Failed to set current profile"

));

}

@Override

public void onShutDown() throws Exception {

// TODO Auto-generated method stub

}

M playaudioclipaction/src/main/java/com/stream_pi/playaudioclipaction/PlayAudioClipAction.java

+5 −2

package com.stream_pi.playaudioclipaction;

import com.stream_pi.action_api.actionproperty.property.ControlType;

import com.stream_pi.action_api.actionproperty.property.FileExtensionFilter;

import com.stream_pi.action_api.actionproperty.property.Property;

import com.stream_pi.action_api.actionproperty.property.Type;

import com.stream_pi.action_api.externalplugin.NormalAction;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.version.Version;

import javafx.application.Platform;

import javafx.scene.media.AudioClip;

import java.io.File;

public class PlayAudioClipAction extends NormalAction {

public PlayAudioClipAction()

{

setName("Play Audio Clip");

setCategory("Essentials");

setAuthor("rnayabed");

setServerButtonGraphic("fas-volume-up");

setHelpLink("https://github.com/Stream-Pi/EssentialActions");

setVersion(new Version(2,0,0));

}

@Override

public void initProperties() throws Exception

{

Property audioFileLocationProperty = new Property("audio_location", Type.STRING);

audioFileLocationProperty.setControlType(ControlType.FILE_PATH);

audioFileLocationProperty.setDisplayName("Audio File Location");

audioFileLocationProperty.setExtensionFilters(

new FileExtensionFilter("MP3","*.mp3"),

new FileExtensionFilter("MP4","*.mp4", "*.m4a", "*.m4v"),

new FileExtensionFilter("WAV","*.wav"),

new FileExtensionFilter("AIFF","*.aif", "*.aiff"),

new FileExtensionFilter("FXM","*.fxm"),

new FileExtensionFilter("FLV","*.flv"),

new FileExtensionFilter("HLS","*.m3u8")

);

addClientProperties(audioFileLocationProperty);

}

public AudioClip mediaPlayer = null;

public String path = null;

@Override

public void onActionClicked() throws Exception

{

Property audioFileLocationProperty = getClientProperties().getSingleProperty("audio_location");

if (audioFileLocationProperty.getStringValue().isBlank())

{

new StreamPiAlert("Media Action", "No file specified", StreamPiAlertType.ERROR).show();

return;

}

if(mediaPlayer != null)

{

if(mediaPlayer.isPlaying())

{

Platform.runLater(mediaPlayer::stop);

return;

}

if(!audioFileLocationProperty.getStringValue().equals(path))

{

path = audioFileLocationProperty.getStringValue();

mediaPlayer = new AudioClip(new File(path).toURI().toString());

}

Platform.runLater(mediaPlayer::play);

}

@Override

public void onShutDown()

{

if(mediaPlayer.isPlaying())

if(mediaPlayer != null)

Platform.runLater(mediaPlayer::stop);

{

if(mediaPlayer.isPlaying())

Platform.runLater(mediaPlayer::stop);

}

Public

essential-actions

Clone or download

updated audio clip action to not throw NPE when nothing is running on shutdown

Modified Files