moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-03 08:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly synchronize rumble with gamepad removal

Browse Source
This commit is contained in:
Cameron Gutman 2022-03-05 13:32:38 -06:00
parent 4b83b022d3
commit 4ae39f2bd5
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/streaming/session.cpp
View File

@ -23,6 +23,7 @@
#endif #endif
#define SDL_CODE_FLUSH_WINDOW_EVENT_BARRIER 100 #define SDL_CODE_FLUSH_WINDOW_EVENT_BARRIER 100
#define SDL_CODE_GAMECONTROLLER_RUMBLE 101
#include <openssl/rand.h> #include <openssl/rand.h>
@ -134,13 +135,15 @@ void Session::clLogMessage(const char* format, ...)
void Session::clRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) void Session::clRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor)
{ {
// The input handler can be closed during the stream if LiStopConnection() hasn't completed yet // We push an event for the main thread to handle in order to properly synchronize
// but the stream has been stopped by the user. In this case, just discard the rumble. // with the removal of game controllers that could result in our game controller
SDL_AtomicLock(&s_ActiveSession->m_InputHandlerLock); // going away during this callback.
if (s_ActiveSession->m_InputHandler != nullptr) { SDL_Event rumbleEvent = {};
s_ActiveSession->m_InputHandler->rumble(controllerNumber, lowFreqMotor, highFreqMotor); rumbleEvent.type = SDL_USEREVENT;
} rumbleEvent.user.code = SDL_CODE_GAMECONTROLLER_RUMBLE;
SDL_AtomicUnlock(&s_ActiveSession->m_InputHandlerLock); rumbleEvent.user.data1 = (void*)(uintptr_t)controllerNumber;
rumbleEvent.user.data2 = (void*)(uintptr_t)((lowFreqMotor << 16) | highFreqMotor);
SDL_PushEvent(&rumbleEvent);
} }
void Session::clConnectionStatusUpdate(int connectionStatus) void Session::clConnectionStatusUpdate(int connectionStatus)
@ -449,7 +452,6 @@ Session::Session(NvComputer* computer, NvApp& app, StreamingPreferences *prefere
m_PendingWindowedTransition(false), m_PendingWindowedTransition(false),
m_UnexpectedTermination(true), // Failure prior to streaming is unexpected m_UnexpectedTermination(true), // Failure prior to streaming is unexpected
m_InputHandler(nullptr), m_InputHandler(nullptr),
m_InputHandlerLock(0),
m_MouseEmulationRefCount(0), m_MouseEmulationRefCount(0),
m_FlushingWindowEventsRef(0), m_FlushingWindowEventsRef(0),
m_AsyncConnectionSuccess(false), m_AsyncConnectionSuccess(false),
@ -1552,6 +1554,11 @@ void Session::execInternal()
case SDL_CODE_FLUSH_WINDOW_EVENT_BARRIER: case SDL_CODE_FLUSH_WINDOW_EVENT_BARRIER:
m_FlushingWindowEventsRef--; m_FlushingWindowEventsRef--;
break; break;
case SDL_CODE_GAMECONTROLLER_RUMBLE:
m_InputHandler->rumble((unsigned short)(uintptr_t)event.user.data1,
(unsigned short)((uintptr_t)event.user.data2 >> 16),
(unsigned short)((uintptr_t)event.user.data2 & 0xFFFF));
break;
default: default:
SDL_assert(false); SDL_assert(false);
} }
@ -1751,14 +1758,11 @@ DispatchDeferredCleanup:
// Raise any keys that are still down // Raise any keys that are still down
m_InputHandler->raiseAllKeys(); m_InputHandler->raiseAllKeys();
// Destroy the input handler now. Any rumble callbacks that // Destroy the input handler now. This must be destroyed
// occur after this point will be discarded. This must be destroyed // before allowwing the UI to continue execution or it could
// before allow the UI to continue execution or it could interfere // interfere with SDLGamepadKeyNavigation.
// with SDLGamepadKeyNavigation.
SDL_AtomicLock(&m_InputHandlerLock);
delete m_InputHandler; delete m_InputHandler;
m_InputHandler = nullptr; m_InputHandler = nullptr;
SDL_AtomicUnlock(&m_InputHandlerLock);
// Destroy the decoder, since this must be done on the main thread // Destroy the decoder, since this must be done on the main thread
// NB: This must happen before LiStopConnection() for pull-based // NB: This must happen before LiStopConnection() for pull-based

1
app/streaming/session.h
View File

@ -161,7 +161,6 @@ private:
bool m_PendingWindowedTransition; bool m_PendingWindowedTransition;
bool m_UnexpectedTermination; bool m_UnexpectedTermination;
SdlInputHandler* m_InputHandler; SdlInputHandler* m_InputHandler;
SDL_SpinLock m_InputHandlerLock;
int m_MouseEmulationRefCount; int m_MouseEmulationRefCount;
int m_FlushingWindowEventsRef; int m_FlushingWindowEventsRef;