To avoid 64bit build error 77/44877/2 submit/tizen/20150728.084621
authorHyongtaek Lim <hyongtaek.lim@samsung.com>
Wed, 29 Jul 2015 01:57:05 +0000 (10:57 +0900)
committerHyongtaek Lim <hyongtaek.lim@samsung.com>
Wed, 29 Jul 2015 03:35:50 +0000 (12:35 +0900)
Signed-off-by: Hyongtaek Lim <hyongtaek.lim@samsung.com>
Change-Id: I91a5c53c2b9ba3f9652cd9be8e69b6ea811b1f0c

src/player.c
src/player_internal.c

index bcc48e4..95753b0 100644 (file)
@@ -30,7 +30,9 @@
 #include <Ecore.h>
 #include <Elementary.h>
 #include <Ecore.h>
+#ifdef HAVE_WAYLAND
 #include <Ecore_Wayland.h>
+#endif
 #include <tbm_bufmgr.h>
 #include <tbm_surface_internal.h>
 
@@ -97,7 +99,7 @@
                        { \
                                g_cond_wait (&handle->message_queue_cond,&handle->message_queue_lock); \
                        } \
-                       handle->current_message = (int)g_queue_pop_head (handle->message_queue); \
+                       handle->current_message = (int)(intptr_t)g_queue_pop_head (handle->message_queue); \
                        g_mutex_unlock (&handle->message_queue_lock); \
                        LOGI("Retrived  message [%d] from queue",handle->current_message); \
                }else{ \
@@ -1052,8 +1054,10 @@ static MMDisplaySurfaceType __player_convet_display_type(player_display_type_e t
        switch(type) {
        case PLAYER_DISPLAY_TYPE_OVERLAY:
                return MM_DISPLAY_SURFACE_X;
+#ifdef TIZEN_MOBILE
        case PLAYER_DISPLAY_TYPE_EVAS:
                return MM_DISPLAY_SURFACE_EVAS;
+#endif
        case PLAYER_DISPLAY_TYPE_NONE:
                return MM_DISPLAY_SURFACE_NULL;
        default :
index 9275b04..21dec79 100644 (file)
@@ -122,8 +122,10 @@ static MMDisplaySurfaceType __player_mused_convet_display_type(player_display_ty
        switch(type) {
        case PLAYER_DISPLAY_TYPE_OVERLAY:
                return MM_DISPLAY_SURFACE_REMOTE;
+#ifdef TIZEN_MOBILE
        case PLAYER_DISPLAY_TYPE_EVAS:
                return MM_DISPLAY_SURFACE_EVAS;
+#endif
        case PLAYER_DISPLAY_TYPE_NONE:
                return MM_DISPLAY_SURFACE_NULL;
        default :
@@ -133,7 +135,7 @@ static MMDisplaySurfaceType __player_mused_convet_display_type(player_display_ty
 
 
 #ifdef HAVE_WAYLAND
-int player_set_display_wl_for_mused(player_h player, player_display_type_e type, unsigned int surface,
+int player_set_display_wl_for_mused(player_h player, player_display_type_e type, intptr_t surface,
                int x, int y, int w, int h)
 {
        PLAYER_INSTANCE_CHECK(player);