essential-actions

Added support for windows media keys

Download Browse

+155 −47

Author

Debayan Sutradhar (rnayabed) 2021-02-19 23:03

Committer

Debayan Sutradhar (rnayabed) 2021-02-19 23:03

Hash 776036f6135aa66d1bead2a3be34fafb2ff4063d

Parent 1b9b9e33f1a8232b2787721a38c140ec883457bf

Reference git #essential-actions/776036f6135aa66d1bead2a3be34fafb2ff4063d

Modified Files

List

Side by side diff

Inline diff

M DemoCustomNormalAction/DemoCustomNormalAction.iml

+4 −4

--- 'a/DemoCustomNormalAction/DemoCustomNormalAction.iml'

+++ b/DemoCustomNormalAction/DemoCustomNormalAction.iml

@@ -9,16 +9,16 @@

</content>

- <orderEntry type="library" name="Maven: com.stream_pi:util:1.0.0" level="project" />

- <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-fontawesome5-pack:11.5.0" level="project" />

- <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-javafx:11.5.0" level="project" />

- <orderEntry type="library" name="Maven: com.stream_pi:action_api:1.0.0" level="project" />

+ <orderEntry type="library" name="Maven: com.stream-pi:action-api:1.0.0-SNAPSHOT" level="project" />

+ <orderEntry type="library" name="Maven: com.stream-pi:util:1.0.0-SNAPSHOT" level="project" />

+ <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-fontawesome5-pack:11.5.0" level="project" />

+ <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-javafx:11.5.0" level="project" />

</component>

M DemoCustomNormalAction/pom.xml

+4 −10

--- 'a/DemoCustomNormalAction/pom.xml'

+++ b/DemoCustomNormalAction/pom.xml

@@ -4,7 +4,7 @@

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

- <groupId>com.StreamPi</groupId>

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

<artifactId>DemoCustomNormalAction</artifactId>

@@ -37,8 +37,7 @@

</build>

- <ActionAPIVersion>1.0.0</ActionAPIVersion>

- <UtilVersion>1.0.0</UtilVersion>

+ <ActionAPIVersion>1.0.0-SNAPSHOT</ActionAPIVersion>

@@ -48,11 +47,6 @@

</properties>

- <dependency>

- <groupId>com.stream_pi</groupId>

- <artifactId>util</artifactId>

- <version>${UtilVersion}</version>

- </dependency>

<groupId>org.openjfx</groupId>

@@ -75,8 +69,8 @@

- <groupId>com.stream_pi</groupId>

- <artifactId>action_api</artifactId>

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

+ <artifactId>action-api</artifactId>

<version>${ActionAPIVersion}</version>

</dependency>

M DemoCustomNormalAction/src/main/java/com/stream_pi/democustomnormalaction/DemoCustomNormalAction.java

+4 −4

--- 'a/DemoCustomNormalAction/src/main/java/com/stream_pi/democustomnormalaction/DemoCustomNormalAction.java'

+++ b/DemoCustomNormalAction/src/main/java/com/stream_pi/democustomnormalaction/DemoCustomNormalAction.java

@@ -1,9 +1,9 @@

package com.stream_pi.democustomnormalaction;

-import com.stream_pi.actionapi.actionproperty.property.ControlType;

-import com.stream_pi.actionapi.actionproperty.property.Property;

-import com.stream_pi.actionapi.actionproperty.property.Type;

-import com.stream_pi.actionapi.normalaction.NormalAction;

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

+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.util.version.Version;

import java.util.ArrayList;

M DemoCustomNormalAction/src/main/java/module-info.java

+2 −5

--- 'a/DemoCustomNormalAction/src/main/java/module-info.java'

+++ b/DemoCustomNormalAction/src/main/java/module-info.java

@@ -1,8 +1,5 @@

module com.stream_pi.democustomnormalaction{

- requires com.stream_pi.actionapi;

- requires com.stream_pi.util;

+ requires com.stream_pi.action_api;

requires org.kordamp.ikonli.javafx;

- provides com.stream_pi.actionapi.normalaction.NormalAction with com.stream_pi.democustomnormalaction.DemoCustomNormalAction;

+ provides com.stream_pi.action_api.normalaction.NormalAction with com.stream_pi.democustomnormalaction.DemoCustomNormalAction;

}

\ No newline at end of file

M PreBuiltPlugins/hotkeyaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/hotkeyaction.jar' and b/PreBuiltPlugins/hotkeyaction.jar differ

M PreBuiltPlugins/mediakeyaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/mediakeyaction.jar' and b/PreBuiltPlugins/mediakeyaction.jar differ

