mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 885602 - Fix build of AudioManager.cpp on gonk-JB, r=mchen

This commit is contained in:
Michael Wu 2013-06-21 01:37:21 -04:00
Родитель 2bf34ce3c6
Коммит a88d6cad39
1 изменённых файлов: 10 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
dom/system/gonk/AudioManager.cpp
Просмотреть файл

@ -284,11 +284,11 @@ AudioManager::AudioManager() : mPhoneState(PHONE_STATE_CURRENT),
nsCOMPtr<nsIObserverService> obs = services::GetObserverService(); nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
NS_ENSURE_TRUE_VOID(obs); NS_ENSURE_TRUE_VOID(obs);
nsresult rv = if (NS_FAILED(obs->AddObserver(this, BLUETOOTH_SCO_STATUS_CHANGED_ID, false))) {
obs->AddObserver(this, BLUETOOTH_SCO_STATUS_CHANGED_ID, false) && NS_WARNING("Failed to add bluetooth sco status changed observer!");
obs->AddObserver(this, BLUETOOTH_A2DP_STATUS_CHANGED_ID, false); }
if (NS_FAILED(rv)) { if (NS_FAILED(obs->AddObserver(this, BLUETOOTH_A2DP_STATUS_CHANGED_ID, false))) {
NS_WARNING("Failed to add bluetooth status changed obervers!"); NS_WARNING("Failed to add bluetooth a2dp status changed observer!");
} }
for (int loop = 0; loop < AUDIO_STREAM_CNT; loop++) { for (int loop = 0; loop < AUDIO_STREAM_CNT; loop++) {
@ -316,11 +316,11 @@ AudioManager::~AudioManager() {
nsCOMPtr<nsIObserverService> obs = services::GetObserverService(); nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
NS_ENSURE_TRUE_VOID(obs); NS_ENSURE_TRUE_VOID(obs);
nsresult rv = if (NS_FAILED(obs->RemoveObserver(this, BLUETOOTH_SCO_STATUS_CHANGED_ID))) {
obs->RemoveObserver(this, BLUETOOTH_SCO_STATUS_CHANGED_ID) && NS_WARNING("Failed to remove bluetooth sco status changed observer!");
obs->RemoveObserver(this, BLUETOOTH_A2DP_STATUS_CHANGED_ID); }
if (NS_FAILED(rv)) { if (NS_FAILED(obs->RemoveObserver(this, BLUETOOTH_A2DP_STATUS_CHANGED_ID))) {
NS_WARNING("Failed to remove bluetooth status changed obervers!"); NS_WARNING("Failed to remove bluetooth a2dp status changed observer!");
} }
} }