omadrm/drmengine/agentv2/src/Oma2AgentManager.cpp
branchRCL_3
changeset 71 1221b68b8a5f
parent 41 29f3cf766061
child 72 1481bf457703
equal deleted inserted replaced
67:50c53e893c3f 71:1221b68b8a5f
    30 #include <apgtask.h>
    30 #include <apgtask.h>
    31 #include <apgcli.h>
    31 #include <apgcli.h>
    32 #include <apaserverapp.h>
    32 #include <apaserverapp.h>
    33 #include <sysutil.h>
    33 #include <sysutil.h>
    34 #include <centralrepository.h>
    34 #include <centralrepository.h>
    35 #include <featmgr.h>
       
    36 
    35 
    37 #include "Oma2AgentManager.h"
    36 #include "Oma2AgentManager.h"
    38 #include "Oma2AgentAttributes.h"
    37 #include "Oma2AgentAttributes.h"
    39 #include "Oma1Dcf.h"
    38 #include "Oma1Dcf.h"
    40 #include "oma2dcf.h"
    39 #include "oma2dcf.h"
   129             {
   128             {
   130             delete iOmaBasedMimeType;
   129             delete iOmaBasedMimeType;
   131             }
   130             }
   132         iOmaBasedMimeType = NULL;
   131         iOmaBasedMimeType = NULL;
   133         }
   132         }
   134     
   133 
   135     FeatureManager::InitializeLibL();
       
   136     
       
   137     }
   134     }
   138 
   135 
   139 // -----------------------------------------------------------------------------
   136 // -----------------------------------------------------------------------------
   140 // COma2AgentManager::FetchOmaBasedInfoL
   137 // COma2AgentManager::FetchOmaBasedInfoL
   141 // -----------------------------------------------------------------------------
   138 // -----------------------------------------------------------------------------
   201         delete iNotifier;
   198         delete iNotifier;
   202         }
   199         }
   203     delete iWatchedId;
   200     delete iWatchedId;
   204 
   201 
   205     delete iOmaBasedMimeType;
   202     delete iOmaBasedMimeType;
   206     
       
   207     FeatureManager::UnInitializeLib();
       
   208     }
   203     }
   209 
   204 
   210 // -----------------------------------------------------------------------------
   205 // -----------------------------------------------------------------------------
   211 // COma2AgentManager::DeleteFile
   206 // COma2AgentManager::DeleteFile
   212 // -----------------------------------------------------------------------------
   207 // -----------------------------------------------------------------------------
   726     {
   721     {
   727     TBool r = EFalse;
   722     TBool r = EFalse;
   728     TInt err = KErrNone;
   723     TInt err = KErrNone;
   729     CDcfCommon* dcf = NULL;
   724     CDcfCommon* dcf = NULL;
   730 
   725 
   731 #ifdef __DRM_OMA2   
   726 #ifdef __DRM_OMA2
   732     if ( !aFileName.Right(4).CompareF( KOma2DcfExtension ) ||
   727     if ( !aFileName.Right(4).CompareF( KOma2DcfExtension ) ||
   733             !aFileName.Right(4).CompareF( KOma2DcfExtensionAudio ) ||
   728         !aFileName.Right(4).CompareF( KOma2DcfExtensionAudio ) ||
   734             !aFileName.Right(4).CompareF( KOma2DcfExtensionVideo ) ||
   729         !aFileName.Right(4).CompareF( KOma2DcfExtensionVideo ) ||
   735             COma2Dcf::IsValidDcf(aBuffer) )
   730         COma2Dcf::IsValidDcf(aBuffer) )
   736         {
   731         {
   737         aFileMimeType.Copy(KOma2DcfContentType);
   732         aFileMimeType.Copy(KOma2DcfContentType);
   738         aContentMimeType.Copy(KCafMimeType);
   733         aContentMimeType.Copy(KCafMimeType);
   739         r = ETrue; // file was recognized as OMA2 DCF
   734         r = ETrue; // file was recognized as OMA2 DCF
   740         }
   735         }
   798         {
   793         {
   799         case EOmaDrmMethods:
   794         case EOmaDrmMethods:
   800                 {
   795                 {
   801                 aOutputBuffer.Copy(_L8("FL CD SD"));
   796                 aOutputBuffer.Copy(_L8("FL CD SD"));
   802 #ifdef __DRM_OMA2
   797 #ifdef __DRM_OMA2
   803                 if( FeatureManager::FeatureSupported( 
   798                 aOutputBuffer.Append(_L8(" OMADRM2"));
   804                         KFeatureIdFfOmadrm2Support ) )
       
   805                     {
       
   806                     aOutputBuffer.Append(_L8(" OMADRM2"));
       
   807                     }
       
   808 #endif
   799 #endif
   809                 }
   800                 }
   810             break;
   801             break;
   811         case ESetPendingRightsETA:
   802         case ESetPendingRightsETA:
   812                 {
   803                 {