M PreBuiltPlugins/obssuite_motheraction.jar

+- −-

Binary files 'a/PreBuiltPlugins/obssuite_motheraction.jar' and b/PreBuiltPlugins/obssuite_motheraction.jar differ

M PreBuiltPlugins/obssuite_setcurrentprofileaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/obssuite_setcurrentprofileaction.jar' and b/PreBuiltPlugins/obssuite_setcurrentprofileaction.jar differ

M PreBuiltPlugins/obssuite_setcurrentsceneaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/obssuite_setcurrentsceneaction.jar' and b/PreBuiltPlugins/obssuite_setcurrentsceneaction.jar differ

M PreBuiltPlugins/obssuite_setcurrenttransitionaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/obssuite_setcurrenttransitionaction.jar' and b/PreBuiltPlugins/obssuite_setcurrenttransitionaction.jar differ

M PreBuiltPlugins/obssuite_setmuteaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/obssuite_setmuteaction.jar' and b/PreBuiltPlugins/obssuite_setmuteaction.jar differ

M PreBuiltPlugins/obssuite_setpreviewsceneaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/obssuite_setpreviewsceneaction.jar' and b/PreBuiltPlugins/obssuite_setpreviewsceneaction.jar differ

M PreBuiltPlugins/obssuite_setrecordingaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/obssuite_setrecordingaction.jar' and b/PreBuiltPlugins/obssuite_setrecordingaction.jar differ

M PreBuiltPlugins/obssuite_setreplaybufferaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/obssuite_setreplaybufferaction.jar' and b/PreBuiltPlugins/obssuite_setreplaybufferaction.jar differ

M PreBuiltPlugins/obssuite_setstreamingaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/obssuite_setstreamingaction.jar' and b/PreBuiltPlugins/obssuite_setstreamingaction.jar differ

M PreBuiltPlugins/obssuite_setstudiomodeaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/obssuite_setstudiomodeaction.jar' and b/PreBuiltPlugins/obssuite_setstudiomodeaction.jar differ

M PreBuiltPlugins/obssuite_setvolumeaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/obssuite_setvolumeaction.jar' and b/PreBuiltPlugins/obssuite_setvolumeaction.jar differ

M PreBuiltPlugins/playaudioclipaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/playaudioclipaction.jar' and b/PreBuiltPlugins/playaudioclipaction.jar differ

M PreBuiltPlugins/runcommandaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/runcommandaction.jar' and b/PreBuiltPlugins/runcommandaction.jar differ

M PreBuiltPlugins/textblockaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/textblockaction.jar' and b/PreBuiltPlugins/textblockaction.jar differ

M PreBuiltPlugins/twitteraction.jar

+- −-

Binary files 'a/PreBuiltPlugins/twitteraction.jar' and b/PreBuiltPlugins/twitteraction.jar differ

M PreBuiltPlugins/websiteaction.jar

+- −-

Binary files 'a/PreBuiltPlugins/websiteaction.jar' and b/PreBuiltPlugins/websiteaction.jar differ

M hotkeyaction/src/main/java/com/stream_pi/hotkeyaction/HotkeyAction.java

+6 −4

--- 'a/hotkeyaction/src/main/java/com/stream_pi/hotkeyaction/HotkeyAction.java'

+++ b/hotkeyaction/src/main/java/com/stream_pi/hotkeyaction/HotkeyAction.java

@@ -5,6 +5,7 @@ import com.stream_pi.action_api.actionpr

import com.stream_pi.action_api.normalaction.NormalAction;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

+import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.version.Version;

import javafx.application.Platform;

@@ -50,8 +51,7 @@ public class HotkeyAction extends Normal

if(keyCombination.getStringValue().isBlank())

{

- new StreamPiAlert("Hotkey Action", "No key specified", StreamPiAlertType.ERROR).show();

- return;

+ throw new MinorException("No key specified");

}

press(keyCombination.getStringValue()

@@ -79,7 +79,8 @@ public class HotkeyAction extends Normal

}

