To avoid 64bit build error

Signed-off-by: Hyongtaek Lim <hyongtaek.lim@samsung.com>
Change-Id: I9a92eb6397c35309b8e930957b43cb214f0a6f1b

diff --git a/src/mm_player.c b/src/mm_player.c
index a0833c8dcbb5b371a4129bd9d0faaad1eb630da1..c3653bc84e36ba7de70a7cb3c0a598cfbd2f9555 100644 (file)
--- a/src/mm_player.c
+++ b/src/mm_player.c
@@ -1147,6 +1147,7 @@ int mm_player_set_media_stream_buffer_max_size(MMHandleType player, MMPlayerStre
 int mm_player_get_media_stream_buffer_max_size(MMHandleType player, MMPlayerStreamType type, unsigned long long *max_size)
 {
        int result = MM_ERROR_NONE;
+       guint64 _max_size = 0;
 
        debug_log("\n");
 
@@ -1155,7 +1156,8 @@ int mm_player_get_media_stream_buffer_max_size(MMHandleType player, MMPlayerStre
 
        MMPLAYER_CMD_LOCK( player );
 
-       result = _mmplayer_get_media_stream_max_size(player, type, max_size);
+       result = _mmplayer_get_media_stream_max_size(player, type, &_max_size);
+       *max_size = _max_size;
 
        MMPLAYER_CMD_UNLOCK( player );
 

diff --git a/src/mm_player_attrs.c b/src/mm_player_attrs.c
index 4d0efe1c34eddb526a0aec77f8553595490fcd29..9e646a878e04be120d109dcbb9180d2e66e5a4c7 100644 (file)
--- a/src/mm_player_attrs.c
+++ b/src/mm_player_attrs.c
@@ -1118,7 +1118,7 @@ _mmplayer_construct_attribute(MMHandleType handle)
                                mmf_attrs_set_valid_range (attrs, idx,
                                                player_attrs[idx].value_min,
                                                player_attrs[idx].value_max,
-                                               (int)(player_attrs[idx].default_value));
+                                               (int)(intptr_t)(player_attrs[idx].default_value));
                        }
                        break;
 

diff --git a/src/mm_player_pd.c b/src/mm_player_pd.c
old mode 100755 (executable)
new mode 100644 (file)
index 5903876..09f16cc
--- a/src/mm_player_pd.c
+++ b/src/mm_player_pd.c
@@ -459,7 +459,7 @@ gint _mm_player_set_pd_downloader_message_cb(MMHandleType handle, MMMessageCallb
        player->pd_msg_cb = callback;
        player->pd_msg_cb_param = user_param;
 
-       debug_log("msg_cb : 0x%x     msg_cb_param : 0x%x\n", (guint)callback, (guint)user_param);
+       debug_log("msg_cb : %p     msg_cb_param : %p\n", callback, user_param);
 
        MMPLAYER_FLEAVE();
 

diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index 578458086c36a3bfb36c759baa3ce176e22fd13e..dbcf0542d193d3240f083c2a4e36cd2cf4c06fcd 100644 (file)
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -8717,7 +8717,7 @@ __gst_set_position(mm_player_t* player, int format, unsigned long position, gboo
                                                        GST_SEEK_TYPE_SET, pos_nsec, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE );
                        if ( !ret  )
                        {
-                               debug_error("failed to set position. dur[%lud]  pos[%lud]  pos_msec[%llud]\n", dur_msec, position, pos_nsec);
+                               debug_error("failed to set position. dur[%lud]  pos[%lud]  pos_msec[%"G_GUINT64_FORMAT"]\n", dur_msec, position, pos_nsec);
                                goto SEEK_ERROR;
                        }
                }
@@ -8765,7 +8765,7 @@ static int
 __gst_get_position(mm_player_t* player, int format, unsigned long* position) // @
 {
        MMPlayerStateType current_state = MM_PLAYER_STATE_NONE;
-       signed long long pos_msec = 0;
+       gint64 pos_msec = 0;
        gboolean ret = TRUE;
 
        return_val_if_fail( player && position && player->pipeline && player->pipeline->mainbin,
@@ -9017,7 +9017,7 @@ __gst_set_message_callback(mm_player_t* player, MMMessageCallback callback, gpoi
        player->msg_cb = callback;
        player->msg_cb_param = user_param;
 
-       debug_log("msg_cb : 0x%x     msg_cb_param : 0x%x\n", (guint)callback, (guint)user_param);
+       debug_log("msg_cb : %p     msg_cb_param : %p\n", callback, user_param);
 
        MMPLAYER_FLEAVE();
 
@@ -9254,8 +9254,8 @@ static int __mmfplayer_parse_profile(const char *uri, void *param, MMPlayerParse
 
        /* dump parse result */
        secure_debug_warning("incomming uri : %s\n", uri);
-       debug_log("uri_type : %d, mem : 0x%x, mem_size : %d, urgent : %s\n",
-               data->uri_type, (guint)data->mem, data->mem_size, data->urgent);
+       debug_log("uri_type : %d, mem : %p, mem_size : %d, urgent : %s\n",
+               data->uri_type, data->mem, data->mem_size, data->urgent);
 
        MMPLAYER_FLEAVE();
 
@@ -11062,7 +11062,7 @@ int
 _mmplayer_set_playspeed(MMHandleType hplayer, float rate)
 {
        mm_player_t* player = (mm_player_t*)hplayer;
-       signed long long pos_msec = 0;
+       gint64 pos_msec = 0;
        int ret = MM_ERROR_NONE;
        int mute = FALSE;
        signed long long start = 0, stop = 0;

diff --git a/src/mused/mm_player_mused.c b/src/mused/mm_player_mused.c
index 24037315d79fd74eaa18b426e7bfba5fed44e6c2..772baafe97fb72b892868e28ca95ae277623de77 100644 (file)
--- a/src/mused/mm_player_mused.c
+++ b/src/mused/mm_player_mused.c
@@ -495,6 +495,7 @@ static int _mmplayer_mused_update_video_param(mm_player_t *player)
                        /* ximagesink or xvimagesink */
                        void *surface = NULL;
 
+#ifdef HAVE_WAYLAND
                        /*set wl_display*/
                        void* wl_display = NULL;
                        GstContext *context = NULL;
@@ -514,8 +515,10 @@ static int _mmplayer_mused_update_video_param(mm_player_t *player)
                        mm_attrs_get_int_by_name(attrs, "wl_window_render_y", &wl_window_y);
                        mm_attrs_get_int_by_name(attrs, "wl_window_render_width", &wl_window_width);
                        mm_attrs_get_int_by_name(attrs, "wl_window_render_height", &wl_window_height);
+#endif
                        mm_attrs_get_data_by_name(attrs, "display_overlay", &surface);
                        if ( surface ) {
+#ifdef HAVE_WAYLAND
                                guintptr wl_surface = (guintptr)surface;
                                debug_log("set video param : surface %p", wl_surface);
                                gst_video_overlay_set_window_handle(
@@ -525,6 +528,17 @@ static int _mmplayer_mused_update_video_param(mm_player_t *player)
                                gst_video_overlay_set_render_rectangle(
                                         GST_VIDEO_OVERLAY( mainbin[MMPLAYER_M_V_SINK].gst ),
                                         wl_window_x,wl_window_y,wl_window_width,wl_window_height);
+#else
+                               int xwin_id = 0;
+                               xwin_id = *(int*)surface;
+                               debug_log("set video param : xid %d", xwin_id);
+                               if (xwin_id)
+                               {
+                                       gst_video_overlay_set_window_handle(
+                                                       GST_VIDEO_OVERLAY( player->pipeline->videobin[MMPLAYER_V_SINK].gst ),
+                                                       xwin_id );
+                               }
+#endif
                        }
                        else
                                debug_warning("still we don't have surface on player attribute. create it's own surface.");
@@ -777,7 +791,7 @@ static MMHandleType _mmplayer_mused_construct_attribute(mm_player_t *player)
                                mmf_attrs_set_valid_range (attrs, idx,
                                                player_attrs[idx].value_min,
                                                player_attrs[idx].value_max,
-                                               (int)(player_attrs[idx].default_value));
+                                               (int)(intptr_t)(player_attrs[idx].default_value));
                        }
                        break;