--- a/khronosfws/openmax_al/src/engine/xacameracapabilitiesitf.c	Mon May 03 12:59:52 2010 +0300
+++ b/khronosfws/openmax_al/src/engine/xacameracapabilitiesitf.c	Fri May 14 16:22:35 2010 +0300
@@ -20,10 +20,10 @@
 #include <assert.h>
 #include "xaglobals.h"
 #include "xacameracapabilitiesitf.h"
-#ifdef _GSTREAMER_BACKEND_  
-#include "XAStaticCapsAdaptation.h"
-#include "XAStaticCameraCapsAdaptation.h"
-#endif
+  
+
+#include "xastaticcameracapsadaptation.h"
+
 
 static XACameraCapabilitiesItfImpl* GetImpl(XACameraCapabilitiesItf self)
 {
@@ -57,9 +57,9 @@
         DEBUG_API("<-XACameraCapabilitiesItfImpl_GetCameraCapabilities");
         return XA_RESULT_PARAMETER_INVALID;
     }
-#ifdef _GSTREAMER_BACKEND_  
+  
     ret = XAStaticCameraCaps_GetCameraCapabilities(pIndex,pCameraDeviceID,pDescriptor);
-#endif
+
     DEBUG_API("<-XACameraCapabilitiesItfImpl_GetCameraCapabilities");
     return ret;
 }
@@ -83,10 +83,10 @@
         DEBUG_API("<-XACameraCapabilitiesItfImpl_QueryFocusRegionPatterns");
         return XA_RESULT_PARAMETER_INVALID;
     }
-#ifdef _GSTREAMER_BACKEND_  
+  
     ret = XAStaticCameraCaps_QueryFocusRegionPatterns(
             cameraDeviceID, pPatternID, pFocusPattern,pCustomPoints1,pCustomPoints2);
-#endif
+
     DEBUG_API("<-XACameraCapabilitiesItfImpl_QueryFocusRegionPatterns");
     return ret;
 }
@@ -108,10 +108,10 @@
         DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedAutoLocks");
         return XA_RESULT_PARAMETER_INVALID;
     }
-#ifdef _GSTREAMER_BACKEND_  
+  
     ret = XAStaticCameraCaps_GetSupportedAutoLocks(
                 cameraDeviceID, pNumCombinations, ppLocks);
-#endif
+
     DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedAutoLocks");
     return ret;
 }
@@ -136,10 +136,10 @@
         DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedFocusManualSettings");
         return XA_RESULT_PARAMETER_INVALID;
     }
-#ifdef _GSTREAMER_BACKEND_  
+  
     ret = XAStaticCameraCaps_GetSupportedFocusManualSettings(
             cameraDeviceID, macroEnabled,pMinValue, pMaxValue, pNumSettings, ppSettings);
-#endif
+
     DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedFocusManualSettings");
     return ret;
 }
@@ -163,10 +163,10 @@
         DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedISOSensitivitySettings");
         return XA_RESULT_PARAMETER_INVALID;
     }
-#ifdef _GSTREAMER_BACKEND_  
+  
     ret = XAStaticCameraCaps_GetSupportedISOSensitivitySettings(
                 cameraDeviceID, pMinValue, pMaxValue, pNumSettings, ppSettings );
-#endif
+
     DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedISOSensitivitySettings");
     return ret;
 }
@@ -190,10 +190,10 @@
         DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedApertureManualSettings");
         return XA_RESULT_PARAMETER_INVALID;
     }
-#ifdef _GSTREAMER_BACKEND_  
+  
     ret = XAStaticCameraCaps_GetSupportedApertureManualSettings(
                 cameraDeviceID, pMinValue, pMaxValue, pNumSettings, ppSettings );
-#endif
+
     DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedApertureManualSettings");
     return ret;
 }
@@ -217,10 +217,10 @@
         DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedShutterSpeedManualSettings");
         return XA_RESULT_PARAMETER_INVALID;
     }
-#ifdef _GSTREAMER_BACKEND_  
+  
     ret = XAStaticCameraCaps_GetSupportedShutterSpeedManualSettings(
                 cameraDeviceID, pMinValue, pMaxValue, pNumSettings, ppSettings);
-#endif
+
     DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedShutterSpeedManualSettings");
     return ret;
 }
@@ -244,10 +244,10 @@
         DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedWhiteBalanceManualSettings");
         return XA_RESULT_PARAMETER_INVALID;
     }
-#ifdef _GSTREAMER_BACKEND_  
+  
     ret = XAStaticCameraCaps_GetSupportedWhiteBalanceManualSettings(
                 cameraDeviceID, pMinValue, pMaxValue, pNumSettings, ppSettings);
-#endif
+
     DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedWhiteBalanceManualSettings");
     return ret;
 }
@@ -273,20 +273,20 @@
         DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedZoomSettings");
         return XA_RESULT_PARAMETER_INVALID;
     }
-#ifdef _GSTREAMER_BACKEND_  
+  
     ret = XAStaticCameraCaps_GetSupportedZoomSettings(
                 cameraDeviceID, digitalEnabled, macroEnabled, pMaxValue,
                 pNumSettings, ppSettings, pSpeedSupported);
-#endif
+
     DEBUG_API("<-XACameraCapabilitiesItfImpl_GetSupportedZoomSettings");
     return ret;
 }
 
-#ifdef _GSTREAMER_BACKEND_  
+  
 /**
  * XACameraCapabilitiesItfImpl -specific methods
  **/
-XACameraCapabilitiesItfImpl* XACameraCapabilitiesItfImpl_Create()
+XACameraCapabilitiesItfImpl* XACameraCapabilitiesItfImpl_Create(void)
 {
     XACameraCapabilitiesItfImpl* self = (XACameraCapabilitiesItfImpl*)
         calloc(1,sizeof(XACameraCapabilitiesItfImpl));
@@ -327,4 +327,4 @@
     free(self);
     DEBUG_API("<-XACameraCapabilitiesItfImpl_Free");
 }
-#endif
+