Skip to content

Commit 8245330

Browse files
Fix TV app
1 parent e1fa3be commit 8245330

File tree

7 files changed

+17
-16
lines changed

7 files changed

+17
-16
lines changed

examples/tv-app/android/include/account-login/AccountLoginManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ void AccountLoginManager::HandleGetSetupPin(CommandResponseHelper<GetSetupPINRes
130130
std::string tempAccountIdentifierString(tempAccountIdentifier.data(), tempAccountIdentifier.size());
131131

132132
GetSetupPINResponse response;
133-
ChipLogProgress(Zcl, "temporary account id: %s returning pin: %s", tempAccountIdentifierString.std::c_str(), mSetupPin);
133+
ChipLogProgress(Zcl, "temporary account id: %s returning pin: %s", tempAccountIdentifierString.c_str(), mSetupPin);
134134

135135
response.setupPIN = CharSpan::fromCharString(mSetupPin);
136136
helper.Success(response);

examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ using namespace chip::app::Clusters::ContentLauncher;
3131
using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelegate;
3232

3333
AppContentLauncherManager::AppContentLauncherManager(ContentAppAttributeDelegate * attributeDelegate,
34-
std::list<std::string> acceptHeaderList, uint32_t supportedStreamingProtocols) :
34+
std::list<std::string> acceptHeaderList,
35+
uint32_t supportedStreamingProtocols) :
3536
mAttributeDelegate(attributeDelegate)
3637
{
3738
mAcceptHeaderList = acceptHeaderList;
@@ -91,7 +92,7 @@ CHIP_ERROR AppContentLauncherManager::HandleGetAcceptHeaderList(AttributeValueEn
9192
chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::ContentLauncher::Id,
9293
chip::app::Clusters::ContentLauncher::Attributes::AcceptHeader::Id);
9394
std::string resStr = mAttributeDelegate->Read(aPath);
94-
ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetAcceptHeaderList response %s", resStr.std::c_str());
95+
ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetAcceptHeaderList response %s", resStr.c_str());
9596

9697
if (resStr.length() != 0)
9798
{
@@ -101,7 +102,7 @@ CHIP_ERROR AppContentLauncherManager::HandleGetAcceptHeaderList(AttributeValueEn
101102
{
102103
std::string attrId = std::to_string(chip::app::Clusters::ContentLauncher::Attributes::AcceptHeader::Id);
103104
ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetAcceptHeaderList response parsing done. reading attr %s",
104-
attrId.std::c_str());
105+
attrId.c_str());
105106
if (value[attrId].isArray())
106107
{
107108
mAcceptHeaderList.clear();
@@ -132,7 +133,7 @@ uint32_t AppContentLauncherManager::HandleGetSupportedStreamingProtocols()
132133
chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::ContentLauncher::Id,
133134
chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::Id);
134135
std::string resStr = mAttributeDelegate->Read(aPath);
135-
ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response %s", resStr.std::c_str());
136+
ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response %s", resStr.c_str());
136137

137138
if (resStr.length() == 0)
138139
{
@@ -147,7 +148,7 @@ uint32_t AppContentLauncherManager::HandleGetSupportedStreamingProtocols()
147148
}
148149
std::string attrId = std::to_string(chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::Id);
149150
ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response parsing done. reading attr %s",
150-
attrId.std::c_str());
151+
attrId.c_str());
151152
if (!value[attrId].empty() && value[attrId].isInt())
152153
{
153154
uint32_t supportedStreamingProtocols = static_cast<uint32_t>(value[attrId].asInt());

examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ uint64_t AppMediaPlaybackManager::HandleMediaRequestGetAttribute(chip::Attribute
194194
ChipLogProgress(Zcl, "Received AppMediaPlaybackManager::HandleMediaRequestGetAttribute:%d", attributeId);
195195
chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::MediaPlayback::Id, attributeId);
196196
std::string resStr = mAttributeDelegate->Read(aPath);
197-
ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleMediaRequestGetAttribute response %s", resStr.std::c_str());
197+
ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleMediaRequestGetAttribute response %s", resStr.c_str());
198198

199199
uint64_t ret = std::numeric_limits<uint64_t>::max();
200200
if (resStr.length() != 0)
@@ -205,7 +205,7 @@ uint64_t AppMediaPlaybackManager::HandleMediaRequestGetAttribute(chip::Attribute
205205
{
206206
std::string attrId = std::to_string(attributeId);
207207
ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleMediaRequestGetAttribute response parsing done. reading attr %s",
208-
attrId.std::c_str());
208+
attrId.c_str());
209209
if (!value[attrId].empty() && value[attrId].isUInt())
210210
{
211211
ret = static_cast<uint64_t>(value[attrId].asUInt());
@@ -241,7 +241,7 @@ CHIP_ERROR AppMediaPlaybackManager::HandleGetSampledPosition(AttributeValueEncod
241241
chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::MediaPlayback::Id,
242242
chip::app::Clusters::MediaPlayback::Attributes::SampledPosition::Id);
243243
std::string resStr = mAttributeDelegate->Read(aPath);
244-
ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleGetSampledPosition response %s", resStr.std::c_str());
244+
ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleGetSampledPosition response %s", resStr.c_str());
245245

246246
if (resStr.length() != 0)
247247
{
@@ -251,7 +251,7 @@ CHIP_ERROR AppMediaPlaybackManager::HandleGetSampledPosition(AttributeValueEncod
251251
{
252252
std::string attrId = std::to_string(chip::app::Clusters::MediaPlayback::Attributes::SampledPosition::Id);
253253
ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSampledPosition response parsing done. reading attr %s",
254-
attrId.std::c_str());
254+
attrId.c_str());
255255
if (!value[attrId].empty() && value[attrId].isObject())
256256
{
257257
std::string updatedAt = std::to_string(

examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a
5454
{
5555
std::string attrId = std::to_string(chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id);
5656
ChipLogProgress(Zcl, "TargetNavigatorManager::HandleNavigateTarget response parsing done. reading attr %s",
57-
attrId.std::c_str());
57+
attrId.c_str());
5858
if (value[attrId].isArray())
5959
{
6060
return aEncoder.EncodeList([&](const auto & encoder) -> CHIP_ERROR {
@@ -109,7 +109,7 @@ uint8_t TargetNavigatorManager::HandleGetCurrentTarget()
109109
chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::TargetNavigator::Id,
110110
chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id);
111111
std::string resStr = mAttributeDelegate->Read(aPath);
112-
ChipLogProgress(Zcl, "TargetNavigatorManager::HandleGetCurrentTarget response %s", resStr.std::c_str());
112+
ChipLogProgress(Zcl, "TargetNavigatorManager::HandleGetCurrentTarget response %s", resStr.c_str());
113113

114114
if (resStr.length() != 0)
115115
{
@@ -119,7 +119,7 @@ uint8_t TargetNavigatorManager::HandleGetCurrentTarget()
119119
{
120120
std::string attrId = std::to_string(chip::app::Clusters::TargetNavigator::Attributes::CurrentTarget::Id);
121121
ChipLogProgress(Zcl, "TargetNavigatorManager::HandleGetCurrentTarget response parsing done. reading attr %s",
122-
attrId.std::c_str());
122+
attrId.c_str());
123123
if (value[attrId].isUInt() && value[attrId].asUInt() < 256)
124124
{
125125
return static_cast<uint8_t>(value[attrId].asUInt());

examples/tv-app/tv-common/clusters/media-input/MediaInputManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ bool MediaInputManager::HandleShowInputStatus()
7979
std::string desc(inputInfo.description.data(), inputInfo.description.size());
8080
ChipLogProgress(Zcl, " [%d] type=%d selected=%d name=%s desc=%s", inputInfo.index,
8181
static_cast<uint16_t>(inputInfo.inputType), (mCurrentInput == inputInfo.index ? 1 : 0), name.c_str(),
82-
desc.std::c_str());
82+
desc.c_str());
8383
}
8484
return true;
8585
}

examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CHIP_ERROR MessagesManager::HandlePresentMessagesRequest(
3333
const DataModel::Nullable<uint32_t> & startTime, const DataModel::Nullable<uint64_t> & duration, const CharSpan & messageText,
3434
const Optional<DataModel::DecodableList<MessageResponseOption>> & responses)
3535
{
36-
ChipLogProgress(Zcl, "HandlePresentMessagesRequest message:%s", std::string(messageText.data(), messageText.size()).std::c_str());
36+
ChipLogProgress(Zcl, "HandlePresentMessagesRequest message:%s", std::string(messageText.data(), messageText.size()).c_str());
3737

3838
auto cachedMessage = CachedMessage(messageId, priority, messageControl, startTime, duration,
3939
std::string(messageText.data(), messageText.size()));

examples/tv-casting-app/tv-casting-common/clusters/content-app-observer/ContentAppObserver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void ContentAppObserverManager::HandleContentAppMessage(chip::app::CommandRespon
3838
std::string encodingHintString(encodingHint.data(), encodingHint.size());
3939

4040
ChipLogProgress(Zcl, "ContentAppObserverManager::HandleContentAppMessage TEST CASE hint=%s data=%s ",
41-
encodingHintString.std::c_str(), dataString.std::c_str());
41+
encodingHintString.c_str(), dataString.c_str());
4242

4343
ContentAppMessageResponse response;
4444
// TODO: Insert code here

0 commit comments

Comments
 (0)