--- a/khronosfws/openmax_al/src/outputmix/xaoutputmixitf.c	Mon May 03 12:59:52 2010 +0300
+++ b/khronosfws/openmax_al/src/outputmix/xaoutputmixitf.c	Fri May 14 16:22:35 2010 +0300
@@ -16,9 +16,9 @@
 */
 
 #include "xaoutputmixitf.h"
-#ifdef _GSTREAMER_BACKEND_
-#include "XAOutputMixItfAdaptation.h"
-#endif
+
+#include "xaoutputmixitfadaptation.h"
+
 #include <assert.h>
 #include "xathreadsafety.h"
 #include "e32def.h"
@@ -65,9 +65,9 @@
         return XA_RESULT_PARAMETER_INVALID;
     }
 
-#ifdef _GSTREAMER_BACKEND_
-    ret = XAOutputMixItfAdapt_GetDestinationOutputDeviceIDs(impl->adapCtx, pNumDevices, pDeviceIDs );
-#endif
+
+    ret = XAOutputMixItfAdapt_GetDestinationOutputDeviceIDs((XAAdaptationGstCtx*)impl->adapCtx, pNumDevices, pDeviceIDs );
+
     XA_IMPL_THREAD_SAFETY_EXIT(XATSOutputMix);
     DEBUG_API_A1("<-XAOutputMixItfImpl_GetDestinationOutputDeviceIDs - pNumDevices %ld",*pNumDevices);
     return ret;
@@ -97,7 +97,7 @@
    impl->callback = callback;
    impl->cbContext = pContext;
    impl->cbPtrToSelf = self;
-#ifdef _GSTREAMER_BACKEND_
+
    if(callback)
    {   /* start listening */
        XAAdaptationBase_AddEventHandler( impl->adapCtx, &XAOutputMixItfImpl_AdaptCb, XA_OUTPUTMIXITFEVENTS, (void*)self );
@@ -106,7 +106,7 @@
    {   /* stop listening */
        XAAdaptationBase_RemoveEventHandler( impl->adapCtx, &XAOutputMixItfImpl_AdaptCb );
    }
-#endif
+
 
    DEBUG_API("<-XAOutputMixItfImpl_RegisterDeviceChangeCallback");
    return ret;
@@ -135,9 +135,9 @@
        return XA_RESULT_PARAMETER_INVALID;
    }
 
-#ifdef _GSTREAMER_BACKEND_
-   ret = XAOutputMixItfAdapt_ReRoute(impl->adapCtx, numOutputDevices, pOutputDeviceIDs );
-#endif
+
+   ret = XAOutputMixItfAdapt_ReRoute((XAAdaptationGstCtx*)impl->adapCtx, numOutputDevices, pOutputDeviceIDs );
+
 
    XA_IMPL_THREAD_SAFETY_EXIT(XATSOutputMix);
    DEBUG_API("<-XAOutputMixItfImpl_ReRoute");
@@ -148,7 +148,7 @@
 /**
  * XAVolumeItfImpl -specific methods
  **/
-#ifdef _GSTREAMER_BACKEND_
+
 
 /*
  * XAOutputMixItfImpl* XAOutputMixItfImpl_Create(XAAdaptationBaseCtx *adapCtx)
@@ -223,4 +223,4 @@
 
      DEBUG_API("<-XAOutputMixItfImpl_AdaptCb");
 }
-#endif
+