Resolve errors in 64 bit compilation

Change-Id: Ide9d695fcc53f246c6d48e36b2f1a3232a8472bd
Signed-off-by: Prakash <prakashc.p@samsung.com>

diff --git a/include/common/mp-util.h b/include/common/mp-util.h
index 1221ea7..4160323 100644 (file)
--- a/include/common/mp-util.h
+++ b/include/common/mp-util.h
@@ -102,7 +102,7 @@ void mp_util_delete_popup_handle(void);
 bool mp_util_notify_popup(void *pUserData, char *szTitle, char *szContents, void *PopupButtonCallbackFunc);
 bool mp_util_yes_no_popup(void *pUserData, char *szTitle, char *szContents, void *PopupYesButtonCallbackFunc, void *PopupNoButtonCallbackFunc);
 bool mp_util_remove_all_videos_question_popup(void *pUserData, MpListViewAsType viewType, void *PopupDeleteButtonCallbackFunc, void *PopupCancelButtonCallbackFunc, void *PopupHWMouseBackUpCbFunc, void *PopupHWKeyBackCbFunc);
-bool mp_util_remove_question_popup(void *pUserData, MpListViewAsType viewType, void *PopupDeleteButtonCallbackFunc, void *PopupCancelButtonCallbackFunc, void *PopupHWMouseBackUpCbFunc, void *PopupHWKeyBackCbFunc);
+bool mp_util_remove_question_popup(int pUserData, MpListViewAsType viewType, void *PopupDeleteButtonCallbackFunc, void *PopupCancelButtonCallbackFunc, void *PopupHWMouseBackUpCbFunc, void *PopupHWKeyBackCbFunc);
 bool mp_util_remove_folder_question_popup(void *pUserData, void *PopupDeleteButtonCallbackFunc, void *PopupCancelButtonCallbackFunc, void *PopupHWMouseBackUpCbFunc, void *PopupHWKeyBackCbFunc);
 bool mp_util_download_question_popup(void *pUserData, char *szTitle, char *szContents, void *PopupCancelBtnCallbackFunc, void *PopupDownloadBtnCallbackFunc);
 bool mp_util_progress_popup(char* szLabel);

