Revert "Resoving decoderHandle datatype mismatch (pxscene#710)"

This reverts commit 07c8eb1. Reported as pxscene#719
dwrobel · Jan 31, 2018 · bb6d5e2 · bb6d5e2
1 parent f8dba04
commit bb6d5e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/examples/pxScene2d/external/westeros-stub/westeros-compositor.h b/examples/pxScene2d/external/westeros-stub/westeros-compositor.h
@@ -5,7 +5,6 @@
 
 typedef unsigned int uint32_t;
 typedef int wl_fixed_t;
-typedef unsigned long long int 	uint64_t;
 
 typedef struct _WstRect
 {
@@ -60,7 +59,7 @@ typedef enum _WstHints
 typedef void (*WstTerminatedCallback)( WstCompositor *ctx, void *userData );
 typedef void (*WstDispatchCallback)( WstCompositor *ctx, void *userData );
 typedef void (*WstInvalidateSceneCallback)( WstCompositor *ctx, void *userData );
-typedef void (*WstDecodeHandlerCallback)( WstCompositor *ctx, void *userData, uint64_t decoderHandle);
+typedef void (*WstDecodeHandlerCallback)( WstCompositor *ctx, void *userData, uint32_t decoderHandle);
 typedef void (*WstHidePointerCallback)( WstCompositor *ctx, bool hidePointer, void *userData );
 typedef void (*WstClientStatus)( WstCompositor *ctx, int status, int clientPID, int detail, void *userData );
 

diff --git a/examples/pxScene2d/src/pxWayland.cpp b/examples/pxScene2d/src/pxWayland.cpp
@@ -615,11 +615,11 @@ void pxWayland::invalidate( WstCompositor *wctx, void *userData )
    pxw->handleInvalidate();
 }
 
-void pxWayland::decoderHandleCallback( WstCompositor *wctx, void *userData, uint64_t decodeHandle)
+void pxWayland::decoderHandleCallback( WstCompositor *wctx, void *userData, void* decodeHandle)
 {
    (void)wctx;
    pxWayland *pxw= (pxWayland*)userData;
-   pxw->setDecoderHandle((void*)decodeHandle);
+   pxw->setDecoderHandle(decodeHandle);
 }
 
 void pxWayland::hidePointer( WstCompositor *wctx, bool hide, void *userData )

diff --git a/examples/pxScene2d/src/pxWayland.h b/examples/pxScene2d/src/pxWayland.h
@@ -176,7 +176,7 @@ class pxWayland: public pxIView {
   pxMatrix4f mLastMatrix;
 
   static void invalidate( WstCompositor *wctx, void *userData );
-  static void decoderHandleCallback( WstCompositor *wctx, void *userData, uint64_t decoderHandle);
+  static void decoderHandleCallback( WstCompositor *wctx, void *userData,void* decoderHandle);
   static void hidePointer( WstCompositor *wctx, bool hide, void *userData );
   static void clientStatus( WstCompositor *wctx, int status, int pid, int detail, void *userData );
   static void remoteDisconnectedCB(void *data);