--- a/khronosfws/openmax_al/src/metadataextractor/xametadataextractor.h	Mon May 03 12:59:52 2010 +0300
+++ b/khronosfws/openmax_al/src/metadataextractor/xametadataextractor.h	Fri May 14 16:22:35 2010 +0300
@@ -21,9 +21,8 @@
 #include "openmaxalwrapper.h"
 #include "xaobjectitf.h"
 #include "xaglobals.h"
-#ifdef _GSTREAMER_BACKEND_
-#include "XAMetadataAdaptCtx.h"
-#endif
+#include "xaadptbasectx.h"
+
 
 /** MACROS **/
 
@@ -52,10 +51,13 @@
     /* Parent for XAMetadataExtractorImpl */
     XAObjectItfImpl baseObj; /* <-keep this first */
 
-#ifdef _GSTREAMER_BACKEND_
     /* variables */
-    XAAdaptationBaseCtx* adaptationCtx;
-#endif
+    XADataSource *dataSrc;
+	
+    XAAdaptationBaseCtx* curAdaptCtx;
+    XAAdaptationBaseCtx* adaptationCtxGst;
+    XAAdaptationBaseCtx* adaptationCtxMMF;
+
 } XAMetadataExtractorImpl;