moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-06-16 22:01:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change errorCode from long to int to fix 32-bit platforms

Browse Source
This commit is contained in:
Cameron Gutman
2020-02-24 23:24:22 -08:00
parent 902a58bc70
commit a4b86eefe2
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/limelight/Game.java
+2 -2
View File
@@ -1399,7 +1399,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
} }
@Override @Override
public void stageFailed(final String stage, final long errorCode) { public void stageFailed(final String stage, final int errorCode) {
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -1425,7 +1425,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
} }
@Override @Override
public void connectionTerminated(final long errorCode) { public void connectionTerminated(final int errorCode) {
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
app/src/main/java/com/limelight/nvstream/NvConnectionListener.java
+2 -2
View File
@@ -3,10 +3,10 @@ package com.limelight.nvstream;
public interface NvConnectionListener { public interface NvConnectionListener {
void stageStarting(String stage); void stageStarting(String stage);
void stageComplete(String stage); void stageComplete(String stage);
void stageFailed(String stage, long errorCode); void stageFailed(String stage, int errorCode);
void connectionStarted(); void connectionStarted();
void connectionTerminated(long errorCode); void connectionTerminated(int errorCode);
void connectionStatusUpdate(int connectionStatus); void connectionStatusUpdate(int connectionStatus);
void displayMessage(String message); void displayMessage(String message);
app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
+2 -2
View File
@@ -129,7 +129,7 @@ public class MoonBridge {
} }
} }
public static void bridgeClStageFailed(int stage, long errorCode) { public static void bridgeClStageFailed(int stage, int errorCode) {
if (connectionListener != null) { if (connectionListener != null) {
connectionListener.stageFailed(getStageName(stage), errorCode); connectionListener.stageFailed(getStageName(stage), errorCode);
} }
@@ -141,7 +141,7 @@ public class MoonBridge {
} }
} }
public static void bridgeClConnectionTerminated(long errorCode) { public static void bridgeClConnectionTerminated(int errorCode) {
if (connectionListener != null) { if (connectionListener != null) {
connectionListener.connectionTerminated(errorCode); connectionListener.connectionTerminated(errorCode);
} }
app/src/main/jni/moonlight-core/callbacks.c
+5 -5
View File
@@ -87,9 +87,9 @@ Java_com_limelight_nvstream_jni_MoonBridge_init(JNIEnv *env, jclass clazz) {
BridgeArPlaySampleMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArPlaySample", "([S)V"); BridgeArPlaySampleMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArPlaySample", "([S)V");
BridgeClStageStartingMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageStarting", "(I)V"); BridgeClStageStartingMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageStarting", "(I)V");
BridgeClStageCompleteMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageComplete", "(I)V"); BridgeClStageCompleteMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageComplete", "(I)V");
BridgeClStageFailedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageFailed", "(IJ)V"); BridgeClStageFailedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageFailed", "(II)V");
BridgeClConnectionStartedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionStarted", "()V"); BridgeClConnectionStartedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionStarted", "()V");
BridgeClConnectionTerminatedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionTerminated", "(J)V"); BridgeClConnectionTerminatedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionTerminated", "(I)V");
BridgeClRumbleMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClRumble", "(SSS)V"); BridgeClRumbleMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClRumble", "(SSS)V");
BridgeClConnectionStatusUpdateMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionStatusUpdate", "(I)V"); BridgeClConnectionStatusUpdateMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionStatusUpdate", "(I)V");
} }
@@ -311,7 +311,7 @@ void BridgeClStageComplete(int stage) {
(*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClStageCompleteMethod, stage); (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClStageCompleteMethod, stage);
} }
void BridgeClStageFailed(int stage, long errorCode) { void BridgeClStageFailed(int stage, int errorCode) {
JNIEnv* env = GetThreadEnv(); JNIEnv* env = GetThreadEnv();
if ((*env)->ExceptionCheck(env)) { if ((*env)->ExceptionCheck(env)) {
@@ -328,10 +328,10 @@ void BridgeClConnectionStarted(void) {
return; return;
} }
(*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClConnectionStartedMethod, NULL); (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClConnectionStartedMethod);
} }
void BridgeClConnectionTerminated(long errorCode) { void BridgeClConnectionTerminated(int errorCode) {
JNIEnv* env = GetThreadEnv(); JNIEnv* env = GetThreadEnv();
if ((*env)->ExceptionCheck(env)) { if ((*env)->ExceptionCheck(env)) {
app/src/main/jni/moonlight-core/moonlight-common-c
+1 -1
Submodule app/src/main/jni/moonlight-core/moonlight-common-c updated: f5ae5df5d0...2fc278da00