Skip to content

Commit

Permalink
[Chef] Fix basicvideoplayer device type (#32091)
Browse files Browse the repository at this point in the history
* [Chef] Fix basicvideoplayer device type

This was actually a squashed and rebased commit for PR #31987 since
it mixed with unwanted commit from other people due to conflicts
during rebasing

* Rename Data() function to GetXxxxName() function

* Use `StringBuilder` instead of std::stringstream

* Simplify codes without unnecessary return variables

* Remove unused static_cast

* Simplify the keypad keycode handling

* Restyled by clang-format

* Enable Chef BasicVideoPlayer in cloud build

* Remove unused GetInputName & GetOutputName function

* Using struct InputData&OuptutData to refine logics

in Chef common/clusters/audio-output/AudioOutputManager.*
and common/clusters/media-input/MediaInputManager.*

* Add break in default section

* Fix recordingFlag type and remove EMBER_ZCL_STATUS_SUCCESS

* Use std::numeric_limits<uint32_t>::max() as endTime default

* Remove some unneeded namespace declaration

* Restyled by clang-format

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
2 people authored and pull[bot] committed Apr 11, 2024
1 parent 13c86d5 commit 2895010
Show file tree
Hide file tree
Showing 26 changed files with 3,069 additions and 499 deletions.
1 change: 1 addition & 0 deletions examples/chef/chef.py
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,7 @@ def main() -> int:
'import("${chip_root}/config/standalone/args.gni")',
'chip_shell_cmd_server = false',
'chip_build_libshell = true',
'chip_enable_openthread = false',
'chip_config_network_layer_ble = false',
'chip_device_project_config_include = "<CHIPProjectAppConfig.h>"',
'chip_project_config_include = "<CHIPProjectAppConfig.h>"',
Expand Down
226 changes: 0 additions & 226 deletions examples/chef/common/chef-channel-manager.cpp

This file was deleted.

55 changes: 0 additions & 55 deletions examples/chef/common/chef-channel-manager.h

This file was deleted.

83 changes: 83 additions & 0 deletions examples/chef/common/clusters/audio-output/AudioOutputManager.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
/*
*
* Copyright (c) 2021 Project CHIP Authors
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include <app/util/config.h>
#ifdef MATTER_DM_PLUGIN_AUDIO_OUTPUT_SERVER
#include "AudioOutputManager.h"

using namespace std;
using namespace chip::app;
using namespace chip::app::Clusters::AudioOutput;
using chip::app::AttributeValueEncoder;

AudioOutputManager::AudioOutputManager()
{
struct OutputData outputData1(1, chip::app::Clusters::AudioOutput::OutputTypeEnum::kHdmi, "HDMI 1");
mOutputs.push_back(outputData1);
struct OutputData outputData2(2, chip::app::Clusters::AudioOutput::OutputTypeEnum::kHdmi, "HDMI 2");
mOutputs.push_back(outputData2);
struct OutputData outputData3(3, chip::app::Clusters::AudioOutput::OutputTypeEnum::kHdmi, "HDMI 3");
mOutputs.push_back(outputData3);

mCurrentOutput = 1;
}

uint8_t AudioOutputManager::HandleGetCurrentOutput()
{
return mCurrentOutput;
}

CHIP_ERROR AudioOutputManager::HandleGetOutputList(AttributeValueEncoder & aEncoder)
{
return aEncoder.EncodeList([this](const auto & encoder) -> CHIP_ERROR {
for (auto const & outputData : mOutputs)
{
ReturnErrorOnFailure(encoder.Encode(outputData.GetEncodable()));
}
return CHIP_NO_ERROR;
});
}

bool AudioOutputManager::HandleRenameOutput(const uint8_t & index, const chip::CharSpan & newName)
{
for (auto & outputData : mOutputs)
{
if (outputData.index == index)
{
outputData.Rename(newName);
return true;
}
}

return false;
}

bool AudioOutputManager::HandleSelectOutput(const uint8_t & index)
{
for (auto & outputData : mOutputs)
{
if (outputData.index == index)
{
mCurrentOutput = index;
return true;
}
}

return false;
}
#endif // MATTER_DM_PLUGIN_AUDIO_OUTPUT_SERVER
Loading

0 comments on commit 2895010

Please sign in to comment.