moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-21 12:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a friendly error message when no video traffic is received

Browse Source
This commit is contained in:
Cameron Gutman 2020-05-01 21:54:26 -07:00
parent ce9e91153e
commit 15aa7ecc2e
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/limelight/Game.java
View File

@ -1538,9 +1538,21 @@ public class Game extends Activity implements SurfaceHolder.Callback,
// Display the error dialog if it was an unexpected termination. // Display the error dialog if it was an unexpected termination.
// Otherwise, just finish the activity immediately. // Otherwise, just finish the activity immediately.
if (errorCode != 0) { if (errorCode != MoonBridge.ML_ERROR_GRACEFUL_TERMINATION) {
String message;
switch (errorCode) {
case MoonBridge.ML_ERROR_NO_VIDEO_TRAFFIC:
message = getResources().getString(R.string.no_video_received_error);
break;
default:
message = getResources().getString(R.string.conn_terminated_msg);
break;
}
Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_terminated_title), Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_terminated_title),
getResources().getString(R.string.conn_terminated_msg), true); message, true);
} }
else { else {
finish(); finish();

3
app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
View File

@ -33,6 +33,9 @@ public class MoonBridge {
public static final int CONN_STATUS_OKAY = 0; public static final int CONN_STATUS_OKAY = 0;
public static final int CONN_STATUS_POOR = 1; public static final int CONN_STATUS_POOR = 1;
public static final int ML_ERROR_GRACEFUL_TERMINATION = 0;
public static final int ML_ERROR_NO_VIDEO_TRAFFIC = -100;
private static AudioRenderer audioRenderer; private static AudioRenderer audioRenderer;
private static VideoDecoderRenderer videoRenderer; private static VideoDecoderRenderer videoRenderer;
private static NvConnectionListener connectionListener; private static NvConnectionListener connectionListener;

2
app/src/main/jni/moonlight-core/moonlight-common-c

@ -1 +1 @@
Subproject commit 247b1fe0e32d80ce02ede4c2b4a835b9c085abe4 Subproject commit f596e805755cf0b83c14375bc5c9aa182b1766e0

1
app/src/main/res/values/strings.xml
View File

@ -61,6 +61,7 @@
<string name="error_usb_prohibited">USB access is prohibited by your device administrator. Check your Knox or MDM settings.</string> <string name="error_usb_prohibited">USB access is prohibited by your device administrator. Check your Knox or MDM settings.</string>
<string name="unable_to_pin_shortcut">Your current launcher does not allow for creating pinned shortcuts.</string> <string name="unable_to_pin_shortcut">Your current launcher does not allow for creating pinned shortcuts.</string>
<string name="video_decoder_init_failed">Video decoder failed to initialize. Your device may not support the selected resolution or frame rate.</string> <string name="video_decoder_init_failed">Video decoder failed to initialize. Your device may not support the selected resolution or frame rate.</string>
<string name="no_video_received_error">No video received from host. Check the host PC\'s firewall and port forwarding rules.</string>
<!-- Start application messages --> <!-- Start application messages -->
<string name="conn_establishing_title">Establishing Connection</string> <string name="conn_establishing_title">Establishing Connection</string>