--- a/omadrm/drmengine/agentv2/src/Oma2AgentManager.cpp Tue Apr 27 16:56:11 2010 +0300
+++ b/omadrm/drmengine/agentv2/src/Oma2AgentManager.cpp Tue May 11 16:28:38 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005 - 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005 - 2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -32,6 +32,7 @@
#include <apaserverapp.h>
#include <sysutil.h>
#include <centralrepository.h>
+#include <featmgr.h>
#include "Oma2AgentManager.h"
#include "Oma2AgentAttributes.h"
@@ -130,7 +131,9 @@
}
iOmaBasedMimeType = NULL;
}
-
+
+ FeatureManager::InitializeLibL();
+
}
// -----------------------------------------------------------------------------
@@ -200,6 +203,8 @@
delete iWatchedId;
delete iOmaBasedMimeType;
+
+ FeatureManager::UnInitializeLib();
}
// -----------------------------------------------------------------------------
@@ -723,11 +728,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);
@@ -795,7 +800,11 @@
{
aOutputBuffer.Copy(_L8("FL CD SD"));
#ifdef __DRM_OMA2
- aOutputBuffer.Append(_L8(" OMADRM2"));
+ if( FeatureManager::FeatureSupported(
+ KFeatureIdFfOmadrm2Support ) )
+ {
+ aOutputBuffer.Append(_L8(" OMADRM2"));
+ }
#endif
}
break;