--- a/khronosfws/openmax_al/src/gst_adaptation/xaadaptationgst.h	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/gst_adaptation/xaadaptationgst.h	Mon Oct 04 00:51:56 2010 +0300
@@ -22,71 +22,19 @@
 #include <semaphore.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <gst/gst.h>
-#include <gst/app/gstappsrc.h>
-#include <gst/app/gstappsink.h>
-#include <gst/app/gstappbuffer.h>
 #include "openmaxalwrapper.h"
-#include "xaglobals.h"
-#include "xaplatform.h"
 #include "xaadptbasectx.h"
-#include <stdlib.h>
+
 
 #ifdef XA_IMPL_MEASURE_GST_DELAY
 #include <time.h>
 #endif /* XA_IMPL_MEASURE_GST_DELAY */
 
-/* MACROS */
-#define FLIP_NONE               0
-#define FLIP_CLOCKWISE          1 /* Rotate clockwise 90 degrees */
-#define FLIP_ROTATE_180         2 /* Rotate 180 degrees */
-#define FLIP_COUNTERCLOCKWISE   3 /* Rotate counter-clockwise 90 degrees */
-#define FLIP_HORIZONTAL         4 /* Flip image horizontally */
-#define FLIP_VERTICAL           5 /* Flip image vertically */
-
 /* TYPEDEFS */
 typedef gboolean (*GstBusCb)(GstBus *bus, GstMessage *message, gpointer data);
 
-#define CONTENT_PIPE_BUFFER_SIZE 1000
-#define TEST_VIDEO_WIDTH     640
-#define TEST_VIDEO_HEIGHT    480
-
-/*typedef enum
- {
- XA_AUDIO_WAVENC = 0,
- XA_AUDIO_VORBISENC,
- XA_AUDIO_PCM,
- XA_NUM_OF_AUDIOENCODERS  Do not move this line 
- } XAAudioEnc;*/
-
-/*typedef enum
- {
- XA_VIDEO_JPEGENC = 0,
- XA_VIDEO_THEORAENC,
- XA_NUM_OF_VIDEOENCODERS  Do not move this line 
- } XAVideoEnc;*/
-
-/*typedef enum CP_STATE
- {
- CPStateNull =0,
- CPStateInitialized,
- CPStatePrerolling,
- CPStateStarted,
- CPStateRunning,
- CPStatePaused,
- CPStateStopped,
- CPStateWaitForData,
- CPStateEOS,
- CPStateError
- }CP_STATE;*/
-
-/*typedef enum
- {
- XA_IMAGE_JPEGENC = 0,
- XA_IMAGE_RAW,
- XA_NUM_OF_IMAGEENCODERS  Do not move this line 
- } XAImageEnc;*/
-
 /* STRUCTURES */
 
 /* Forward declaration of adaptation basecontext */
@@ -108,7 +56,8 @@
     GMainLoop *busloop; /** Gst-bus listener loop **/
     pthread_t busloopThr;
     GstBusCb busCb; /** Gst-Bus callback funtion*/
-
+    GError* busError;
+    
     XAboolean waitingasyncop;
     sem_t semAsyncWait;
     guint asynctimer;
@@ -151,19 +100,11 @@
 void XAAdaptationGst_CompleteAsyncWait(XAAdaptationGstCtx* ctx);
 
 GstElement* XAAdaptationGst_CreateGstSource(XADataSource* xaSrc,
-        const char *name, XAboolean *isobj, XAboolean *isPCM,
-        XAboolean *isRawImage);
+        const char *name, XAboolean *isPCM );
 GstElement* XAAdaptationGst_CreateGstSink(XADataSink* xaSrc,
-        const char *name, XAboolean *isobj);
-GstElement* XAAdaptationGst_CreateVideoPP(void);
+        const char *name);
 
-GstElement* XAAdaptationGst_CreateVideoPPBlackScr(void);
-GstElement* XAAdaptationGst_CreateInputSelector(void);
-GstElement* XAAdaptationGst_CreateAudioPP(void);
 void XAAdaptationGst_PadBlockCb(GstPad *pad, gboolean blocked,
         gpointer user_data);
-void XAAdaptationGst_SetAllCaps(GstCaps * caps, char *field, ...);
-
-/*XAresult XAMetadataAdapt_TryWriteTags(XAAdaptationGstCtx* mCtx, GstBin* binToWriteTo);*/
 
 #endif /* XAADAPTATIONGST_H_ */