Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Less ugly hacks

Browse Source
This commit is contained in:
Lior Halphon 2020-05-01 18:26:48 +03:00
parent 021cdb402d
commit 2854578527
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cocoa/GBView.m
View File

@ -116,7 +116,6 @@
} }
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];
[lastController setRumbleAmplitude:0]; [lastController setRumbleAmplitude:0];
[lastController _forceStopPWMThread];
[JOYController unregisterListener:self]; [JOYController unregisterListener:self];
} }
- (instancetype)initWithCoder:(NSCoder *)coder - (instancetype)initWithCoder:(NSCoder *)coder
@ -303,7 +302,6 @@
if (![self.window isMainWindow]) return; if (![self.window isMainWindow]) return;
if (controller != lastController) { if (controller != lastController) {
[lastController setRumbleAmplitude:0]; [lastController setRumbleAmplitude:0];
[lastController _forceStopPWMThread];
lastController = controller; lastController = controller;
} }

1
JoyKit/JOYController.h
View File

@ -35,7 +35,6 @@ static NSString const *JOYHatsEmulateButtonsKey = @"JOYHatsEmulateButtons";
- (NSArray<JOYHat *> *) hats; - (NSArray<JOYHat *> *) hats;
- (void)setRumbleAmplitude:(double)amp; - (void)setRumbleAmplitude:(double)amp;
- (void)setPlayerLEDs:(uint8_t)mask; - (void)setPlayerLEDs:(uint8_t)mask;
- (void)_forceStopPWMThread; // Hack
@property (readonly, getter=isConnected) bool connected; @property (readonly, getter=isConnected) bool connected;
@end @end

8
JoyKit/JOYController.m
View File

@ -607,7 +607,12 @@ typedef struct __attribute__((packed)) {
- (void)pwmThread - (void)pwmThread
{ {
/* TODO: This does not handle correctly the case of having a multi-port controller where more than one controller /* TODO: This does not handle correctly the case of having a multi-port controller where more than one controller
uses rumble. */ uses rumble. At least make sure any sibling controllers don't have their PWM thread running. */
for (JOYController *controller in [JOYController allControllers]) {
if (controller != self && controller->_device == _device) {
[controller _forceStopPWMThread];
}
}
unsigned rumbleCounter = 0; unsigned rumbleCounter = 0;
while (self.connected && !_forceStopPWMThread) { while (self.connected && !_forceStopPWMThread) {
if ([_rumbleElement setValue:rumbleCounter < round(_rumblePWMRatio * PWM_RESOLUTION)]) { if ([_rumbleElement setValue:rumbleCounter < round(_rumblePWMRatio * PWM_RESOLUTION)]) {
@ -619,6 +624,7 @@ typedef struct __attribute__((packed)) {
} }
} }
[_rumblePWMThreadLock lock]; [_rumblePWMThreadLock lock];
[_rumbleElement setValue:0];
_rumblePWMThreadRunning = false; _rumblePWMThreadRunning = false;
_forceStopPWMThread = false; _forceStopPWMThread = false;
[_rumblePWMThreadLock unlock]; [_rumblePWMThreadLock unlock];