FCL/sf/mw/drm: changeset 37:bd9b181e836a

author	William Roberts <williamr@symbian.org>
	Fri, 28 May 2010 13:54:35 +0100
branch	RCL_3
changeset 37	bd9b181e836a
parent 36	ce3df08ce7f6 (diff)
parent 33	5791d6d30409 (current diff)
child 58	5816b2634c8a

Re-merge fixes for bug 2707, bug 2121 and bug 1993

--- a/omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp	Tue May 18 16:44:25 2010 +0100
+++ b/omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp	Fri May 28 13:54:35 2010 +0100
@@ -468,7 +468,11 @@
             case DRM::EDrmAllowedOutputs:
                 if( dcf2 )
                     {
-                    value = DRM::EDrmAllowAudioAnalog | DRM::EDrmAllowAudioBluetooth | DRM::EDrmAllowVideoMacroVision | DRM::EDrmAllowAudioFmTransmitter;
+                    value = DRM::EDrmAllowAudioAnalog | 
+                            DRM::EDrmAllowAudioBluetooth | 
+                            DRM::EDrmAllowVideoMacroVision | 
+                            DRM::EDrmAllowAudioFmTransmitter | 
+                            DRM::EDrmAllowAudioUsb;
                     }
                 else
                     {
@@ -707,7 +711,11 @@
             case DRM::EDrmAllowedOutputs:
                 if( dcf2 )
                     {
-                    value = DRM::EDrmAllowAudioAnalog | DRM::EDrmAllowAudioBluetooth | DRM::EDrmAllowVideoMacroVision | DRM::EDrmAllowAudioFmTransmitter;
+                    value = DRM::EDrmAllowAudioAnalog | 
+                            DRM::EDrmAllowAudioBluetooth | 
+                            DRM::EDrmAllowVideoMacroVision | 
+                            DRM::EDrmAllowAudioFmTransmitter | 
+                            DRM::EDrmAllowAudioUsb;
                     }
                 else
                     {