Skip to content
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

Only claim to be eligible for Smart Routing when generating audio #14400

Merged

Conversation

eric-carlson
Copy link
Contributor

@eric-carlson eric-carlson commented May 26, 2023

56f6f91

Only claim to be eligible for Smart Routing when generating audio
https://bugs.webkit.org/show_bug.cgi?id=257388
rdar://109724130

Reviewed by Jer Noble.

Don't claim to be eligible for Smart Routing if the audio session is inactive
or the audio session category is None.

* Source/WebCore/platform/audio/cocoa/AudioSessionCocoa.h:
(WebCore::AudioSessionCocoa::isEligibleForSmartRouting const):
* Source/WebCore/platform/audio/cocoa/AudioSessionCocoa.mm:
(WebCore::AudioSessionCocoa::setEligibleForSmartRoutingInternal):
(WebCore::AudioSessionCocoa::AudioSessionCocoa):
(WebCore::AudioSessionCocoa::~AudioSessionCocoa):
(WebCore::AudioSessionCocoa::setEligibleForSmartRouting):
(WebCore::AudioSessionCocoa::tryToSetActiveInternal):
(WebCore::AudioSessionCocoa::setCategory):
(WebCore::setEligibleForSmartRouting): Deleted.
* Source/WebCore/platform/audio/ios/AudioSessionIOS.mm:
(WebCore::AudioSessionIOS::setCategory):
* Source/WebCore/platform/audio/mac/AudioSessionMac.mm:
(WebCore::AudioSessionMac::setCategory):

Canonical link: https://commits.webkit.org/264610@main

cfacfa3

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe βœ… πŸ›  wincairo
βœ… πŸ§ͺ bindings βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug βœ… πŸ§ͺ wpe-wk2
βœ… πŸ§ͺ webkitperl βœ… πŸ§ͺ ios-wk2 βœ… πŸ§ͺ api-mac βœ… πŸ›  gtk
βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ§ͺ gtk-wk2
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk2 βœ… πŸ§ͺ api-gtk
βœ… πŸ›  tv βœ… πŸ§ͺ mac-AS-debug-wk2
βœ… πŸ›  tv-sim
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch
βœ… πŸ›  watch-sim

@eric-carlson eric-carlson self-assigned this May 26, 2023
@eric-carlson eric-carlson added the Media Bugs related to the HTML 5 Media elements. label May 26, 2023
@eric-carlson eric-carlson added the merge-queue Applied to send a pull request to merge-queue label May 26, 2023
https://bugs.webkit.org/show_bug.cgi?id=257388
rdar://109724130

Reviewed by Jer Noble.

Don't claim to be eligible for Smart Routing if the audio session is inactive
or the audio session category is None.

* Source/WebCore/platform/audio/cocoa/AudioSessionCocoa.h:
(WebCore::AudioSessionCocoa::isEligibleForSmartRouting const):
* Source/WebCore/platform/audio/cocoa/AudioSessionCocoa.mm:
(WebCore::AudioSessionCocoa::setEligibleForSmartRoutingInternal):
(WebCore::AudioSessionCocoa::AudioSessionCocoa):
(WebCore::AudioSessionCocoa::~AudioSessionCocoa):
(WebCore::AudioSessionCocoa::setEligibleForSmartRouting):
(WebCore::AudioSessionCocoa::tryToSetActiveInternal):
(WebCore::AudioSessionCocoa::setCategory):
(WebCore::setEligibleForSmartRouting): Deleted.
* Source/WebCore/platform/audio/ios/AudioSessionIOS.mm:
(WebCore::AudioSessionIOS::setCategory):
* Source/WebCore/platform/audio/mac/AudioSessionMac.mm:
(WebCore::AudioSessionMac::setCategory):

Canonical link: https://commits.webkit.org/264610@main
@webkit-commit-queue
Copy link
Collaborator

Committed 264610@main (56f6f91): https://commits.webkit.org/264610@main

Reviewed commits have been landed. Closing PR #14400 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 56f6f91 into WebKit:main May 26, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Media Bugs related to the HTML 5 Media elements.
Projects
None yet
4 participants