Making request a variable

sharadb-amazon · Dec 15, 2023 · e281922 · e281922
1 parent 8ef97f2
commit e281922
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/examples/tv-casting-app/linux/simple-app-helper.cpp b/examples/tv-casting-app/linux/simple-app-helper.cpp
@@ -91,17 +91,16 @@ void ConnectionHandler(CHIP_ERROR err, matter::casting::core::CastingPlayer * ca
     if (it != endpoints.end())
     {
         unsigned index = (unsigned int) std::distance(endpoints.begin(), it);
-        matter::casting::memory::Strong<matter::casting::clusters::ContentLauncherCluster> cluster =
-            endpoints[index]->GetCluster<matter::casting::clusters::ContentLauncherCluster>();
+        matter::casting::memory::Strong<matter::casting::clusters::content_launcher::ContentLauncherCluster> cluster =
+            endpoints[index]->GetCluster<matter::casting::clusters::content_launcher::ContentLauncherCluster>();
         if (cluster != nullptr)
         {
-            chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type * request =
-                new chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type();
-            request->contentURL    = chip::CharSpan::fromCharString("https://www.test.com/videoid");
-            request->displayString = chip::Optional<chip::CharSpan>(chip::CharSpan::fromCharString("Test video"));
-            request->brandingInformation =
+            chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type request;
+            request.contentURL    = chip::CharSpan::fromCharString("https://www.test.com/videoid");
+            request.displayString = chip::Optional<chip::CharSpan>(chip::CharSpan::fromCharString("Test video"));
+            request.brandingInformation =
                 chip::MakeOptional(chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type());
-            cluster->LaunchURL(*request, nullptr, OnLaunchURLSuccess, OnLaunchURLFailure,
+            cluster->LaunchURL(request, nullptr, OnLaunchURLSuccess, OnLaunchURLFailure,
                                chip::MakeOptional(static_cast<unsigned short>(5 * 1000)));
         }
     }

diff --git a/examples/tv-casting-app/tv-casting-common/clusters/ContentLauncherCluster.cpp b/examples/tv-casting-app/tv-casting-common/clusters/ContentLauncherCluster.cpp
@@ -21,6 +21,7 @@
 namespace matter {
 namespace casting {
 namespace clusters {
+namespace content_launcher {
 
 void ContentLauncherCluster::LaunchURL(
     chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type request, void * context,
@@ -31,6 +32,7 @@ void ContentLauncherCluster::LaunchURL(
     command.Invoke(request, context, successCb, failureCb, timedInvokeTimeoutMs);
 }
 
+}; // namespace content_launcher
 }; // namespace clusters
 }; // namespace casting
 }; // namespace matter
diff --git a/examples/tv-casting-app/tv-casting-common/clusters/ContentLauncherCluster.h b/examples/tv-casting-app/tv-casting-common/clusters/ContentLauncherCluster.h
@@ -27,6 +27,7 @@
 namespace matter {
 namespace casting {
 namespace clusters {
+namespace content_launcher {
 
 class ContentLauncherCluster : public core::BaseCluster
 {
@@ -54,6 +55,7 @@ class LaunchURLCommand : public Command<chip::app::Clusters::ContentLauncher::Co
     LaunchURLCommand(memory::Weak<core::Endpoint> endpoint) : Command(endpoint) {}
 };
 
+}; // namespace content_launcher
 }; // namespace clusters
 }; // namespace casting
 }; // namespace matter
diff --git a/examples/tv-casting-app/tv-casting-common/support/EndpointListLoader.cpp b/examples/tv-casting-app/tv-casting-common/support/EndpointListLoader.cpp
@@ -126,7 +126,7 @@ void EndpointListLoader::Complete()
                 switch (clusterId)
                 {
                 case chip::app::Clusters::ContentLauncher::Id:
-                    endpoint->RegisterCluster<clusters::ContentLauncherCluster>(clusterId);
+                    endpoint->RegisterCluster<clusters::content_launcher::ContentLauncherCluster>(clusterId);
                     break;
 
                 case chip::app::Clusters::MediaPlayback::Id: