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

Commit e736431c authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio policy: add device for audio bus" into nyc-dev

parents 5031b2f3 58545be2

services/audioflinger/Threads.cpp

+2 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ String8 devicesToString(audio_devices_t devices) 
        {AUDIO_DEVICE_OUT_AUX_LINE,         "AUX_LINE"},

        {AUDIO_DEVICE_OUT_SPEAKER_SAFE,     "SPEAKER_SAFE"},

        {AUDIO_DEVICE_OUT_IP,               "IP"},

        {AUDIO_DEVICE_OUT_BUS,              "BUS"},

        {AUDIO_DEVICE_NONE,                 "NONE"},       // must be last

    }, mappingsIn[] = {

        {AUDIO_DEVICE_IN_COMMUNICATION,     "COMMUNICATION"},
@@ -491,6 +492,7 @@ String8 devicesToString(audio_devices_t devices) 
        {AUDIO_DEVICE_IN_BLUETOOTH_A2DP,    "BLUETOOTH_A2DP"},

        {AUDIO_DEVICE_IN_LOOPBACK,          "LOOPBACK"},

        {AUDIO_DEVICE_IN_IP,                "IP"},

        {AUDIO_DEVICE_IN_BUS,               "BUS"},

        {AUDIO_DEVICE_NONE,                 "NONE"},        // must be last

    };

    String8 result;

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

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ const DeviceConverter::Table DeviceConverter::mTable[] = { 
        MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_FM),

        MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_AUX_LINE),

        MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_IP),

        MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BUS),

        MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_AMBIENT),

        MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BUILTIN_MIC),

        MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET),
@@ -72,6 +73,7 @@ const DeviceConverter::Table DeviceConverter::mTable[] = { 
        MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BLUETOOTH_A2DP),

        MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_LOOPBACK),

        MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_IP),

        MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BUS),

};



template<>