moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-04-19 23:10:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report attached gamepads during launch to fix L4D2

Browse Source
This commit is contained in:
Cameron Gutman
2018-01-20 14:37:33 -08:00
parent af3bc82d0f
commit 6bb6c40bec
8 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Limelight/Input/ControllerSupport.m
View File

@@ -8,6 +8,7 @@
#import "ControllerSupport.h"
#import "OnScreenControls.h"
#import "DataManager.h"
#include "Limelight.h"
// Swift
@@ -21,6 +22,7 @@
NSMutableDictionary *_controllers;
OnScreenControls *_osc;
bool _oscEnabled;
// This controller object is shared between on-screen controls
// and player 0
@@ -147,7 +149,7 @@
[_controllerStreamLock lock];
@synchronized(controller) {
// Player 1 is always present for OSC
LiSendMultiControllerEvent(controller.playerIndex, _controllerNumbers | 1, controller.lastButtonFlags, controller.lastLeftTrigger, controller.lastRightTrigger, controller.lastLeftStickX, controller.lastLeftStickY, controller.lastRightStickX, controller.lastRightStickY);
LiSendMultiControllerEvent(controller.playerIndex, _controllerNumbers | (_oscEnabled ? 1 : 0), controller.lastButtonFlags, controller.lastLeftTrigger, controller.lastRightTrigger, controller.lastLeftStickX, controller.lastLeftStickY, controller.lastRightStickX, controller.lastRightStickY);
}
[_controllerStreamLock unlock];
}
@@ -303,6 +305,25 @@
return _player0osc;
}
+(int) getConnectedGamepadMask {
int mask = 0;
for (int i = 0; i < [[GCController controllers] count]; i++) {
mask |= 1 << i;
}
DataManager* dataMan = [[DataManager alloc] init];
OnScreenControlsLevel level = (OnScreenControlsLevel)[[dataMan getSettings].onscreenControls integerValue];
// Even if no gamepads are present, we will always count one
// if OSC is enabled.
if (level != OnScreenControlsLevelOff) {
mask |= 1;
}
return mask;
}
-(id) init
{
self = [super init];
@@ -313,6 +334,9 @@
_player0osc = [[Controller alloc] init];
_player0osc.playerIndex = 0;
DataManager* dataMan = [[DataManager alloc] init];
_oscEnabled = (OnScreenControlsLevel)[[dataMan getSettings].onscreenControls integerValue] != OnScreenControlsLevelOff;
Log(LOG_I, @"Number of controllers connected: %ld", (long)[[GCController controllers] count]);
for (GCController* controller in [GCController controllers]) {
[self assignController:controller];
@@ -337,10 +361,13 @@
GCController* controller = note.object;
[self unregisterControllerCallbacks:controller];
[_controllers removeObjectForKey:[NSNumber numberWithInteger:controller.playerIndex]];
_controllerNumbers &= ~(1 << controller.playerIndex);
Log(LOG_I, @"Unassigning controller index: %ld", (long)controller.playerIndex);
// Inform the server of the updated active gamepads before removing this controller
[self updateFinished:[_controllers objectForKey:[NSNumber numberWithInteger:controller.playerIndex]]];
[_controllers removeObjectForKey:[NSNumber numberWithInteger:controller.playerIndex]];
// Re-evaluate the on-screen control mode
[self updateAutoOnScreenControlMode];
}];