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

Bug 1185422 - Fix -Wtype-limits warnings-as-errors in gonk/AudioManager.cpp. r=alwu

This commit is contained in:
Chris Peterson 2015-07-19 21:43:40 -07:00
Родитель 4044ab78e9
Коммит b4513d4658
1 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -67,7 +67,7 @@ using namespace mozilla::dom::bluetooth;
static void BinderDeadCallback(status_t aErr); static void BinderDeadCallback(status_t aErr);
static void InternalSetAudioRoutes(SwitchState aState); static void InternalSetAudioRoutes(SwitchState aState);
// Refer AudioService.java from Android // Refer AudioService.java from Android
static uint32_t sMaxStreamVolumeTbl[AUDIO_STREAM_CNT] = { static const uint32_t sMaxStreamVolumeTbl[AUDIO_STREAM_CNT] = {
5, // voice call 5, // voice call
15, // system 15, // system
15, // ring 15, // ring
@ -94,7 +94,7 @@ static bool sA2dpSwitchDone = true;
namespace mozilla { namespace mozilla {
namespace dom { namespace dom {
namespace gonk { namespace gonk {
static VolumeData gVolumeData[VOLUME_TOTAL_NUMBER] = { static const VolumeData gVolumeData[VOLUME_TOTAL_NUMBER] = {
{"audio.volume.content", VOLUME_MEDIA}, {"audio.volume.content", VOLUME_MEDIA},
{"audio.volume.notification", VOLUME_NOTIFICATION}, {"audio.volume.notification", VOLUME_NOTIFICATION},
{"audio.volume.alarm", VOLUME_ALARM}, {"audio.volume.alarm", VOLUME_ALARM},
@ -763,7 +763,7 @@ nsresult
AudioManager::ValidateVolumeIndex(uint32_t aCategory, uint32_t aIndex) const AudioManager::ValidateVolumeIndex(uint32_t aCategory, uint32_t aIndex) const
{ {
uint32_t maxIndex = GetMaxVolumeByCategory(aCategory); uint32_t maxIndex = GetMaxVolumeByCategory(aCategory);
if (aIndex < 0 || aIndex > maxIndex) { if (aIndex > maxIndex) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
return NS_OK; return NS_OK;
@ -947,7 +947,7 @@ AudioManager::GetMaxAudioChannelVolume(uint32_t aChannel, uint32_t* aMaxIndex)
nsresult nsresult
AudioManager::SetStreamVolumeIndex(int32_t aStream, uint32_t aIndex) { AudioManager::SetStreamVolumeIndex(int32_t aStream, uint32_t aIndex) {
if (aIndex < 0 || aIndex > sMaxStreamVolumeTbl[aStream]) { if (aIndex > sMaxStreamVolumeTbl[aStream]) {
return NS_ERROR_INVALID_ARG; return NS_ERROR_INVALID_ARG;
} }
mCurrentStreamVolumeTbl[aStream] = aIndex; mCurrentStreamVolumeTbl[aStream] = aIndex;
@ -1122,7 +1122,7 @@ AudioManager::UpdateProfileState(AudioOutputProfiles aProfile, bool aActive)
// are other profiles. The bluetooth and headset have the same priotity. // are other profiles. The bluetooth and headset have the same priotity.
uint32_t profilesNum = mAudioProfiles.Length(); uint32_t profilesNum = mAudioProfiles.Length();
MOZ_ASSERT(profilesNum == DEVICE_TOTAL_NUMBER, "Error profile numbers!"); MOZ_ASSERT(profilesNum == DEVICE_TOTAL_NUMBER, "Error profile numbers!");
for (uint32_t idx = profilesNum - 1; idx >= 0; --idx) { for (int32_t idx = profilesNum - 1; idx >= 0; --idx) {
if (mAudioProfiles[idx]->GetActive()) { if (mAudioProfiles[idx]->GetActive()) {
mPresentProfile = static_cast<AudioOutputProfiles>(idx); mPresentProfile = static_cast<AudioOutputProfiles>(idx);
break; break;
@ -1148,4 +1148,4 @@ AudioManager::UpdateVolumeFromProfile(AudioProfileData* aProfileData)
SetVolumeByCategory(gVolumeData[idx].mCategory, SetVolumeByCategory(gVolumeData[idx].mCategory,
aProfileData->mVolumeTable[gVolumeData[idx].mCategory]); aProfileData->mVolumeTable[gVolumeData[idx].mCategory]);
} }
} }