--- a/khronosfws/openmax_al/src/mediaplayer/xaplaybackrateitf.c	Fri Jun 25 17:36:03 2010 -0500
+++ b/khronosfws/openmax_al/src/mediaplayer/xaplaybackrateitf.c	Fri Jul 09 16:43:35 2010 -0500
@@ -20,7 +20,6 @@
 #include <assert.h>
 #include "xaplaybackrateitf.h"
 
-#include "xaplaybackrateitfadaptation.h"
 #include "xaplaybackrateitfadaptationmmf.h"
 
 #include "xathreadsafety.h"
@@ -57,11 +56,7 @@
         return XA_RESULT_PARAMETER_INVALID;
     }
 
-    if(impl->adaptCtx->fwtype == FWMgrFWGST)
-        {
-        res = XAPlaybackRateItfAdapt_SetRate((XAAdaptationGstCtx*)impl->adaptCtx, rate);
-        }
-    else if(impl->adaptCtx->fwtype == FWMgrFWMMF)
+    if(impl->adaptCtx->fwtype == FWMgrFWMMF)
         {
         res = XAPlaybackRateItfAdaptMMF_SetRate((XAAdaptationMMFCtx*)impl->adaptCtx, rate);
         }
@@ -93,11 +88,8 @@
         DEBUG_API("<-XAPlaybackRateItfImpl_GetRate");
         return XA_RESULT_PARAMETER_INVALID;
     }
-    if(impl->adaptCtx->fwtype == FWMgrFWGST)
-        {
-        *pRate = impl->currentRate;
-        }
-    else if(impl->adaptCtx->fwtype == FWMgrFWMMF)
+    
+    if(impl->adaptCtx->fwtype == FWMgrFWMMF)
         {
         *pRate = impl->currentRate;
         }
@@ -127,12 +119,7 @@
         return XA_RESULT_PARAMETER_INVALID;
     }
     
-    if(impl->adaptCtx->fwtype == FWMgrFWGST)
-        {
-        /* set to adaptation */
-        res = XAPlaybackRateItfAdapt_SetPropertyConstraints((XAAdaptationGstCtx*)impl->adaptCtx, constraints);
-        }
-    else if(impl->adaptCtx->fwtype == FWMgrFWMMF)
+    if(impl->adaptCtx->fwtype == FWMgrFWMMF)
         {
         /* set to adaptation */
         res = XAPlaybackRateItfAdaptMMF_SetPropertyConstraints((XAAdaptationMMFCtx*)impl->adaptCtx, constraints);
@@ -162,12 +149,7 @@
         return XA_RESULT_PARAMETER_INVALID;
     }
    
-    if(impl->adaptCtx->fwtype == FWMgrFWGST)
-        {
-        /* needs to be queried from adaptation */
-        res = XAPlaybackRateItfAdapt_GetProperties((XAAdaptationGstCtx*)impl->adaptCtx, pProperties);
-        }
-    else if(impl->adaptCtx->fwtype == FWMgrFWMMF)
+    if(impl->adaptCtx->fwtype == FWMgrFWMMF)
         {
         /* needs to be queried from adaptation */
         res = XAPlaybackRateItfAdaptMMF_GetProperties((XAAdaptationMMFCtx*)impl->adaptCtx, pProperties);
@@ -200,12 +182,7 @@
         return XA_RESULT_PARAMETER_INVALID;
     }
     
-    if(impl->adaptCtx->fwtype == FWMgrFWGST)
-        {
-        /* needs to be queried from adaptation */
-        res = XAPlaybackRateItfAdapt_GetCapabilitiesOfRate((XAAdaptationGstCtx*)impl->adaptCtx, rate, pCapabilities);
-        }
-    else if(impl->adaptCtx->fwtype == FWMgrFWMMF)
+    if(impl->adaptCtx->fwtype == FWMgrFWMMF)
         {
         /* needs to be queried from adaptation */
         res = XAPlaybackRateItfAdaptMMF_GetCapabilitiesOfRate((XAAdaptationMMFCtx*)impl->adaptCtx, rate, pCapabilities);
@@ -240,13 +217,8 @@
         DEBUG_API("<-XAPlaybackRateItfImpl_GetRateRange");
         return XA_RESULT_PARAMETER_INVALID;
     }
-    if(impl->adaptCtx->fwtype == FWMgrFWGST)
-        {
-        /* needs to be queried from adaptation */
-        res = XAPlaybackRateItfAdapt_GetRateRange((XAAdaptationGstCtx*)impl->adaptCtx, index, pMinRate,
-                                                  pMaxRate,pStepSize, pCapabilities);
-        }
-    else if(impl->adaptCtx->fwtype == FWMgrFWMMF)
+    
+    if(impl->adaptCtx->fwtype == FWMgrFWMMF)
         {
         /* needs to be queried from adaptation */
         res = XAPlaybackRateItfAdaptMMF_GetRateRange((XAAdaptationMMFCtx*)impl->adaptCtx, index, pMinRate,