diff --git a/moonlight-common/src/main/jni/moonlight-core/callbacks.c b/moonlight-common/src/main/jni/moonlight-core/callbacks.c index 8eabfa29..a1e569da 100644 --- a/moonlight-common/src/main/jni/moonlight-core/callbacks.c +++ b/moonlight-common/src/main/jni/moonlight-core/callbacks.c @@ -5,6 +5,7 @@ #include #include +#include #define PCM_FRAME_SIZE 240 @@ -178,7 +179,7 @@ int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) { decodeUnit->receiveTimeMs); } -int BridgeArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig) { +int BridgeArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig, void* context, int flags) { JNIEnv* env = GetThreadEnv(); int err; @@ -341,6 +342,13 @@ void BridgeClDisplayTransientMessage(const char* message) { (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClDisplayTransientMessageMethod, (*env)->NewStringUTF(env, message)); } +void BridgeClLogMessage(const char* format, ...) { + va_list va; + va_start(va, format); + __android_log_vprint(ANDROID_LOG_INFO, "moonlight-common-c", format, va); + va_end(va); +} + static DECODER_RENDERER_CALLBACKS BridgeVideoRendererCallbacks = { .setup = BridgeDrSetup, .start = BridgeDrStart, @@ -365,6 +373,7 @@ static CONNECTION_LISTENER_CALLBACKS BridgeConnListenerCallbacks = { .connectionTerminated = BridgeClConnectionTerminated, .displayMessage = BridgeClDisplayMessage, .displayTransientMessage = BridgeClDisplayTransientMessage, + .logMessage = BridgeClLogMessage, }; JNIEXPORT jint JNICALL @@ -401,7 +410,13 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jobject BridgeVideoRendererCallbacks.capabilities = videoCapabilities; - int ret = LiStartConnection(&serverInfo, &streamConfig, &BridgeConnListenerCallbacks, &BridgeVideoRendererCallbacks, &BridgeAudioRendererCallbacks, NULL, 0); + int ret = LiStartConnection(&serverInfo, + &streamConfig, + &BridgeConnListenerCallbacks, + &BridgeVideoRendererCallbacks, + &BridgeAudioRendererCallbacks, + NULL, 0, + NULL, 0); (*env)->ReleaseStringUTFChars(env, address, serverInfo.address); (*env)->ReleaseStringUTFChars(env, appVersion, serverInfo.serverInfoAppVersion); diff --git a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c index 88f95c78..35792655 160000 --- a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c +++ b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c @@ -1 +1 @@ -Subproject commit 88f95c787103f4f5b4b38bd02e9fd0d15e430e44 +Subproject commit 357926556046427aa5dda597ae73dc5a8d0d8bed