Update to latest moonlight-common-c

This commit is contained in:
Cameron Gutman 2017-06-11 15:52:03 -07:00
parent 2456ec603c
commit 59e3a104ba
5 changed files with 12 additions and 3 deletions

View File

@ -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,

View File

@ -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,

View File

@ -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

@ -1 +1 @@
Subproject commit c01deff683d9192a71f851815dbea4bba14e4f04
Subproject commit 9c37b575108c05940adec41e0ed0313c4682b9bf

View File

@ -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);