Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b279bbc authored by Eric Laurent's avatar Eric Laurent
Browse files

audio policy: remove compilation warnings 

Change-Id: I4d41ca903dfbe37066ef20a13ebabaff1e5b7326
parent 83923a30

services/audiopolicy/common/managerdefinitions/src/HwModule.cpp

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ status_t HwModule::addInputProfile(String8 name, const audio_config_t *config, 
    devDesc->mAddress = address;

    profile->addSupportedDevice(devDesc);



    ALOGV("addInputProfile() name %s rate %d mask 0x08", name.string(), config->sample_rate, config->channel_mask);

    ALOGV("addInputProfile() name %s rate %d mask 0x%08x",

          name.string(), config->sample_rate, config->channel_mask);



    return addInputProfile(profile);

}

services/audiopolicy/common/managerdefinitions/src/TypeConverter.cpp

+8 −8
Original line number Diff line number Diff line
@@ -168,14 +168,14 @@ const size_t InputChannelConverter::mSize = sizeof(InputChannelConverter::mTable 


template <>

const ChannelIndexConverter::Table ChannelIndexConverter::mTable[] = {

    "AUDIO_CHANNEL_INDEX_MASK_1", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_1),

    "AUDIO_CHANNEL_INDEX_MASK_2", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_2),

    "AUDIO_CHANNEL_INDEX_MASK_3", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_3),

    "AUDIO_CHANNEL_INDEX_MASK_4", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_4),

    "AUDIO_CHANNEL_INDEX_MASK_5", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_5),

    "AUDIO_CHANNEL_INDEX_MASK_6", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_6),

    "AUDIO_CHANNEL_INDEX_MASK_7", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_7),

    "AUDIO_CHANNEL_INDEX_MASK_8", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_8),

    {"AUDIO_CHANNEL_INDEX_MASK_1", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_1)},

    {"AUDIO_CHANNEL_INDEX_MASK_2", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_2)},

    {"AUDIO_CHANNEL_INDEX_MASK_3", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_3)},

    {"AUDIO_CHANNEL_INDEX_MASK_4", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_4)},

    {"AUDIO_CHANNEL_INDEX_MASK_5", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_5)},

    {"AUDIO_CHANNEL_INDEX_MASK_6", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_6)},

    {"AUDIO_CHANNEL_INDEX_MASK_7", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_7)},

    {"AUDIO_CHANNEL_INDEX_MASK_8", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_8)},

};

template<>

const size_t ChannelIndexConverter::mSize = sizeof(ChannelIndexConverter::mTable) /

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1926,7 +1926,7 @@ status_t AudioPolicyManager::registerPolicyMixes(Vector<AudioMix> mixes) 
        return INVALID_OPERATION;

    }



    ALOGV("registerPolicyMixes() num mixes %d", mixes.size());

    ALOGV("registerPolicyMixes() num mixes %zu", mixes.size());



    for (size_t i = 0; i < mixes.size(); i++) {

        String8 address = mixes[i].mRegistrationId;
@@ -1973,7 +1973,7 @@ status_t AudioPolicyManager::unregisterPolicyMixes(Vector<AudioMix> mixes) 
        return INVALID_OPERATION;

    }



    ALOGV("unregisterPolicyMixes() num mixes %d", mixes.size());

    ALOGV("unregisterPolicyMixes() num mixes %zu", mixes.size());



    for (size_t i = 0; i < mixes.size(); i++) {

        String8 address = mixes[i].mRegistrationId;
@@ -2218,7 +2218,7 @@ status_t AudioPolicyManager::createAudioPatch(const struct audio_patch *patch, 
                                                           patch->sources[0].type);

#if LOG_NDEBUG == 0

    for (size_t i = 0; i < patch->num_sinks; i++) {

        ALOGV("createAudioPatch sink %d: id %d role %d type %d", i, patch->sinks[i].id,

        ALOGV("createAudioPatch sink %zu: id %d role %d type %d", i, patch->sinks[i].id,

                                                             patch->sinks[i].role,

                                                             patch->sinks[i].type);

    }
@@ -3390,7 +3390,7 @@ status_t AudioPolicyManager::checkOutputsForDevice(const sp<DeviceDescriptor> de 
            }

        }



        ALOGV("  found %d profiles, %d outputs", profiles.size(), outputs.size());

        ALOGV("  found %zu profiles, %zu outputs", profiles.size(), outputs.size());



        if (profiles.isEmpty() && outputs.isEmpty()) {

            ALOGW("checkOutputsForDevice(): No output available for device %04x", device);