From c244d3721a9e1ae3be0cb2883edf78f529e1c542 Mon Sep 17 00:00:00 2001 From: Iwan Timmer Date: Thu, 16 Jan 2014 11:07:12 +0100 Subject: [PATCH] Use all input device when none is specified --- src/com/limelight/Limelight.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/com/limelight/Limelight.java b/src/com/limelight/Limelight.java index 2e8aec2..4043429 100644 --- a/src/com/limelight/Limelight.java +++ b/src/com/limelight/Limelight.java @@ -9,11 +9,14 @@ import com.limelight.nvstream.NvConnectionListener; import com.limelight.nvstream.StreamConfiguration; import com.limelight.nvstream.av.video.VideoDecoderRenderer; import com.limelight.nvstream.http.NvHTTP; +import java.io.File; import java.io.FileNotFoundException; +import java.io.FilenameFilter; 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; @@ -43,6 +46,16 @@ public class Limelight implements NvConnectionListener { */ private void startUp(StreamConfiguration streamConfig, List inputs) { conn = new NvConnection(host, this, streamConfig); + + if (inputs.isEmpty()) { + File input = new File("/dev/input"); + inputs.addAll(Arrays.asList(input.list(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.startsWith("event"); + } + }))); + } for (String input:inputs) { try { @@ -148,9 +161,10 @@ public class Limelight implements NvConnectionListener { System.out.println("Usage: java -jar limelight-pi.jar [options] host"); System.out.println("\t-720\t\tUse 1280x720 resolution [default]"); System.out.println("\t-1080\t\tUse 1920x1080 resolution"); - System.out.println("\t-30fps\t\tUse 30fps [default]"); - System.out.println("\t-60fps\t\tUse 60fps"); + System.out.println("\t-30fps\t\tUse 30fps"); + System.out.println("\t-60fps\t\tUse 60fps [default]"); System.out.println("\t-input \tUse as input. Can be used multiple times"); + System.out.println("\t\t\t[default uses all devices in /dev/input]"); System.out.println("\t-pair\t\tPair with host"); System.out.println(); System.out.println("Use ctrl-c to exit application");