Merge "AudioPolicyEffects: Prefer using string_view" into main (d0f2ae09) · Commits · e / os / android_frameworks_av

services/audiopolicy/service/AudioPolicyEffects.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -908,7 +908,7 @@ status_t AudioPolicyEffects::loadAudioEffectConfig_ll(
		auto effectDescs = std::make_shared<EffectDescVector>();
		for (auto& effect : stream.effects) {
		effectDescs->push_back(
		std::make_shared<EffectDesc>(effect->name.c_str(), effect->uuid));
		std::make_shared<EffectDesc>(effect->name, effect->uuid));
		}
		streams.add(stream.type, std::move(effectDescs));
		}
		@@ -919,7 +919,7 @@ status_t AudioPolicyEffects::loadAudioEffectConfig_ll(
		auto effectDescs = std::make_unique<EffectDescVector>();
		for (auto& effect : deviceProcess.effects) {
		effectDescs->push_back(
		std::make_shared<EffectDesc>(effect->name.c_str(), effect->uuid));
		std::make_shared<EffectDesc>(effect->name, effect->uuid));
		}
		auto devEffects = std::make_unique<DeviceEffects>(
		std::move(effectDescs), deviceProcess.type, deviceProcess.address);

+3 −3

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ private:
		// as defined in audio_effects.conf
		class EffectDesc {
		public:
		EffectDesc(const char *name,
		EffectDesc(std::string_view name,
		const effect_uuid_t& typeUuid,
		const String16& opPackageName,
		const effect_uuid_t& uuid,
		@@ -140,7 +140,7 @@ private:
		mPriority(priority),
		mId(id) { }
		// Modern EffectDesc usage:
		EffectDesc(const char *name, const effect_uuid_t& uuid) :
		EffectDesc(std::string_view name, const effect_uuid_t& uuid) :
		EffectDesc(name,
		*EFFECT_UUID_NULL,
		String16(""),
		@@ -186,7 +186,7 @@ private:
		class DeviceEffects {
		public:
		DeviceEffects(std::unique_ptr<EffectDescVector> effectDescriptors,
		audio_devices_t device, const std::string& address) :
		audio_devices_t device, std::string_view address) :
		mEffectDescriptors(std::move(effectDescriptors)),
		mDeviceType(device), mDeviceAddress(address) {}