?[package:][type:]na
public static final int editText1=0x7f080002;
public static final int hostTextView=0x7f080000;
public static final int statusButton=0x7f080001;
- public static final int videoView=0x7f080003;
}
public static final class layout {
public static final int activity_connection=0x7f030000;
@@ -113,7 +112,7 @@ or to a theme attribute in the form "?[package:][type:]na
Must be a reference to another resource, in the form "@[+][package:]type:name"
or to a theme attribute in the form "?[package:][type:]name".
- @attr name com.limelight:buttonBarButtonStyle
+ @attr name android:buttonBarButtonStyle
*/
public static final int ButtonBarContainerTheme_buttonBarButtonStyle = 1;
/**
@@ -123,7 +122,7 @@ or to a theme attribute in the form "?[package:][type:]na
Must be a reference to another resource, in the form "@[+][package:]type:name"
or to a theme attribute in the form "?[package:][type:]name".
- @attr name com.limelight:buttonBarStyle
+ @attr name android:buttonBarStyle
*/
public static final int ButtonBarContainerTheme_buttonBarStyle = 0;
};
diff --git a/res/layout/activity_connection.xml b/res/layout/activity_connection.xml
index a291bb75..b2b265b8 100644
--- a/res/layout/activity_connection.xml
+++ b/res/layout/activity_connection.xml
@@ -17,7 +17,7 @@
android:layout_marginTop="60dp"
android:ems="10"
android:hint="255.255.255.255"
- android:textSize="100dp" >
+ android:textSize="50dp" >
());
+ }
+
+ public void start()
+ {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ host = InetAddress.getByName(host).toString().substring(1);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ displayToast(e.getMessage());
+ return;
+ }
+
+ try {
+ startSteamBigPicture();
+ performHandshake();
+ beginControlStream();
+ startController();
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ displayToast(e.getMessage());
+ } catch (IOException e) {
+ e.printStackTrace();
+ displayToast(e.getMessage());
+ }
+ }
+ }).start();
}
- private void delay(int ms)
+ public void sendControllerInput(final short buttonFlags,
+ final byte leftTrigger, final byte rightTrigger,
+ final short leftStick, final short rightStick)
{
- try {
- Thread.sleep(ms);
- } catch (InterruptedException e) {
+ threadPool.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ inputStream.sendControllerInput(buttonFlags, leftTrigger, rightTrigger, leftStick, rightStick);
+ } catch (IOException e) {
+ e.printStackTrace();
+ displayToast(e.getMessage());
+ }
+ }
+ });
+ }
+
+ private void displayToast(final String message)
+ {
+ activity.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ Toast.makeText(activity, message, Toast.LENGTH_LONG).show();
+ }
+ });
+ }
+
+ private void startSteamBigPicture() throws XmlPullParserException, IOException
+ {
+ NvHttp h = new NvHttp(host, "b0:ee:45:57:5d:5f");
+
+ if (!h.getPairState())
+ {
+ displayToast("Device not paired with computer");
return;
}
+
+ int sessionId = h.getSessionId();
+ int appId = h.getSteamAppId(sessionId);
+
+ System.out.println("Starting game session");
+ int gameSession = h.launchApp(sessionId, appId);
+ System.out.println("Started game session: "+gameSession);
+ }
+
+ private void performHandshake() throws UnknownHostException, IOException
+ {
+ System.out.println("Starting handshake");
+ NvHandshake.performHandshake(host);
+ System.out.println("Handshake complete");
+ }
+
+ private void beginControlStream() throws UnknownHostException, IOException
+ {
+ controlStream = new NvControl(host);
+
+ System.out.println("Starting control");
+ controlStream.beginControl();
+ }
+
+ private void startController() throws UnknownHostException, IOException
+ {
+ System.out.println("Starting input");
+ inputStream = new NvController(host);
}
public void doShit() throws XmlPullParserException, IOException
{
- NvHttp h = new NvHttp(host, "b0:ee:45:57:5d:5f");
-
- System.out.println("Begin Shield Action");
- System.out.println(h.getAppVersion());
- System.out.println(h.getPairState());
-
- int sessionId = h.getSessionId();
- System.out.println("Session ID: "+sessionId);
- int appId = h.getSteamAppId(sessionId);
- System.out.println("Steam app ID: "+appId);
- int gameSession = h.launchApp(sessionId, appId);
- System.out.println("Started game session: "+gameSession);
-
- System.out.println("Starting handshake");
- NvHandshake.performHandshake(host);
- System.out.println("Handshake complete");
-
- NvControl nvC = new NvControl(host);
-
- System.out.println("Starting control");
- nvC.beginControl();
-
- System.out.println("Startup controller");
- NvController controller = new NvController(host);
-
- // Wait 3 seconds to start input
- delay(3000);
-
- System.out.println("Beginning controller input");
- controller.sendLeftButton();
- delay(100);
- controller.clearButtons();
- delay(250);
- controller.sendRightButton();
- delay(100);
- controller.clearButtons();
- delay(250);
- controller.sendRightButton();
- delay(100);
- controller.clearButtons();
- delay(250);
- controller.sendRightButton();
- delay(100);
- controller.clearButtons();
- delay(250);
- controller.sendLeftButton();
- delay(100);
- controller.clearButtons();
-
new NvAudioStream().start();
new NvVideoStream().start(host);
}
diff --git a/src/com/limelight/nvstream/input/NvController.java b/src/com/limelight/nvstream/input/NvController.java
index 1b63aa3d..dbef5c13 100644
--- a/src/com/limelight/nvstream/input/NvController.java
+++ b/src/com/limelight/nvstream/input/NvController.java
@@ -4,9 +4,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
public class NvController {
@@ -21,21 +18,9 @@ public class NvController {
out = s.getOutputStream();
}
- // Example
- public void sendLeftButton() throws IOException
+ public void sendControllerInput(short buttonFlags, byte leftTrigger, byte rightTrigger, short leftStick, short rightStick) throws IOException
{
- out.write(new NvInputPacket(NvInputPacket.LEFT_FLAG, (byte)0, (byte)0, (short)0, (short)0).toWire());
- }
-
- // Example
- public void sendRightButton() throws IOException
- {
- out.write(new NvInputPacket(NvInputPacket.RIGHT_FLAG, (byte)0, (byte)0, (short)0, (short)0).toWire());
- }
-
- // Example
- public void clearButtons() throws IOException
- {
- out.write(new NvInputPacket((short)0, (byte)0, (byte)0, (short)0, (short)0).toWire());
+ out.write(new NvInputPacket(buttonFlags, leftTrigger, rightTrigger, leftStick, rightStick).toWire());
+ out.flush();
}
}