diff --git a/auddec.cpp b/auddec.cpp index bfbdc94..798ad5a 100644 --- a/auddec.cpp +++ b/auddec.cpp @@ -34,7 +34,7 @@ static void AudioPlayerSampleCallback(void* samples, uint32_t buffer_size, void* } } -int MoonlightInstance::AudDecInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig) { +int MoonlightInstance::AudDecInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig, void* context, int flags) { int rc; g_Instance->m_OpusDecoder = opus_multistream_decoder_create(opusConfig->sampleRate, diff --git a/connectionlistener.cpp b/connectionlistener.cpp index 5aa0a33..e015a41 100644 --- a/connectionlistener.cpp +++ b/connectionlistener.cpp @@ -38,6 +38,13 @@ void MoonlightInstance::ClDisplayTransientMessage(const char* message) { g_Instance->PostMessage(response); } +void MoonlightInstance::ClLogMessage(const char* format, ...) { + va_list va; + va_start(va, format); + vfprintf(stderr, format, va); + va_end(va); +} + CONNECTION_LISTENER_CALLBACKS MoonlightInstance::s_ClCallbacks = { .stageStarting = MoonlightInstance::ClStageStarting, .stageFailed = MoonlightInstance::ClStageFailed, diff --git a/main.cpp b/main.cpp index e3241fd..8132e95 100644 --- a/main.cpp +++ b/main.cpp @@ -123,6 +123,7 @@ void* MoonlightInstance::ConnectionThreadFunc(void* context) { &MoonlightInstance::s_ClCallbacks, &MoonlightInstance::s_DrCallbacks, &MoonlightInstance::s_ArCallbacks, + NULL, 0, NULL, 0); if (err != 0) { // Notify the JS code that the stream has ended diff --git a/moonlight-common-c b/moonlight-common-c index c01deff..9c37b57 160000 --- a/moonlight-common-c +++ b/moonlight-common-c @@ -1 +1 @@ -Subproject commit c01deff683d9192a71f851815dbea4bba14e4f04 +Subproject commit 9c37b575108c05940adec41e0ed0313c4682b9bf diff --git a/moonlight.hpp b/moonlight.hpp index 8309f28..ac85f36 100644 --- a/moonlight.hpp +++ b/moonlight.hpp @@ -114,6 +114,7 @@ class MoonlightInstance : public pp::Instance, public pp::MouseLock { static void ClConnectionTerminated(long errorCode); static void ClDisplayMessage(const char* message); static void ClDisplayTransientMessage(const char* message); + static void ClLogMessage(const char* format, ...); static Shader CreateProgram(const char* vertexShader, const char* fragmentShader); static void CreateShader(GLuint program, GLenum type, const char* source, int size); @@ -129,7 +130,7 @@ class MoonlightInstance : public pp::Instance, public pp::MouseLock { static void VidDecCleanup(void); static int VidDecSubmitDecodeUnit(PDECODE_UNIT decodeUnit); - static int AudDecInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig); + static int AudDecInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig, void* context, int flags); static void AudDecCleanup(void); static void AudDecDecodeAndPlaySample(char* sampleData, int sampleLength);