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

Commit 5e72bfe2 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix warnings hidden by -isystem" am: 1d89f8da 

am: 6df5cd04

Change-Id: I7fcc3bbffb3c50819440c0a0a6e718051ee21f50
parents dfb2379a 6df5cd04

services/audiopolicy/common/managerdefinitions/include/TypeConverter.h

+11 −0
Original line number Diff line number Diff line
@@ -131,6 +131,17 @@ typedef TypeConverter<GainModeTraits> GainModeConverter; 
typedef TypeConverter<StreamTraits> StreamTypeConverter;

typedef TypeConverter<DeviceCategoryTraits> DeviceCategoryConverter;



template<> const DeviceConverter::Table DeviceConverter::mTable[];

template<> const OutputFlagConverter::Table OutputFlagConverter::mTable[];

template<> const InputFlagConverter::Table InputFlagConverter::mTable[];

template<> const FormatConverter::Table FormatConverter::mTable[];

template<> const OutputChannelConverter::Table OutputChannelConverter::mTable[];

template<> const InputChannelConverter::Table InputChannelConverter::mTable[];

template<> const ChannelIndexConverter::Table ChannelIndexConverter::mTable[];

template<> const GainModeConverter::Table GainModeConverter::mTable[];

template<> const DeviceCategoryConverter::Table DeviceCategoryConverter::mTable[];

template<> const StreamTypeConverter::Table StreamTypeConverter::mTable[];



inline

static SampleRateTraits::Collection samplingRatesFromString(const std::string &samplingRates,

                                                            const char *del = "|")