diff -r 2ed61feeead6 -r 6f7ceef7b1d1 khronosfws/openmax_al/src/common/xadynamicsourceitf.c
--- a/khronosfws/openmax_al/src/common/xadynamicsourceitf.c	Fri May 28 19:26:28 2010 -0500
+++ b/khronosfws/openmax_al/src/common/xadynamicsourceitf.c	Fri Jun 11 19:59:23 2010 -0500
@@ -1,29 +1,28 @@
 /*
-* Copyright (c) 2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
+ * Copyright (c) 2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Dynamic Source Interface Implementation
+ *
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include "xadynamicsourceitf.h"
- 
+
 #include "xadynamicsourceitfadaptation.h"
 #include "xadynamicsourceitfadaptationmmf.h"
 
-
 /*****************************************************************************
  * Base interface XADynamicSourceItf implementation
  *****************************************************************************/
@@ -32,45 +31,44 @@
  * Description: Sets the data source for the object.
  */
 XAresult XADynamicSourceItfImpl_SetSource(XADynamicSourceItf self,
-                                          XADataSource *pDataSource)
-{
+        XADataSource *pDataSource)
+    {
     XAresult res = XA_RESULT_SUCCESS;
-    XADynamicSourceItfImpl* impl = (XADynamicSourceItfImpl*)(*self);
+    XADynamicSourceItfImpl* impl = (XADynamicSourceItfImpl*) (*self);
     DEBUG_API("->XADynamicSourceItfImpl_SetSource");
     /* check casting */
-    if( !impl ||  impl != impl->self || !pDataSource )
-    {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-        DEBUG_API("<-XADynamicSourceItfImpl_SetSource");
+    if (!impl || impl != impl->self || !pDataSource)
+        {
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-XADynamicSourceItfImpl_SetSource");
         return XA_RESULT_PARAMETER_INVALID;
-    }
- 
-    if( !impl->adaptCtx )
-    {
-        DEBUG_ERR("Adaptation not ready!!");
-        DEBUG_ERR("XA_RESULT_INTERNAL_ERROR");
-        DEBUG_API("<-XADynamicSourceItfImpl_SetSource");
+        }
+
+    if (!impl->adaptCtx)
+        {
+        DEBUG_ERR("Adaptation not ready!!");DEBUG_ERR("XA_RESULT_INTERNAL_ERROR");DEBUG_API("<-XADynamicSourceItfImpl_SetSource");
         res = XA_RESULT_INTERNAL_ERROR;
-    }
+        }
     else
-    {
-        res = XACommon_CheckDataSource(pDataSource,NULL);
-        if(res==XA_RESULT_SUCCESS)
         {
-            if(impl->adaptCtx->fwtype == FWMgrFWGST)
+        res = XACommon_CheckDataSource(pDataSource, NULL);
+        if (res == XA_RESULT_SUCCESS)
+            {
+            if (impl->adaptCtx->fwtype == FWMgrFWGST)
                 {
-                res = XADynamicSourceItfAdapt_SetSource((XAAdaptationGstCtx*)impl->adaptCtx, pDataSource );
+                res = XADynamicSourceItfAdapt_SetSource(
+                        (XAAdaptationGstCtx*) impl->adaptCtx, pDataSource);
                 }
             else
                 {
-                res = XADynamicSourceItfAdaptMMF_SetSource((XAAdaptationMMFCtx*)impl->adaptCtx, pDataSource );
+                res = XADynamicSourceItfAdaptMMF_SetSource(
+                        (XAAdaptationMMFCtx*) impl->adaptCtx, pDataSource);
                 }
+            }
         }
-    }
 
     DEBUG_API("<-XADynamicSourceItfImpl_SetSource");
     return res;
-}
+    }
 
 /*****************************************************************************
  * XADynamicSourceItfImpl -specific methods
@@ -79,33 +77,32 @@
 /* XADynamicSourceItfImpl* XADynamicSourceItfImpl_Create()
  * Description: Allocate and initialize DynamicSourceItfImpl
  */
-XADynamicSourceItfImpl* XADynamicSourceItfImpl_Create( XAAdaptationBaseCtx *adaptCtx )
-{
-    XADynamicSourceItfImpl* self = (XADynamicSourceItfImpl*)
-        calloc(1,sizeof(XADynamicSourceItfImpl));
-    
+XADynamicSourceItfImpl* XADynamicSourceItfImpl_Create(
+        XAAdaptationBaseCtx *adaptCtx)
+    {
+    XADynamicSourceItfImpl* self = (XADynamicSourceItfImpl*) calloc(1,
+            sizeof(XADynamicSourceItfImpl));
+
     DEBUG_API("->XADynamicSourceItfImpl_Create");
-    if( self )
-    {
+    if (self)
+        {
         /* init itf default implementation */
         self->itf.SetSource = XADynamicSourceItfImpl_SetSource;
         /* init variables */
         self->adaptCtx = adaptCtx;
         self->self = self;
+        }DEBUG_API("<-XADynamicSourceItfImpl_Create");
+    return self;
     }
-    DEBUG_API("<-XADynamicSourceItfImpl_Create");
-    return self;
-}
 
 /* void XADynamicSourceItfImpl_Free(XADynamicSourceItfImpl* self)
  * Description: Free all resources reserved at XADynamicSourceItfImpl_Create
  */
 void XADynamicSourceItfImpl_Free(XADynamicSourceItfImpl* self)
-{
+    {
     DEBUG_API("->XADynamicSourceItfImpl_Free");
     assert( self==self->self );
-    free( self );
+    free(self);
     DEBUG_API("<-XADynamicSourceItfImpl_Free");
-}
+    }
 
-