diff -r afc583cfa176 -r da2ae96f639b contentmgmt/contentaccessfwfordrm/source/f32agent/f32agentdata.h --- a/contentmgmt/contentaccessfwfordrm/source/f32agent/f32agentdata.h Fri Oct 02 13:15:59 2009 +0300 +++ b/contentmgmt/contentaccessfwfordrm/source/f32agent/f32agentdata.h Mon Oct 12 10:17:04 2009 +0300 @@ -46,6 +46,9 @@ static CF32AgentData* NewL(const TVirtualPathPtr& aVirtualPath, TContentShareMode aShareMode); static CF32AgentData* NewL(RFile& aFile, const TDesC& aUniqueId); +#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT + static CF32AgentData* NewL(const TDesC8& aHeaderData); +#endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT ~CF32AgentData(); @@ -75,10 +78,20 @@ virtual TInt Read64(TInt64 aPos, TDes8& aDes, TInt aLength, TRequestStatus& aStatus); #endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API +#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT + virtual TInt Read(const TDesC8& aEncryptedInputDataPacket, TDes8& aDecryptedOutputDataPacket); + virtual void Read(const TDesC8& aEncryptedInputDataPacket, TDes8& aDecryptedOutputDataPacket, TRequestStatus& aStatus); +#endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT + private: CF32AgentData(); void ConstructL(const TVirtualPathPtr& aVirtualPath, TContentShareMode aShareMode); void ConstructL(RFile& aFile, const TDesC& aUniqueId); + +#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT + void ConstructL(const TDesC8& aHeaderData); +#endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT + CF32AgentUi& AgentUiL(); private: @@ -94,6 +107,10 @@ CVirtualPath* iVirtualPath; CF32AgentUi* iAgentUi; + +#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT + HBufC8* iHeaderData; +#endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT }; } // namespace ContentAccess #endif // __F32AGENTDATA_H__