Skip to content

Commit

Permalink
Updates, building now
Browse files Browse the repository at this point in the history
  • Loading branch information
@sharadb-amazon
sharadb-amazon committed May 6, 2024
1 parent ee72a8d commit ec853df
Show file tree
Hide file tree
Showing 16 changed files with 313 additions and 1,057 deletions.
22 changes: 2 additions & 20 deletions ...-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
3C2346232B362B9500FA276E /* MCCastingPlayerDiscovery.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C2346222B362B9500FA276E /* MCCastingPlayerDiscovery.h */; };
3C2346252B362BBB00FA276E /* MCCastingPlayerDiscovery.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C2346242B362BBB00FA276E /* MCCastingPlayerDiscovery.mm */; };
3C2696FB2B4A5FC50026E771 /* MCEndpointFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2696FA2B4A5FC50026E771 /* MCEndpointFilter.m */; };
3C26AC8C2926FE0C00BA6881 /* DeviceAttestationCredentialsProviderImpl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3C26AC8B2926FE0C00BA6881 /* DeviceAttestationCredentialsProviderImpl.hpp */; };
3C26AC902927008900BA6881 /* DeviceAttestationCredentialsProviderImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C26AC8F2927008900BA6881 /* DeviceAttestationCredentialsProviderImpl.mm */; };
3C26AC9329282B8100BA6881 /* DeviceAttestationCredentialsHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C26AC9229282B8100BA6881 /* DeviceAttestationCredentialsHolder.m */; };
3C4AE650286A7D4D005B52A4 /* OnboardingPayload.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C4AE64F286A7D4D005B52A4 /* OnboardingPayload.m */; };
3C4E53B028E4F28100F293E8 /* MediaPlaybackTypes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4E53AF28E4F28100F293E8 /* MediaPlaybackTypes.mm */; };
Expand Down Expand Up @@ -60,15 +58,13 @@
3C9437942B3B47A10096E5F4 /* MCErrorUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C9437932B3B47A10096E5F4 /* MCErrorUtils.mm */; };
3C996C272BD31FEA0027BD8A /* DataSourceCompat.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C996C262BD31FEA0027BD8A /* DataSourceCompat.mm */; };
3C996C2B2BD6F4960027BD8A /* CastingPlayerDiscoveryListenerCompat.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C996C2A2BD6F4950027BD8A /* CastingPlayerDiscoveryListenerCompat.mm */; };
3CC3979E2BE9857C00465462 /* MCCastingPlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C9437882B364F5E0096E5F4 /* MCCastingPlayer.mm */; };
3CCB87212869085400771BAD /* MatterTvCastingBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CCB87202869085400771BAD /* MatterTvCastingBridge.h */; settings = {ATTRIBUTES = (Public, ); }; };
3CCB8737286A555500771BAD /* libTvCastingCommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CCB8735286A555500771BAD /* libTvCastingCommon.a */; };
3CCB873F286A593700771BAD /* DiscoveredNodeData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CCB8739286A593700771BAD /* DiscoveredNodeData.mm */; };
3CCB8740286A593700771BAD /* CastingServerBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CCB873A286A593700771BAD /* CastingServerBridge.h */; };
3CCB8741286A593700771BAD /* DiscoveredNodeData.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CCB873B286A593700771BAD /* DiscoveredNodeData.h */; };
3CCB8742286A593700771BAD /* ConversionUtils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3CCB873C286A593700771BAD /* ConversionUtils.hpp */; };
3CCB8743286A593700771BAD /* CastingServerBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CCB873D286A593700771BAD /* CastingServerBridge.mm */; };
3CCB8744286A593700771BAD /* ConversionUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CCB873E286A593700771BAD /* ConversionUtils.mm */; };
3CD6D01A298CDA2100D7569A /* CommissionerDiscoveryDelegateImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD6D019298CDA2100D7569A /* CommissionerDiscoveryDelegateImpl.h */; };
3CD73F172A9E6884009D82D1 /* MCRotatingDeviceIdUniqueIdProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD73F162A9E6884009D82D1 /* MCRotatingDeviceIdUniqueIdProvider.h */; };
3CD73F192A9E68A7009D82D1 /* MCRotatingDeviceIdUniqueIdProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CD73F182A9E68A7009D82D1 /* MCRotatingDeviceIdUniqueIdProvider.mm */; };
3CD73F1C2A9E8396009D82D1 /* MCCommissionableDataProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD73F1B2A9E8396009D82D1 /* MCCommissionableDataProvider.h */; };
Expand Down Expand Up @@ -108,8 +104,6 @@
3C2346222B362B9500FA276E /* MCCastingPlayerDiscovery.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCastingPlayerDiscovery.h; sourceTree = "<group>"; };
3C2346242B362BBB00FA276E /* MCCastingPlayerDiscovery.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCCastingPlayerDiscovery.mm; sourceTree = "<group>"; };
3C2696FA2B4A5FC50026E771 /* MCEndpointFilter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MCEndpointFilter.m; sourceTree = "<group>"; };
3C26AC8B2926FE0C00BA6881 /* DeviceAttestationCredentialsProviderImpl.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = DeviceAttestationCredentialsProviderImpl.hpp; sourceTree = "<group>"; };
3C26AC8F2927008900BA6881 /* DeviceAttestationCredentialsProviderImpl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DeviceAttestationCredentialsProviderImpl.mm; sourceTree = "<group>"; };
3C26AC91292700AD00BA6881 /* DeviceAttestationCredentialsHolder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeviceAttestationCredentialsHolder.h; sourceTree = "<group>"; };
3C26AC9229282B8100BA6881 /* DeviceAttestationCredentialsHolder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DeviceAttestationCredentialsHolder.m; sourceTree = "<group>"; };
3C4AE64E286A7D40005B52A4 /* OnboardingPayload.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OnboardingPayload.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -159,10 +153,7 @@
3CCB8739286A593700771BAD /* DiscoveredNodeData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DiscoveredNodeData.mm; sourceTree = "<group>"; };
3CCB873A286A593700771BAD /* CastingServerBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CastingServerBridge.h; sourceTree = "<group>"; };
3CCB873B286A593700771BAD /* DiscoveredNodeData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiscoveredNodeData.h; sourceTree = "<group>"; };
3CCB873C286A593700771BAD /* ConversionUtils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ConversionUtils.hpp; sourceTree = "<group>"; };
3CCB873D286A593700771BAD /* CastingServerBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CastingServerBridge.mm; sourceTree = "<group>"; };
3CCB873E286A593700771BAD /* ConversionUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ConversionUtils.mm; sourceTree = "<group>"; };
3CD6D019298CDA2100D7569A /* CommissionerDiscoveryDelegateImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommissionerDiscoveryDelegateImpl.h; sourceTree = "<group>"; };
3CD73F162A9E6884009D82D1 /* MCRotatingDeviceIdUniqueIdProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCRotatingDeviceIdUniqueIdProvider.h; sourceTree = "<group>"; };
3CD73F182A9E68A7009D82D1 /* MCRotatingDeviceIdUniqueIdProvider.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCRotatingDeviceIdUniqueIdProvider.mm; sourceTree = "<group>"; };
3CD73F1B2A9E8396009D82D1 /* MCCommissionableDataProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCommissionableDataProvider.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -225,8 +216,6 @@
3C66FBFB290327BB00B63FE7 /* AppParameters.mm */,
3CCB873B286A593700771BAD /* DiscoveredNodeData.h */,
3CCB8739286A593700771BAD /* DiscoveredNodeData.mm */,
3CCB873C286A593700771BAD /* ConversionUtils.hpp */,
3CCB873E286A593700771BAD /* ConversionUtils.mm */,
3C4AE64E286A7D40005B52A4 /* OnboardingPayload.h */,
3C4AE64F286A7D4D005B52A4 /* OnboardingPayload.m */,
3C81C74E28F7A7AE001CB9D1 /* ContentApp.h */,
Expand All @@ -241,11 +230,8 @@
3C4E53B128E5184C00F293E8 /* TargetNavigatorTypes.mm */,
3C26AC91292700AD00BA6881 /* DeviceAttestationCredentialsHolder.h */,
3C26AC9229282B8100BA6881 /* DeviceAttestationCredentialsHolder.m */,
3C26AC8B2926FE0C00BA6881 /* DeviceAttestationCredentialsProviderImpl.hpp */,
3C26AC8F2927008900BA6881 /* DeviceAttestationCredentialsProviderImpl.mm */,
3C0D9CDF2920A30C00D3332B /* CommissionableDataProviderImpl.hpp */,
3CE868F32946D76200FCB92B /* CommissionableDataProviderImpl.mm */,
3CD6D019298CDA2100D7569A /* CommissionerDiscoveryDelegateImpl.h */,
3CE5ECCD2A673B30007CF331 /* CommissioningCallbackHandlers.h */,
3CE5ECCF2A673E2C007CF331 /* CommissioningCallbackHandlers.m */,
);
Expand Down Expand Up @@ -333,12 +319,10 @@
3C69204C2AA136BA00D0F613 /* MCCommonCaseDeviceServerInitParamsProvider.h in Headers */,
3C2346212B362B4F00FA276E /* MCCastingPlayer.h in Headers */,
3C2346232B362B9500FA276E /* MCCastingPlayerDiscovery.h in Headers */,
3CD6D01A298CDA2100D7569A /* CommissionerDiscoveryDelegateImpl.h in Headers */,
3CF71C0E2A992DA2003A5CE5 /* MCDataSource.h in Headers */,
3C4F52142B4F31DC00BB8A10 /* MCDeviceTypeStruct.h in Headers */,
39BF57CD2B8FC0EF0081653C /* MCClusterObjects.h in Headers */,
39D4D2502B97942D00BF3CFE /* MCCommandObjects.h in Headers */,
3C26AC8C2926FE0C00BA6881 /* DeviceAttestationCredentialsProviderImpl.hpp in Headers */,
3C621CA52B605A6A005CDBA3 /* MCAttribute.h in Headers */,
3CD73F1C2A9E8396009D82D1 /* MCCommissionableDataProvider.h in Headers */,
3C4F521E2B4F4B3B00BB8A10 /* MCEndpoint_Internal.h in Headers */,
Expand All @@ -358,7 +342,6 @@
3CCB8740286A593700771BAD /* CastingServerBridge.h in Headers */,
3CE5ECCE2A673B30007CF331 /* CommissioningCallbackHandlers.h in Headers */,
39589F162B91556B00BE040C /* MCInteractionModelStructs.h in Headers */,
3CCB8742286A593700771BAD /* ConversionUtils.hpp in Headers */,
3C621CA72B605AA1005CDBA3 /* MCObserver.h in Headers */,
3C9437922B3B478E0096E5F4 /* MCErrorUtils.h in Headers */,
3C4F52222B507C9300BB8A10 /* MCCluster.h in Headers */,
Expand Down Expand Up @@ -480,8 +463,8 @@
3C4F522C2B51E02800BB8A10 /* MCCommand.mm in Sources */,
3C4E53B628E5595A00F293E8 /* ContentLauncherTypes.mm in Sources */,
3C81C75028F7A7D3001CB9D1 /* VideoPlayer.m in Sources */,
3CCB8744286A593700771BAD /* ConversionUtils.mm in Sources */,
3CF71C0C2A992D25003A5CE5 /* MCCastingApp.mm in Sources */,
3CC3979E2BE9857C00465462 /* MCCastingPlayer.mm in Sources */,
3C621CAB2B605C6E005CDBA3 /* MCAttribute.mm in Sources */,
3C4F52122B4E18ED00BB8A10 /* MCEndpoint.mm in Sources */,
3C4E53B028E4F28100F293E8 /* MediaPlaybackTypes.mm in Sources */,
Expand All @@ -495,7 +478,6 @@
3C9437942B3B47A10096E5F4 /* MCErrorUtils.mm in Sources */,
3CE868F42946D76200FCB92B /* CommissionableDataProviderImpl.mm in Sources */,
3C26AC9329282B8100BA6881 /* DeviceAttestationCredentialsHolder.m in Sources */,
3C26AC902927008900BA6881 /* DeviceAttestationCredentialsProviderImpl.mm in Sources */,
3C996C272BD31FEA0027BD8A /* DataSourceCompat.mm in Sources */,
3CCB873F286A593700771BAD /* DiscoveredNodeData.mm in Sources */,
39D4D2522B97943D00BF3CFE /* MCCommandObjects.mm in Sources */,
Expand Down
8 changes: 4 additions & 4 deletions ...ples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCastingPlayer.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ - (instancetype _Nonnull)initWithCppCastingPlayer:(matter::casting::memory::Stro
return self;
}

