equal
deleted
inserted
replaced
17 |
17 |
18 |
18 |
19 // INCLUDE FILES |
19 // INCLUDE FILES |
20 #include <s32file.h> |
20 #include <s32file.h> |
21 #include <etelmm.h> |
21 #include <etelmm.h> |
|
22 #include <featmgr.h> |
22 #include "DRMRightsClient.h" |
23 #include "DRMRightsClient.h" |
23 #include "DRMEngineClientServer.h" |
24 #include "DRMEngineClientServer.h" |
24 #include "DrmPermission.h" |
25 #include "DrmPermission.h" |
25 #include "DrmAsset.h" |
26 #include "DrmAsset.h" |
26 #include "drmlog.h" |
27 #include "drmlog.h" |
155 break; |
156 break; |
156 } |
157 } |
157 } |
158 } |
158 |
159 |
159 #ifdef __DRM_FULL |
160 #ifdef __DRM_FULL |
160 // startup code, if it starts it starts if not it will be tried again. |
161 |
161 RDRMHelper helper; |
162 TRAP( ret, FeatureManager::InitializeLibL() ); |
162 TInt ignore = helper.Connect(); // Start HelperServer |
163 |
163 helper.Close(); |
164 if ( !ret && FeatureManager::FeatureSupported( KFeatureIdFfOmadrm1FullSupport ) ) |
164 #endif |
165 { |
|
166 // startup code, if it starts it starts if not it will be tried again. |
|
167 RDRMHelper helper; |
|
168 TInt ignore = helper.Connect(); // Start HelperServer |
|
169 helper.Close(); |
|
170 } |
|
171 |
|
172 if ( !ret ) |
|
173 { |
|
174 FeatureManager::UnInitializeLib(); |
|
175 } |
|
176 |
|
177 #endif |
165 |
178 |
166 DRMLOG2( _L( "RDRMRightsClient::Connect(): Result: %d" ), ret ); |
179 DRMLOG2( _L( "RDRMRightsClient::Connect(): Result: %d" ), ret ); |
167 |
180 |
168 return ret; |
181 return ret; |
169 } |
182 } |
839 while (offset < size) |
852 while (offset < size) |
840 { |
853 { |
841 Mem::Copy( &roSize, ptr.Ptr()+offset, sizeof(TInt) ); |
854 Mem::Copy( &roSize, ptr.Ptr()+offset, sizeof(TInt) ); |
842 offset += sizeof (TInt); |
855 offset += sizeof (TInt); |
843 ro = ptr.Mid(offset, roSize).AllocL(); |
856 ro = ptr.Mid(offset, roSize).AllocL(); |
844 CleanupStack::PushL( ro ); |
857 aRoList.Append(ro); |
845 aRoList.AppendL (ro); |
|
846 CleanupStack::Pop( ro ); |
|
847 offset += roSize; |
858 offset += roSize; |
848 } |
859 } |
849 CleanupStack::PopAndDestroy(); |
860 CleanupStack::PopAndDestroy(); |
850 } |
861 } |
851 }; |
862 }; |