moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-04-06 07:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gamepad mapping configurable

Browse Source
This commit is contained in:
Iwan Timmer
2014-01-19 13:59:02 +01:00
parent 44fd2f2fad
commit 74136a6e45
2 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/limelight/Limelight.java
View File

@@ -17,7 +17,6 @@ import java.net.InetAddress;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.xmlpull.v1.XmlPullParserException;
@@ -45,7 +44,7 @@ public class Limelight implements NvConnectionListener {
/*
* Creates a connection to the host and starts up the stream.
*/
private void startUp(StreamConfiguration streamConfig, List<String> inputs) {
private void startUp(StreamConfiguration streamConfig, List<String> inputs, String mappingFile) {
conn = new NvConnection(host, this, streamConfig);
if (inputs.isEmpty()) {
@@ -61,7 +60,16 @@ public class Limelight implements NvConnectionListener {
inputs.add(new File(input, event).getAbsolutePath());
}
GamepadMapping mapping = new GamepadMapping();
GamepadMapping mapping = null;
if (mappingFile!=null) {
try {
mapping = new GamepadMapping(new File(mappingFile));
} catch (IOException e) {
displayError("Mapping", "Can't load gamepad mapping from " + mappingFile);
System.exit(3);
}
} else
mapping = new GamepadMapping();
for (String input:inputs) {
try {
@@ -137,6 +145,7 @@ public class Limelight implements NvConnectionListener {
int resolution = 720;
int refresh = 60;
boolean parse = true;
String mapping = null;
for (int i = 0; i < args.length - 1; i++) {
if (args[i].equals("-input")) {
@@ -147,6 +156,14 @@ public class Limelight implements NvConnectionListener {
System.out.println("Syntax error: input device expected after -input");
System.exit(3);
}
} else if (args[i].equals("-mapping")) {
if (i + 1 < args.length) {
mapping = args[i+1];
i++;
} else {
System.out.println("Syntax error: mapping file expected after -mapping");
System.exit(3);
}
} else if (args[i].equals("-pair")) {
pair = true;
} else if (args[i].equals("-720")) {
@@ -171,6 +188,7 @@ public class Limelight implements NvConnectionListener {
System.out.println("\t-60fps\t\tUse 60fps [default]");
System.out.println("\t-input <device>\tUse <device> as input. Can be used multiple times");
System.out.println("\t\t\t[default uses all devices in /dev/input]");
System.out.println("\t-mapping <file>\tUse <file> as gamepad mapping configuration file");
System.out.println("\t-pair\t\tPair with host");
System.out.println();
System.out.println("Use ctrl-c to exit application");
@@ -182,7 +200,7 @@ public class Limelight implements NvConnectionListener {
Limelight limelight = new Limelight(host);
if (!pair)
limelight.startUp(streamConfig, inputs);
limelight.startUp(streamConfig, inputs, mapping);
else
limelight.pair();
}