Index: hxresult.h
===================================================================
RCS file: /cvsroot/common/include/hxresult.h,v
retrieving revision 1.37.2.2
diff -u -w -r1.37.2.2 hxresult.h
--- hxresult.h	24 Feb 2006 20:03:31 -0000	1.37.2.2
+++ hxresult.h	6 Apr 2006 19:36:55 -0000
@@ -452,6 +452,7 @@
 #define HXR_COULD_NOT_DISPLAY           MAKE_HX_RESULT(1,SS_MSC,16)                 // 800401d0
 #define HXR_VSRC_DISABLED               MAKE_HX_RESULT(1,SS_MSC,17)                 // 800401d1
 #define HXR_VSRC_NOCLIP                 MAKE_HX_RESULT(1,SS_MSC,18)                 // 800401d2
+#define HXR_SET_SECURE_OUT_FAIL         MAKE_HX_RESULT(1,SS_MSC,20)                 // 800401d4
 
 #define HXR_RESOURCE_NOT_CACHED         MAKE_HX_RESULT(1,SS_RSC,1)                  // 80040301
 #define HXR_RESOURCE_NOT_FOUND          MAKE_HX_RESULT(1,SS_RSC,2)                  // 80040302
Index: hxmmfctrlimpl.cpp
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/hxmmfctrlimpl.cpp,v
retrieving revision 1.12.2.20
diff -u -w -r1.12.2.20 hxmmfctrlimpl.cpp
--- hxmmfctrlimpl.cpp	28 Mar 2006 21:14:44 -0000	1.12.2.20
+++ hxmmfctrlimpl.cpp	6 Apr 2006 19:37:32 -0000
@@ -176,7 +176,8 @@
     { HXR_DNR,                    KErrCouldNotConnect      },
     { HXR_PARSE_ERROR,            KErrNotSupported         },
     { HXR_BAD_FORMAT,             KErrNotSupported         },
-    { HXR_DEC_NOT_FOUND,          KErrNotSupported         }
+    { HXR_DEC_NOT_FOUND,          KErrNotSupported         },
+    { HXR_SET_SECURE_OUT_FAIL,    KErrNotSupported         }
 /*
     { scUserStopped,           KErrCancel               },
     { scCanceled,              KErrCancel               },
Index: clntcoredll_symbian.pcf
===================================================================
RCS file: /cvsroot/client/core/clntcoredll_symbian.pcf,v
retrieving revision 1.11.2.1
diff -u -w -r1.11.2.1 clntcoredll_symbian.pcf
--- clntcoredll_symbian.pcf	23 Mar 2006 16:22:59 -0000	1.11.2.1
+++ clntcoredll_symbian.pcf	6 Apr 2006 19:37:51 -0000
@@ -59,6 +59,8 @@
 if project.IsDefined('HELIX_FEATURE_NETSERVICES_SHIM'):
     project.AddSystemLibraries('intconninit.lib')
 
+if project.IsDefined('HELIX_FEATURE_DRM_SECURE_OUTPUT'):
+    project.AddSystemLibraries("AudioOutputRouting.lib")
 
 if (not project.IsDefined('_SYMBIAN_61_')):
     project.AddSystemLibraries('connmon.lib')