- private void releaseCharacters(ArrayList<KeyCode> chars) throws InterruptedException {

+ private void releaseCharacters(ArrayList<KeyCode> chars) throws InterruptedException

+ {

for(KeyCode c : chars)

{

release(c);

@@ -87,7 +88,8 @@ public class HotkeyAction extends Normal

}

- public KeyCode getKeyCodeValue(String character) {

+ public KeyCode getKeyCodeValue(String character) throws IllegalArgumentException

+ {

switch (character) {

case "A": return A;

case "B": return B;

M mediakeyaction/src/main/java/com/stream_pi/mediakeyaction/MediaKeyAction.java

+60 −4

--- 'a/mediakeyaction/src/main/java/com/stream_pi/mediakeyaction/MediaKeyAction.java'

+++ b/mediakeyaction/src/main/java/com/stream_pi/mediakeyaction/MediaKeyAction.java

@@ -5,8 +5,10 @@ import com.stream_pi.action_api.actionpr

import com.stream_pi.action_api.normalaction.NormalAction;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

+import com.stream_pi.util.platform.Platform;

import com.stream_pi.util.version.Version;

+import java.io.*;

import java.util.List;

public class MediaKeyAction extends NormalAction

@@ -37,6 +39,30 @@ public class MediaKeyAction extends Norm

@Override

public void initAction() throws Exception {

+ if(getServerConnection().getPlatform() == Platform.WINDOWS)

+ extractKeyEXEToTmpDirectory();

+ }

+ private static String absolutePathToExe;

+ private void extractKeyEXEToTmpDirectory() throws Exception

+ {

+ String tmpDirectory = System.getProperty("java.io.tmpdir");

+ InputStream is = getClass().getResource("key.exe").openStream();

+ absolutePathToExe = tmpDirectory+"/key.exe";

+ File file = new File(absolutePathToExe);

+ file.deleteOnExit();

+ OutputStream os = new FileOutputStream(file);

+ byte[] b = new byte[2048];

+ int length;

+ while ((length = is.read(b)) != -1) {

+ os.write(b, 0, length);

+ }

+ is.close();

+ os.close();

}

@Override

@@ -46,10 +72,13 @@ public class MediaKeyAction extends Norm

switch(getServerConnection().getPlatform())

{

- case LINUX :

- case LINUX_RPI :

+ case LINUX :

linuxHandler(state);

break;

+ case WINDOWS:

+ windowsHandler(state);

+ break;

default:

othersHandler();

@@ -57,8 +86,8 @@ public class MediaKeyAction extends Norm

}

@Override

- public void onShutDown() throws Exception {

- // TODO Auto-generated method stub

+ public void onShutDown() throws Exception

+ {

}

@@ -95,6 +124,33 @@ public class MediaKeyAction extends Norm

}

+ private void windowsHandler(int state) throws Exception

+ {

+ try

+ {

+ switch(state)

+ {

+ case 0: runCommand(absolutePathToExe+" 0xB3"); break;

+ case 1: runCommand(absolutePathToExe+" 0xB1"); break;

+ case 2: runCommand(absolutePathToExe+" 0xB0"); break;

+ case 3: runCommand(absolutePathToExe+" 0xAF"); break;

+ case 4: runCommand(absolutePathToExe+" 0xAE"); break;

+ case 5: runCommand(absolutePathToExe+" 0xAD"); break;

+ case 6: runCommand(absolutePathToExe+" 0xB2"); break;

+ }

+ catch (Exception e)

+ {

+ e.printStackTrace();

+ new StreamPiAlert("Uh Oh!",

+ "Internal Error occured. Check logs, stacktrace. Report to us.",

+ StreamPiAlertType.ERROR

+ ).show();

+ }

private void othersHandler()

{

new StreamPiAlert("Uh Oh!",

A mediakeyaction/src/main/java/com/stream_pi/mediakeyaction/key.c

+61 −0

--- /dev/null

+++ b/mediakeyaction/src/main/java/com/stream_pi/mediakeyaction/key.c

@@ -0,0 +1,61 @@

+//

+// key.c - Pauses, then simulates a key press

+//

+// Written by Ted Burke - last updated 3-9-2014

+// Modified by Debayan Sutradhar (rnayabed) to use multiple keystrokes - 19th February 2021

+//

+// To compile with MinGW:

+//

+// gcc -o keystroke.exe keystroke.c

+//

+// To run the program:

+//

+// keystroke.exe

+//

+// ...then switch to e.g. a Notepad window and wait

+// 5 seconds for the A key to be magically pressed.

+//

+// Because the SendInput function is only supported in

+// Windows 2000 and later, WINVER needs to be set as

+// follows so that SendInput gets defined when windows.h

+// is included below.

+#define WINVER 0x0500

+#include <windows.h>

+#include <stdio.h>

+#include <stdlib.h>

+#include <string.h>

+int main(int argc, char *argv[])

+ // This structure will be used to create the keyboard

+ // input event.

+ INPUT ip;

+ // Pause for 5 seconds.

+ //Sleep(5000);

+ // Set up a generic keyboard event.

+ ip.type = INPUT_KEYBOARD;

+ ip.ki.wScan = 0;// DirectInput key scancode for the "A" key

+ ip.ki.time = 0;

+ ip.ki.dwExtraInfo = 0;

+ // read a hex string and turn it into a value

+ //virtual key code

+ int vkc;

+ sscanf(argv[1], "%x", &vkc);

+ // Press the key (using scancode to specify which key)

+ ip.ki.wVk = vkc;

+ ip.ki.dwFlags = 0;

+ SendInput(1, &ip, sizeof(INPUT));

+ // Release the key (again, using scancode to specify which key)

+ ip.ki.dwFlags = KEYEVENTF_KEYUP | KEYEVENTF_SCANCODE;

+ SendInput(1, &ip, sizeof(INPUT));

+ // Exit normally

+ return 0;

\ No newline at end of file

A mediakeyaction/src/main/resources/com/stream_pi/mediakeyaction/key.exe

+- −-

Binary files /dev/null and b/mediakeyaction/src/main/resources/com/stream_pi/mediakeyaction/key.exe differ

M obssuite/mother/OBSSuite-MotherAction.iml

+8 −8

--- 'a/obssuite/mother/OBSSuite-MotherAction.iml'

+++ b/obssuite/mother/OBSSuite-MotherAction.iml

@@ -10,15 +10,15 @@

- <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-fontawesome5-pack:11.5.0" level="project" />

- <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-core:11.5.0" level="project" />

- <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:16-ea+6" level="project" />

- <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:linux:16-ea+6" level="project" />

- <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:16-ea+6" level="project" />

- <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:linux:16-ea+6" level="project" />

- <orderEntry type="library" name="Maven: org.openjfx:javafx-base:16-ea+6" level="project" />

- <orderEntry type="library" name="Maven: org.openjfx:javafx-base:linux:16-ea+6" level="project" />

+ <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:16-ea+7" level="project" />

+ <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:linux:16-ea+7" level="project" />

+ <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:16-ea+7" level="project" />

+ <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:linux:16-ea+7" level="project" />

+ <orderEntry type="library" name="Maven: org.openjfx:javafx-base:16-ea+7" level="project" />

+ <orderEntry type="library" name="Maven: org.openjfx:javafx-base:linux:16-ea+7" level="project" />

+ <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-core:11.5.0" level="project" />

+ <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-fontawesome5-pack:11.5.0" level="project" />

M obssuite/mother/pom.xml

+0 −1

--- 'a/obssuite/mother/pom.xml'

+++ b/obssuite/mother/pom.xml

@@ -64,7 +64,6 @@

<groupId>net.twasi</groupId>

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

<version>${OBSWebsocketJavaVersion}</version>

</dependency>

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

+0 −1

--- 'a/obssuite/mother/src/main/java/module-info.java'

+++ b/obssuite/mother/src/main/java/module-info.java

@@ -13,7 +13,6 @@ module com.stream_pi.obssuite.motheracti

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;

M obssuite/setvolume/.gitignore

+1 −1

--- 'a/obssuite/setvolume/.gitignore'

+++ b/obssuite/setvolume/.gitignore

@@ -1,6 +1,6 @@

.idea/

target/

+OBSSuite-SetVolumeAction.iml

.classpath

.factorypath

.project

M obssuite/setvolume/OBSSuite-SetVolumeAction.iml

+5 −5

--- 'a/obssuite/setvolume/OBSSuite-SetVolumeAction.iml'

+++ b/obssuite/setvolume/OBSSuite-SetVolumeAction.iml

@@ -9,18 +9,18 @@

</content>

- <orderEntry type="library" name="Maven: com.stream_pi:util:1.0.0" level="project" />

+ <orderEntry type="library" name="Maven: com.stream-pi:util:1.0.0-SNAPSHOT" level="project" />

+ <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:16-ea+6" level="project" />

+ <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:linux:16-ea+6" level="project" />

- <orderEntry type="library" name="Maven: com.stream_pi:actionapi:1.0.0" level="project" />

- <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:15" level="project" />

- <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:linux:15" level="project" />

- <orderEntry type="library" name="Maven: com.stream_pi:obssuite_motheraction:1.0.0" level="project" />

+ <orderEntry type="library" name="Maven: com.stream-pi:action-api:1.0.0-SNAPSHOT" level="project" />

+ <orderEntry type="library" name="Maven: com.stream-pi:obssuite_motheraction:1.0.0" level="project" />

Public

essential-actions

Clone or download

Added support for windows media keys

Modified Files