equal
deleted
inserted
replaced
27 #include <caf/stringattributeset.h> |
27 #include <caf/stringattributeset.h> |
28 #include <caf/virtualpath.h> |
28 #include <caf/virtualpath.h> |
29 #include <caf/caferr.h> |
29 #include <caf/caferr.h> |
30 #include <utf.h> |
30 #include <utf.h> |
31 #include <drmagents.h> |
31 #include <drmagents.h> |
|
32 #include <featmgr.h> |
32 #include "Oma2Agent.h" |
33 #include "Oma2Agent.h" |
33 #include "Oma2AgentAttributes.h" |
34 #include "Oma2AgentAttributes.h" |
34 #include "Oma1Dcf.h" |
35 #include "Oma1Dcf.h" |
35 #include "oma2dcf.h" |
36 #include "oma2dcf.h" |
36 #include "DRMRightsClient.h" |
37 #include "DRMRightsClient.h" |
79 DRM::EDrmAllowAudioUplink | |
80 DRM::EDrmAllowAudioUplink | |
80 DRM::EDrmAllowVideoAnalog | |
81 DRM::EDrmAllowVideoAnalog | |
81 DRM::EDrmAllowVideoMacroVision | |
82 DRM::EDrmAllowVideoMacroVision | |
82 DRM::EDrmAllowAudioUsb | |
83 DRM::EDrmAllowAudioUsb | |
83 DRM::EDrmAllowAudioHdmiHdcpRequired | |
84 DRM::EDrmAllowAudioHdmiHdcpRequired | |
84 DRM::EDrmAllowAudioHdmi | |
|
85 DRM::EDrmAllowVideoHDMI | |
|
86 DRM::EDrmAllowVideoHdmiHdcpRequested | |
|
87 DRM::EDrmAllowVideoHdmiHdcpRequired; |
85 DRM::EDrmAllowVideoHdmiHdcpRequired; |
88 |
86 |
89 // ============================= LOCAL FUNCTIONS =============================== |
87 // ============================= LOCAL FUNCTIONS =============================== |
90 |
88 |
91 // ----------------------------------------------------------------------------- |
89 // ----------------------------------------------------------------------------- |
1021 { |
1019 { |
1022 TRAP(err, b = CnvUtfConverter::ConvertToUnicodeFromUtf8L(*dcf2->iSilentParameter)); |
1020 TRAP(err, b = CnvUtfConverter::ConvertToUnicodeFromUtf8L(*dcf2->iSilentParameter)); |
1023 } |
1021 } |
1024 break; |
1022 break; |
1025 case ERightsIssuerUrl: |
1023 case ERightsIssuerUrl: |
1026 #ifndef __DRM_FULL |
1024 TRAP(ret, FeatureManager::InitializeLibL()); |
1027 err = KErrNotSupported; |
1025 |
1028 #else |
1026 if (!ret && FeatureManager::FeatureSupported(KFeatureIdFfOmadrm1FullSupport)) |
1029 if (aDcfFile.iRightsIssuerURL != NULL) |
1027 { |
1030 { |
1028 if (aDcfFile.iRightsIssuerURL != NULL) |
1031 TRAP(err, b = CnvUtfConverter::ConvertToUnicodeFromUtf8L(*aDcfFile.iRightsIssuerURL)); |
1029 { |
1032 } |
1030 TRAP(err, b = CnvUtfConverter::ConvertToUnicodeFromUtf8L( |
1033 #endif |
1031 *aDcfFile.iRightsIssuerURL)); |
|
1032 } |
|
1033 } |
|
1034 else |
|
1035 { |
|
1036 err = KErrNotSupported; |
|
1037 } |
|
1038 |
|
1039 if (!ret) |
|
1040 { |
|
1041 FeatureManager::UnInitializeLib(); |
|
1042 } |
|
1043 |
1034 break; |
1044 break; |
1035 case ETransactionTrackingId: |
1045 case ETransactionTrackingId: |
1036 if (dcf2 != NULL && dcf2->iTransactionTracking) |
1046 if (dcf2 != NULL && dcf2->iTransactionTracking) |
1037 { |
1047 { |
1038 TRAP(err, b = CnvUtfConverter::ConvertToUnicodeFromUtf8L(*dcf2->iTransactionTracking)); |
1048 TRAP(err, b = CnvUtfConverter::ConvertToUnicodeFromUtf8L(*dcf2->iTransactionTracking)); |