New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Wiimote support on macOS 10.13 High Sierra #6234

Merged
merged 3 commits into from Dec 7, 2017

Conversation

3 participants
@amolloy
Contributor

amolloy commented Dec 3, 2017

-[deviceInquiryComplete:error:aborted:] comes in on the main thread in macOS 10.13, so instead of using CFRunLoopRun()/CFRunLoopStop(), just let the run loop do one pass while waiting for "done" to be true. This also means -[deviceInquiryComplete:error:aborted:] should no longer call CFRunLoopStop(). Fixes connecting to Wiimotes in macOS 10.13+, and should continue to work as before in 10.12 and below.

amolloy added some commits Dec 3, 2017

-[deviceInquiryComplete:error:aborted:] comes in on the main thread i…
…n macOS 10.13, so instead of using CFRunLoopRun()/CFRunLoopStop(), just let the run loop do one pass. This is already in a loop waiting for done to be false. This also means -[deviceInquiryComplete:error:aborted:] should no longer call CFRunLoopStop(). Fixes connecting to Wiimotes in macOS 10.13+, should continue to work as before in 10.12 and below.
Break out of the loop waiting for the SearchBT to be done in WiimoteS…
…cannerDarwin::FindWiimotes() when the object is destroyed. Allows the application to quit correctly when Continuous Scanning is enabled on macOS.
@Helios747

This comment has been minimized.

Show comment
Hide comment
@Helios747

Helios747 Dec 3, 2017

Contributor

@ligfx can you review + test this

Also, @amolloy, please make linter happy. Follow the guide here

https://github.com/dolphin-emu/dolphin/blob/master/Contributing.md#intro-formatting-issues

as of right now we use clang-format from the LLVM 3.8 stable release.

Contributor

Helios747 commented Dec 3, 2017

@ligfx can you review + test this

Also, @amolloy, please make linter happy. Follow the guide here

https://github.com/dolphin-emu/dolphin/blob/master/Contributing.md#intro-formatting-issues

as of right now we use clang-format from the LLVM 3.8 stable release.

@joewestcott

This comment has been minimized.

Show comment
Hide comment
@joewestcott

joewestcott Dec 6, 2017

Contributor

I've given this a quick test in 10.13 and it works as expected, thanks @amolloy!
Also @Helios747 this issue has been logged twice, here and here

Contributor

joewestcott commented Dec 6, 2017

I've given this a quick test in 10.13 and it works as expected, thanks @amolloy!
Also @Helios747 this issue has been logged twice, here and here

@Helios747 Helios747 merged commit 3b88738 into dolphin-emu:master Dec 7, 2017

10 checks passed

default Very basic checks passed, handed off to Buildbot.
Details
lint Build succeeded on builder lint
Details
pr-android Build succeeded on builder pr-android
Details
pr-deb-dbg-x64 Build succeeded on builder pr-deb-dbg-x64
Details
pr-deb-x64 Build succeeded on builder pr-deb-x64
Details
pr-freebsd-x64 Build succeeded on builder pr-freebsd-x64
Details
pr-osx-x64 Build succeeded on builder pr-osx-x64
Details
pr-ubu-x64 Build succeeded on builder pr-ubu-x64
Details
pr-win-dbg-x64 Build succeeded on builder pr-win-dbg-x64
Details
pr-win-x64 Build succeeded on builder pr-win-x64
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment