--- a/omadrm/drmengine/agentv2/src/Oma2AgentManager.cpp Thu Aug 19 10:12:10 2010 +0300
+++ b/omadrm/drmengine/agentv2/src/Oma2AgentManager.cpp Tue Aug 31 15:29:38 2010 +0300
@@ -32,7 +32,6 @@
#include <apaserverapp.h>
#include <sysutil.h>
#include <centralrepository.h>
-#include <featmgr.h>
#include "Oma2AgentManager.h"
#include "Oma2AgentAttributes.h"
@@ -131,9 +130,7 @@
}
iOmaBasedMimeType = NULL;
}
-
- FeatureManager::InitializeLibL();
-
+
}
// -----------------------------------------------------------------------------
@@ -203,8 +200,6 @@
delete iWatchedId;
delete iOmaBasedMimeType;
-
- FeatureManager::UnInitializeLib();
}
// -----------------------------------------------------------------------------
@@ -728,11 +723,11 @@
TInt err = KErrNone;
CDcfCommon* dcf = NULL;
-#ifdef __DRM_OMA2
+#ifdef __DRM_OMA2
if ( !aFileName.Right(4).CompareF( KOma2DcfExtension ) ||
- !aFileName.Right(4).CompareF( KOma2DcfExtensionAudio ) ||
- !aFileName.Right(4).CompareF( KOma2DcfExtensionVideo ) ||
- COma2Dcf::IsValidDcf(aBuffer) )
+ !aFileName.Right(4).CompareF( KOma2DcfExtensionAudio ) ||
+ !aFileName.Right(4).CompareF( KOma2DcfExtensionVideo ) ||
+ COma2Dcf::IsValidDcf(aBuffer) )
{
aFileMimeType.Copy(KOma2DcfContentType);
aContentMimeType.Copy(KCafMimeType);
@@ -800,11 +795,7 @@
{
aOutputBuffer.Copy(_L8("FL CD SD"));
#ifdef __DRM_OMA2
- if( FeatureManager::FeatureSupported(
- KFeatureIdFfOmadrm2Support ) )
- {
- aOutputBuffer.Append(_L8(" OMADRM2"));
- }
+ aOutputBuffer.Append(_L8(" OMADRM2"));
#endif
}
break;