Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1089526 - Correct function name. r=baku

Browse Source
This commit is contained in:
Alastor Wu 2015-02-16 18:29:10 +08:00
parent 77d1e01b3c
commit 83b72f4ab3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/speakermanager/SpeakerManagerService.cpp
View File

@ -76,7 +76,7 @@ NS_IMPL_ISUPPORTS(SpeakerManagerService, nsIObserver)
void
SpeakerManagerService::ForceSpeaker(bool aEnable, uint64_t aChildId)
{
TuruOnSpeaker(aEnable);
TurnOnSpeaker(aEnable);
if (aEnable) {
mSpeakerStatusSet.Put(aChildId);
}
@ -88,14 +88,14 @@ void
SpeakerManagerService::ForceSpeaker(bool aEnable, bool aVisible)
{
// b2g main process without oop
TuruOnSpeaker(aEnable && aVisible);
TurnOnSpeaker(aEnable && aVisible);
mVisible = aVisible;
mOrgSpeakerStatus = aEnable;
Notify();
}
void
SpeakerManagerService::TuruOnSpeaker(bool aOn)
SpeakerManagerService::TurnOnSpeaker(bool aOn)
{
nsCOMPtr<nsIAudioManager> audioManager = do_GetService(NS_AUDIOMANAGER_CONTRACTID);
NS_ENSURE_TRUE_VOID(audioManager);
@ -146,7 +146,7 @@ SpeakerManagerService::SetAudioChannelActive(bool aIsActive)
}
NS_IMETHODIMP
SpeakerManagerService::Observe(nsISupports* aSubject, const char*
SpeakerManagerService::Observe(nsISupports* aSubject, const char*
aTopic, const char16_t* aData)
{
if (!strcmp(aTopic, "ipc:content-shutdown")) {
@ -163,11 +163,11 @@ SpeakerManagerService::Observe(nsISupports* aSubject, const char*
// If the audio has paused by audiochannel,
// the enable flag should be false and don't need to handle.
if (mSpeakerStatusSet.Contains(childID)) {
TuruOnSpeaker(false);
TurnOnSpeaker(false);
mSpeakerStatusSet.Remove(childID);
}
if (mOrgSpeakerStatus) {
TuruOnSpeaker(!mOrgSpeakerStatus);
TurnOnSpeaker(!mOrgSpeakerStatus);
mOrgSpeakerStatus = false;
}
} else {

2
dom/speakermanager/SpeakerManagerService.h
View File

@ -58,7 +58,7 @@ protected:
// Notify to UA if device speaker status changed
virtual void Notify();
void TuruOnSpeaker(bool aEnable);
void TurnOnSpeaker(bool aEnable);
nsTArray<nsRefPtr<SpeakerManager> > mRegisteredSpeakerManagers;
// Set for remember all the child speaker status