diff --git a/src/common/mp-util-media-service.c b/src/common/mp-util-media-service.c
index 8c02f50..3e5c955 100644 (file)
--- a/src/common/mp-util-media-service.c
+++ b/src/common/mp-util-media-service.c
@@ -821,6 +821,7 @@ bool mp_util_svc_index_list_for_search_view(const char *keyword, void **index_li
 {
        media_info_h pVideoItem = NULL;
        Eina_List *pIterateList = NULL;
+       Eina_List *pSearchList = NULL;
        int index = 0;
 
        if (!VideoItemList) {
@@ -833,13 +834,19 @@ bool mp_util_svc_index_list_for_search_view(const char *keyword, void **index_li
                return FALSE;
        }
 
+       if (!index_list) {
+               VideoLogError("List IS null");
+               return FALSE;
+       }
+       pSearchList = (Eina_List *)(*index_list);
+
        EINA_LIST_FOREACH(VideoItemList, pIterateList, pVideoItem) {
                if (pVideoItem) {
                        char *szTitle = NULL;
                        media_info_get_display_name(pVideoItem, &szTitle);
 
                        if (szTitle && mp_util_str_str_same_case(szTitle, keyword)) {
-                               *index_list = eina_list_append(*index_list, (const void*)index);
+                               pSearchList = eina_list_append(pSearchList, (const void*)index);
                        }
                        MP_FREE_STRING(szTitle);
                }

diff --git a/src/common/mp-util.c b/src/common/mp-util.c
index 2ae1fa4..6edc096 100644 (file)
--- a/src/common/mp-util.c
+++ b/src/common/mp-util.c
@@ -710,7 +710,7 @@ bool mp_util_remove_all_videos_question_popup(void *pUserData,
 }
 
 
-bool mp_util_remove_question_popup(void *pUserData,
+bool mp_util_remove_question_popup(int pUserData,
                                   MpListViewAsType viewType,
                                   void *PopupDeleteButtonCallbackFunc,
                                   void *PopupCancelButtonCallbackFunc,
@@ -777,7 +777,7 @@ bool mp_util_remove_question_popup(void *pUserData,
        if (PopupCancelButtonCallbackFunc) {
                evas_object_smart_callback_add(pButton, "clicked",
                                               PopupCancelButtonCallbackFunc,
-                                              pUserData);
+                                              (void *)pUserData);
        }
 
        pButton = elm_button_add(pPopUpHandle);
@@ -791,18 +791,18 @@ bool mp_util_remove_question_popup(void *pUserData,
        if (PopupDeleteButtonCallbackFunc) {
                evas_object_smart_callback_add(pButton, "clicked",
                                               PopupDeleteButtonCallbackFunc,
-                                              pUserData);
+                                              (void *)pUserData);
        }
 
        if (PopupHWMouseBackUpCbFunc) {
                evas_object_event_callback_add(pPopUpHandle,
                                               EVAS_CALLBACK_MOUSE_UP,
                                               PopupHWMouseBackUpCbFunc,
-                                              pUserData);
+                                              (void *)pUserData);
        }
 
        if (PopupHWKeyBackCbFunc) {
-               /*evas_object_event_callback_add(pPopUpHandle, EVAS_CALLBACK_KEY_DOWN, PopupHWKeyBackCbFunc, pUserData);*/
+               /*evas_object_event_callback_add(pPopUpHandle, EVAS_CALLBACK_KEY_DOWN, PopupHWKeyBackCbFunc, (void *)pUserData);*/
        }
        /*elm_popup_timeout_set(pPopUpHandle, 3.0);*/
 
@@ -1173,7 +1173,7 @@ char *mp_util_get_file_size(unsigned long long size)
                snprintf(pTmp, FILE_SIZE_LEN_MAX, "%0.1lf%s", nSize_t,
                         VIDEOS_DETAILVIEW_BODY_GB);
        } else {
-               snprintf(pTmp, FILE_SIZE_LEN_MAX, "%zu%s", 0,
+               snprintf(pTmp, FILE_SIZE_LEN_MAX, "%zu%s", (size_t)0,
                         VIDEOS_DETAILVIEW_BODY_MB);
        }
 

diff --git a/src/view/mp-video-list-remove-view.c b/src/view/mp-video-list-remove-view.c
index 06104c7..543c66d 100644 (file)
--- a/src/view/mp-video-list-remove-view.c
+++ b/src/view/mp-video-list-remove-view.c
@@ -419,7 +419,7 @@ static void __mp_remove_view_run_delete_items_cb(void *data, Evas_Object *obj, c
                if (g_pListRemoveViewHandle->bSelectallCheckBoxState)
                        mp_util_remove_all_videos_question_popup((void *) NULL, type, mp_remove_view_response_done_delete_items_popup_cb, mp_remove_view_response_cancel_delete_items_popup_cb, mp_remove_view_HW_mouse_back_popup_cb, mp_remove_view_HW_key_back_popup_cb);
                else
-                       mp_util_remove_question_popup((void *)(-nSelectCounter), type, mp_remove_view_response_done_delete_items_popup_cb, mp_remove_view_response_cancel_delete_items_popup_cb, mp_remove_view_HW_mouse_back_popup_cb, mp_remove_view_HW_key_back_popup_cb);
+                       mp_util_remove_question_popup((-nSelectCounter), type, mp_remove_view_response_done_delete_items_popup_cb, mp_remove_view_response_cancel_delete_items_popup_cb, mp_remove_view_HW_mouse_back_popup_cb, mp_remove_view_HW_key_back_popup_cb);
                //g_pListRemoveViewHandle->nSelectCounterForEditList = 0;
        }
 }

diff --git a/src/view/mp-video-list-view-folder.c b/src/view/mp-video-list-view-folder.c
index dffe06c..a897999 100644 (file)
--- a/src/view/mp-video-list-view-folder.c
+++ b/src/view/mp-video-list-view-folder.c
@@ -908,7 +908,7 @@ static void __mp_folder_view_popup_delete_cb(void *pUserData,
 
        int nFolderItemIndex = (int) pUserData;
        MpListViewAsType type = MP_LIST_VIEW_AS_FOLDER_LIST;
-       mp_util_remove_question_popup((void *) nFolderItemIndex, type,
+       mp_util_remove_question_popup(nFolderItemIndex, type,
                                      __mp_folder_view_respones_delete_popup_cb,
                                      __mp_folder_view_delete_popup_cb,
                                      __mp_folder_view_mouse_back_up_popup_cb,

diff --git a/src/view/mp-video-list-view-item-of-folder.c b/src/view/mp-video-list-view-item-of-folder.c
index 42bac5c..bb789df 100644 (file)
--- a/src/view/mp-video-list-view-item-of-folder.c
+++ b/src/view/mp-video-list-view-item-of-folder.c
@@ -452,7 +452,7 @@ static void __mp_folder_item_view_delete_btn_cb(void *pUserData, Evas_Object *pO
 
        int nVideoItemIndex = (int)pUserData;
        MpListViewAsType type = MP_LIST_VIEW_AS_THUMBNAIL_LIST;
-       mp_util_remove_question_popup((void*)nVideoItemIndex, type, __mp_folder_item_view_respones_delete_popup_cb, __mp_folder_item_view_respones_cancel_popup_cb, __mp_folder_item_view_HW_mouse_back_up_popup_cb, __mp_folder_item_view_HW_key_back_popup_cb);
+       mp_util_remove_question_popup(nVideoItemIndex, type, __mp_folder_item_view_respones_delete_popup_cb, __mp_folder_item_view_respones_cancel_popup_cb, __mp_folder_item_view_HW_mouse_back_up_popup_cb, __mp_folder_item_view_HW_key_back_popup_cb);
 }
 #endif
 

diff --git a/src/view/mp-video-list-view-normal.c b/src/view/mp-video-list-view-normal.c
index fc14228..744de28 100644 (file)
--- a/src/view/mp-video-list-view-normal.c
+++ b/src/view/mp-video-list-view-normal.c
@@ -936,7 +936,7 @@ static void __mp_normal_view_delete_cb(void *pUserData,
 
        int nVideoItemIndex = (int) pUserData;
        MpListViewAsType type = MP_LIST_VIEW_AS_NORMAL_LIST;
-       mp_util_remove_question_popup((void *) nVideoItemIndex, type,
+       mp_util_remove_question_popup(nVideoItemIndex, type,
                                      mp_normal_view_respones_delete_popup_cb,
                                      mp_normal_view_detail_video_popup_cb,
                                      mp_normal_view_detail_mouse_back_popup_cb,

diff --git a/src/view/mp-video-list-view-thumbnail.c b/src/view/mp-video-list-view-thumbnail.c
index a0ce9c9..7f55b34 100644 (file)
--- a/src/view/mp-video-list-view-thumbnail.c
+++ b/src/view/mp-video-list-view-thumbnail.c
@@ -929,7 +929,7 @@ static void __mp_thumbnail_view_pop_up_delete_cb(void *pUserData,
                return;
        }
        int nVideoItemIndex = (int) pUserData;
-       mp_util_remove_question_popup((void *) nVideoItemIndex,
+       mp_util_remove_question_popup(nVideoItemIndex,
                                      (MpListViewAsType) 0,
                                      __mp_thumbnail_view_respones_delete_popup_cb,
                                      __mp_thumbnail_view_detail_video_popup_cb,