corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1579588 - part1 : split NotifyAudioChannelAgent() to StartAudioChannelAgent() and StopAudioChanelAgent(). r=chunmin

Browse Source 
Spliting NotifyAudioChannelAgent() to StartAudioChannelAgent() and StopAudioChanelAgent() allows us to start and stop an AudioChannelAgent in a clear naming function, and to do related operation and checking every time we start/stop the agent.

Differential Revision: https://phabricator.services.mozilla.com/D45590
This commit is contained in:
alwu
2019-09-12 23:13:04 +00:00
parent cd559476c1
commit d2febdf654
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
dom/html/HTMLMediaElement.cpp
View File

@@ -1005,7 +1005,11 @@ class HTMLMediaElement::AudioChannelAgentCallback final
}
mPlayingThroughTheAudioChannel = playingThroughTheAudioChannel;
NotifyAudioChannelAgent(mPlayingThroughTheAudioChannel);
if (mPlayingThroughTheAudioChannel) {
StartAudioChannelAgent();
} else {
StopAudioChanelAgent();
}
}
}
@@ -1145,10 +1149,10 @@ class HTMLMediaElement::AudioChannelAgentCallback final
void Shutdown() {
MOZ_ASSERT(!mIsShutDown);
if (mAudioChannelAgent) {
mAudioChannelAgent->NotifyStoppedPlaying();
mAudioChannelAgent = nullptr;
if (mAudioChannelAgent && mAudioChannelAgent->IsPlayingStarted()) {
StopAudioChanelAgent();
}
mAudioChannelAgent = nullptr;
mIsShutDown = true;
}
@@ -1186,22 +1190,23 @@ class HTMLMediaElement::AudioChannelAgentCallback final
return true;
}
void NotifyAudioChannelAgent(bool aPlaying) {
void StartAudioChannelAgent() {
MOZ_ASSERT(mAudioChannelAgent);
if (aPlaying) {
AudioPlaybackConfig config;
nsresult rv =
mAudioChannelAgent->NotifyStartedPlaying(&config, IsOwnerAudible());
if (NS_WARN_IF(NS_FAILED(rv))) {
return;
}
WindowVolumeChanged(config.mVolume, config.mMuted);
WindowSuspendChanged(config.mSuspend);
} else {
mAudioChannelAgent->NotifyStoppedPlaying();
MOZ_ASSERT(!mAudioChannelAgent->IsPlayingStarted());
AudioPlaybackConfig config;
if (NS_WARN_IF(NS_FAILED(mAudioChannelAgent->NotifyStartedPlaying(
&config, IsOwnerAudible())))) {
return;
}
WindowVolumeChanged(config.mVolume, config.mMuted);
WindowSuspendChanged(config.mSuspend);
}
void StopAudioChanelAgent() {
MOZ_ASSERT(mAudioChannelAgent);
MOZ_ASSERT(mAudioChannelAgent->IsPlayingStarted());
mAudioChannelAgent->NotifyStoppedPlaying();
}
void SetSuspended(SuspendTypes aSuspend) {