+ (MCCastingPlayer *_Nullable)getTargetCastingPlayer
+ (MCCastingPlayer * _Nullable)getTargetCastingPlayer
{
ChipLogProgress(AppServer, "MCCastingPlayer.getTargetCastingPlayer called");
VerifyOrReturnValue([[MCCastingApp getSharedInstance] isRunning], nil, ChipLogError(AppServer, "MCCastingApp NOT running"));
__block MCCastingPlayer * castingPlayer = nil;
dispatch_sync([[MCCastingApp getSharedInstance] getWorkQueue], ^{
matter::casting::core::CastingPlayer *cppCastingPlayer = matter::casting::core::CastingPlayer::GetTargetCastingPlayer();
if(cppCastingPlayer != nullptr) {
castingPlayer = [[MCCastingPlayer alloc] initWithCppCastingPlayer:std::make_shared<matter::casting::core::CastingPlayer>(cppCastingPlayer)];
matter::casting::core::CastingPlayer * cppCastingPlayer = matter::casting::core::CastingPlayer::GetTargetCastingPlayer();
if (cppCastingPlayer != nullptr) {
castingPlayer = [[MCCastingPlayer alloc] initWithCppCastingPlayer:std::make_shared<matter::casting::core::CastingPlayer>(*cppCastingPlayer)];
}
});
return castingPlayer;
Expand Down
2 changes: 1 addition & 1 deletion ...casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCastingPlayer_Internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

- (instancetype _Nonnull)initWithCppCastingPlayer:(matter::casting::memory::Strong<matter::casting::core::CastingPlayer>)cppCastingPlayer;

+ (MCCastingPlayer *_Nullable)getTargetCastingPlayer;
+ (MCCastingPlayer * _Nullable)getTargetCastingPlayer;

@end

Expand Down
2 changes: 1 addition & 1 deletion ...tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MatterTvCastingBridge.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ FOUNDATION_EXPORT const unsigned char MatterTvCastingBridgeVersionString[];
#import "MCCryptoUtils.h"
#import "MCDataSource.h"
#import "MCDeviceAttestationCredentials.h"
#import "zap-generated/MCEndpointClusterType.h"
#import "MCEndpointFilter.h"
#import "MCObserver.h"
#import "zap-generated/MCAttributeObjects.h"
#import "zap-generated/MCClusterObjects.h"
#import "zap-generated/MCCommandObjects.h"
#import "zap-generated/MCEndpointClusterType.h"
3 changes: 2 additions & 1 deletion ...TvCastingBridge/MatterTvCastingBridge/compat-shim/CastingPlayerDiscoveryListenerCompat.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@

#import "CastingPlayerDiscoveryListenerCompat.h"

#import "ConversionUtils.hpp"
#import "DiscoveredNodeData.h"
#import "MCCastingPlayer.h"
#import "MCCastingPlayerDiscovery.h"
#import "MCErrorUtils.h"

#include <lib/support/logging/CHIPLogging.h>

@interface CastingPlayerDiscoveryListenerCompat ()

@property (class, nonatomic, strong) dispatch_queue_t clientQueue;
Expand Down
3 changes: 2 additions & 1 deletion ...-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/compat-shim/CastingServerBridge.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
*
* Copyright (c) 2020-2023 Project CHIP Authors
* Copyright (c) 2020-2024 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,6 +30,7 @@
#ifndef CastingServerBridge_h
#define CastingServerBridge_h

__attribute__((deprecated("This class is deprecated. Use ../../../../APIs.md instead.")))
@interface CastingServerBridge : NSObject

+ (CastingServerBridge * _Nullable)getSharedInstance;
Expand Down
Loading

0 comments on commit ec853df

Please sign in to comment.