Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tv-casting-app: Removing some zzz_generated / darwin dependencies #26762

Merged
merged 3 commits into from
May 24, 2023
Merged

tv-casting-app: Removing some zzz_generated / darwin dependencies #26762

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14723fa
tv-casting-app: Removing some zzz_generated dependencies
sharadb-amazon May 23, 2023
3ebb3db
tv-casting-app: Removing dependency on src/darwin/Framework/CHIP
sharadb-amazon May 23, 2023
9b6ce72
Removed zzz_generated/darwin dir and reference from zap_regen_all.py
sharadb-amazon May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions ...-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,11 +423,7 @@
/* Compile time codegen would need this:
"$(TEMP_DIR)/out/gen/src/controller/data_model/zapgen/",
*/
"$(CHIP_ROOT)/zzz_generated/",
"$(CHIP_ROOT)/zzz_generated/app-common",
"$(CHIP_ROOT)/zzz_generated/controller-clusters",
/* darwin-specific bypassing compile time codegen for header inclusion */
"$(CHIP_ROOT)/zzz_generated/darwin/controller-clusters",
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved
);
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -511,11 +507,7 @@
/* Compile time codegen would need this:
"$(TEMP_DIR)/out/gen/src/controller/data_model/zapgen/",
*/
"$(CHIP_ROOT)/zzz_generated/",
"$(CHIP_ROOT)/zzz_generated/app-common",
"$(CHIP_ROOT)/zzz_generated/controller-clusters",
/* darwin-specific bypassing compile time codegen for header inclusion */
"$(CHIP_ROOT)/zzz_generated/darwin/controller-clusters",
);
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/include/ApplicationBasic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "MediaReadBase.h"
#include "MediaSubscriptionBase.h"

#include <zap-generated/CHIPClusters.h>
#include <controller/CHIPCluster.h>

// SUBSCRIBER CLASSES
class VendorNameSubscriber : public MediaSubscriptionBase<chip::app::Clusters::ApplicationBasic::Attributes::VendorName::TypeInfo>
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/include/ApplicationLauncher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "MediaCommandBase.h"
#include "MediaSubscriptionBase.h"

#include <controller/CHIPCluster.h>
#include <functional>
#include <zap-generated/CHIPClusters.h>

// COMMAND CLASSES
class LaunchAppCommand
Expand Down
3 changes: 1 addition & 2 deletions examples/tv-casting-app/tv-casting-common/include/CastingServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@

#include <app-common/zap-generated/cluster-objects.h>
#include <app/server/Server.h>
#include <controller/CHIPCluster.h>
#include <controller/CHIPCommissionableNodeController.h>
#include <functional>
#include <zap-generated/CHIPClientCallbacks.h>
#include <zap-generated/CHIPClusters.h>

constexpr chip::System::Clock::Seconds16 kCommissioningWindowTimeout = chip::System::Clock::Seconds16(3 * 60);

Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/include/Channel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "MediaCommandBase.h"
#include "MediaSubscriptionBase.h"

#include <controller/CHIPCluster.h>
#include <functional>
#include <zap-generated/CHIPClusters.h>

// COMMAND CLASSES
class ChangeChannelCommand : public MediaCommandBase<chip::app::Clusters::Channel::Commands::ChangeChannel::Type,
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/include/ContentLauncher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "MediaCommandBase.h"
#include "MediaSubscriptionBase.h"

#include <controller/CHIPCluster.h>
#include <functional>
#include <zap-generated/CHIPClusters.h>

// COMMAND CLASSES
class LaunchURLCommand : public MediaCommandBase<chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type,
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/include/KeypadInput.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#include "MediaCommandBase.h"

#include <controller/CHIPCluster.h>
#include <functional>
#include <zap-generated/CHIPClusters.h>

class SendKeyCommand : public MediaCommandBase<chip::app::Clusters::KeypadInput::Commands::SendKey::Type,
chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType>
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/include/LevelControl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "MediaCommandBase.h"
#include "MediaSubscriptionBase.h"

#include <controller/CHIPCluster.h>
#include <functional>
#include <zap-generated/CHIPClusters.h>

// COMMAND CLASSES
class StepCommand
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/include/MediaPlayback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "MediaCommandBase.h"
#include "MediaSubscriptionBase.h"

#include <controller/CHIPCluster.h>
#include <functional>
#include <zap-generated/CHIPClusters.h>

// COMMAND CLASSES
class PlayCommand : public MediaCommandBase<chip::app::Clusters::MediaPlayback::Commands::Play::Type,
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/include/OnOff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "MediaBase.h"
#include "MediaCommandBase.h"

#include <controller/CHIPCluster.h>
#include <functional>
#include <zap-generated/CHIPClusters.h>

// COMMAND CLASSES
class OnCommand : public MediaCommandBase<chip::app::Clusters::OnOff::Commands::On::Type, chip::app::DataModel::NullObjectType>
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/include/TargetNavigator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "MediaCommandBase.h"
#include "MediaSubscriptionBase.h"

#include <controller/CHIPCluster.h>
#include <functional>
#include <zap-generated/CHIPClusters.h>

// COMMAND CLASSES
class NavigateTargetCommand
Expand Down
3 changes: 1 addition & 2 deletions examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,7 @@ void CastingServer::ReadServerClusters(EndpointId endpointId)
}

// GetOperationalDeviceProxy only passes us a deviceProxy if we can get a SessionHandle.
chip::Controller::DescriptorCluster cluster(*deviceProxy->GetExchangeManager(), deviceProxy->GetSecureSession().Value(),
endpointId);
chip::Controller::ClusterBase cluster(*deviceProxy->GetExchangeManager(), deviceProxy->GetSecureSession().Value(), endpointId);

TargetEndpointInfo * endpointInfo = mActiveTargetVideoPlayerInfo.GetOrAddEndpoint(endpointId);

Expand Down