Fix type in error messages

Author: erwinpan1

examples/chef/common/clusters/media-input/MediaInputManager.cpp

@@ -29,13 +29,13 @@ using Protocols::InteractionModel::Status;
 
 MediaInputManager::MediaInputManager(chip::EndpointId endpoint) : mEndpoint(endpoint)
 {
-    struct InputData inputData1(1, chip::app::Clusters::MediaInput::InputTypeEnum::kHdmi, "HDMI 1",
+    struct InputData inputData1(1, InputTypeEnum::kHdmi, "HDMI 1",
                                 "High-Definition Multimedia Interface");
     mInputs.push_back(inputData1);
-    struct InputData inputData2(2, chip::app::Clusters::MediaInput::InputTypeEnum::kHdmi, "HDMI 2",
+    struct InputData inputData2(2, InputTypeEnum::kHdmi, "HDMI 2",
                                 "High-Definition Multimedia Interface");
     mInputs.push_back(inputData2);
-    struct InputData inputData3(3, chip::app::Clusters::MediaInput::InputTypeEnum::kHdmi, "HDMI 3",
+    struct InputData inputData3(3, InputTypeEnum::kHdmi, "HDMI 3",
                                 "High-Definition Multimedia Interface");
     mInputs.push_back(inputData3);
 }
@@ -57,7 +57,7 @@ uint8_t MediaInputManager::HandleGetCurrentInput()
     Status status        = Attributes::CurrentInput::Get(mEndpoint, &currentInput);
     if (Status::Success != status)
     {
-        ChipLogError(Zcl, "Unable to save CurrentInput attribute, err:0x%x", to_underlying(status));
+        ChipLogError(Zcl, "Unable to get CurrentInput attribute, err:0x%x", to_underlying(status));
     }
     return currentInput;
 }
@@ -74,7 +74,7 @@ bool MediaInputManager::HandleSelectInput(const uint8_t index)
         if (inputData.index == index)
         {
             // Sync the CurrentInput to attribute storage while reporting changes
-            Status status = chip::app::Clusters::MediaInput::Attributes::CurrentInput::Set(mEndpoint, index);
+            Status status = Attributes::CurrentInput::Set(mEndpoint, index);
             if (Status::Success != status)
             {
                 ChipLogError(Zcl, "CurrentInput is not stored successfully, err:0x%x", to_underlying(status));
@@ -127,6 +127,6 @@ void emberAfMediaInputClusterInitCallback(EndpointId endpoint)
 
     gMediaInputManagerInstance[endpoint] = std::make_unique<MediaInputManager>(endpoint);
 
-    chip::app::Clusters::MediaInput::SetDefaultDelegate(endpoint, gMediaInputManagerInstance[endpoint].get());
+    SetDefaultDelegate(endpoint, gMediaInputManagerInstance[endpoint].get());
 }
 #endif // MATTER_DM_PLUGIN_MEDIA_INPUT_SERVER

examples/chef/common/clusters/media-playback/MediaPlaybackManager.cpp

@@ -40,7 +40,7 @@ PlaybackStateEnum MediaPlaybackManager::HandleGetCurrentState()
     Status status = Attributes::CurrentState::Get(mEndpoint, &currentState);
     if (Status::Success != status)
     {
-        ChipLogError(Zcl, "Unable to save CurrentStage attribute, err:0x%x", to_underlying(status));
+        ChipLogError(Zcl, "Unable to get CurrentStage attribute, err:0x%x", to_underlying(status));
     }
     return currentState;
 }
@@ -67,7 +67,7 @@ float MediaPlaybackManager::HandleGetPlaybackSpeed()
     Status status = Attributes::PlaybackSpeed::Get(mEndpoint, &playbackSpeed);
     if (Status::Success != status)
     {
-        ChipLogError(Zcl, "Unable to save PlaybackSpeed attribute, err:0x%x", to_underlying(status));
+        ChipLogError(Zcl, "Unable to get PlaybackSpeed attribute, err:0x%x", to_underlying(status));
     }
     return playbackSpeed;
 }
@@ -114,16 +114,16 @@ CHIP_ERROR MediaPlaybackManager::HandleGetAvailableTextTracks(AttributeValueEnco
     });
 }
 
-CHIP_ERROR MediaPlaybackManager::HandleSetCurrentState(chip::app::Clusters::MediaPlayback::PlaybackStateEnum currentState)
+CHIP_ERROR MediaPlaybackManager::HandleSetCurrentState(PlaybackStateEnum currentState)
 {
     Status status = Attributes::CurrentState::Set(mEndpoint, currentState);
 
     if (Status::Success != status)
     {
-        ChipLogError(Zcl, "Unable to save CurrentState attribute, 0x%x", to_underlying(status));
+        ChipLogError(Zcl, "Unable to set CurrentState attribute, 0x%x", to_underlying(status));
     }
 
-    return CHIP_NO_ERROR;
+    return CHIP_ERROR_IM_GLOBAL_STATUS_VALUE(status);
 }
 
 CHIP_ERROR MediaPlaybackManager::HandleSetPlaybackSpeed(float playbackSpeed)
@@ -135,7 +135,7 @@ CHIP_ERROR MediaPlaybackManager::HandleSetPlaybackSpeed(float playbackSpeed)
         ChipLogError(Zcl, "Unable to set PlaybackSpeed attribute, 0x%x", to_underlying(status));
     }
 
-    return CHIP_NO_ERROR;
+    return CHIP_ERROR_IM_GLOBAL_STATUS_VALUE(status);
 }
 
 void MediaPlaybackManager::HandlePlay(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
@@ -391,7 +391,7 @@ void emberAfMediaPlaybackClusterInitCallback(EndpointId endpoint)
 
     gMediaPlaybackManagerInstance[endpoint] = std::make_unique<MediaPlaybackManager>(endpoint);
 
-    chip::app::Clusters::MediaPlayback::SetDefaultDelegate(endpoint, gMediaPlaybackManagerInstance[endpoint].get());
+    SetDefaultDelegate(endpoint, gMediaPlaybackManagerInstance[endpoint].get());
 }
 
 #endif /// MATTER_DM_PLUGIN_MEDIA_PLAYBACK_SERVER