diff --git a/common/include/private/cast_service_common.h b/common/include/private/cast_service_common.h index b674bc8..c0e80a1 100644 --- a/common/include/private/cast_service_common.h +++ b/common/include/private/cast_service_common.h @@ -60,8 +60,9 @@ struct CastInnerRemoteDevice { CapabilityType capability{ CapabilityType::CAST_PLUS }; uint32_t dlnaDeviceId{ static_cast(INVALID_ID) }; std::vector drmCapabilities; - std::string dlnaDeviceModelNameStr; - std::string dlnaDeviceManufacturerStr; + std::string modelName; + std::string manufacturerName; + bool isTrushed; bool operator==(const CastInnerRemoteDevice &rhs) const { diff --git a/common/src/cast_engine_common_helper.cpp b/common/src/cast_engine_common_helper.cpp index e57c950..1ebc113 100644 --- a/common/src/cast_engine_common_helper.cpp +++ b/common/src/cast_engine_common_helper.cpp @@ -147,7 +147,8 @@ bool WriteCastRemoteDevice(Parcel &parcel, const CastRemoteDevice &device) parcel.WriteString(device.networkId) && parcel.WriteString(device.localIpAddress) && parcel.WriteBool(device.isLeagacy) && parcel.WriteInt32(device.sessionId) && parcel.WriteUint32(device.mediumTypes) && parcel.WriteUint32(device.protocolCapabilities) && - parcel.WriteString(device.dlnaDeviceModelNameStr) && parcel.WriteString(device.dlnaDeviceManufacturerStr); + parcel.WriteString(device.modelName) && parcel.WriteString(device.manufacturerName) && + parcel.WriteBool(device.isTrushed); if (device.sessionKeyLength == SESSION_KEY_LENGTH && device.sessionKey) { res = res && parcel.WriteUint32(device.sessionKeyLength); res = res && parcel.WriteBuffer(device.sessionKey, device.sessionKeyLength); @@ -199,8 +200,9 @@ std::unique_ptr ReadCastRemoteDevice(Parcel &parcel) device->sessionId = parcel.ReadInt32(); device->mediumTypes = parcel.ReadUint32(); device->protocolCapabilities = parcel.ReadUint32(); - device->dlnaDeviceModelNameStr = parcel.ReadString(); - device->dlnaDeviceManufacturerStr = parcel.ReadString(); + device->modelName = parcel.ReadString(); + device->manufacturerName = parcel.ReadString(); + device->isTrushed = parcel.ReadBool(); device->sessionKeyLength = parcel.ReadUint32(); if (device->sessionKeyLength == SESSION_KEY_LENGTH) { device->sessionKey = parcel.ReadBuffer(static_cast(device->sessionKeyLength));