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

Implement crypto provider and GFE 2.1 compatibility

Browse Source 
Conflicts:
	.classpath
	libs/limelight-common.jar
	src/com/limelight/Limelight.java
	src/com/limelight/binding/PlatformBinding.java
This commit is contained in:
Cameron Gutman
2014-06-15 20:14:51 -07:00
committed by Iwan Timmer
parent 74b8c287c0
commit ef1357477b
5 changed files with 292 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.xmlpull.v1.XmlPullParserException;
import com.limelight.nvstream.http.PairingManager;
/**
* Main class for Limelight-pi
@@ -68,7 +68,7 @@ public class Limelight implements NvConnectionListener {
}
}
conn = new NvConnection(host, this, streamConfig);
conn = new NvConnection(host, this, streamConfig, PlatformBinding.getCryptoProvider());
GamepadMapping mapping = null;
if (mappingFile!=null) {
@@ -102,7 +102,7 @@ public class Limelight implements NvConnectionListener {
* Creates a connection to the host and starts up the stream.
*/
private void startUpFake(StreamConfiguration streamConfig) {
conn = new NvConnection(host, this, streamConfig);
conn = new NvConnection(host, this, streamConfig, PlatformBinding.getCryptoProvider());
conn.start(PlatformBinding.getDeviceName(), null,
VideoDecoderRenderer.FLAG_PREFER_QUALITY,
new FakeAudioRenderer(),
@@ -130,21 +130,27 @@ public class Limelight implements NvConnectionListener {
try {
httpConn = new NvHTTP(InetAddress.getByName(host),
macAddress, PlatformBinding.getDeviceName());
macAddress, PlatformBinding.getDeviceName(), PlatformBinding.getCryptoProvider());
try {
if (httpConn.getPairState()) {
displayError("Pair", "Already paired");
if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
displayError("pair", "Already paired");
} else {
int session = httpConn.getSessionId();
if (session == 0) {
displayError("Pair", "Pairing was declined by the target");
} else {
displayMessage("Pairing was successful");
final String pinStr = PairingManager.generatePinString();
displayMessage("Please enter the following PIN on the target PC: "+pinStr);
PairingManager.PairState pairState = httpConn.pair(pinStr);
if (pairState == PairingManager.PairState.PIN_WRONG) {
displayError("pair", "Incorrect PIN");
}
else if (pairState == PairingManager.PairState.FAILED) {
displayError("pair", "Pairing failed");
}
else if (pairState == PairingManager.PairState.PAIRED) {
displayError("pair", "Paired successfully");
}
}
} catch (IOException e) {
displayError("Pair", e.getMessage());
} catch (XmlPullParserException e) {
} catch (Exception e) {
displayError("Pair", e.getMessage());
}
} catch (UnknownHostException e1) {