From 6fc5225e5ccea4bf92cd01a8a980bed848c394b5 Mon Sep 17 00:00:00 2001 From: Jisung Ahn Date: Tue, 11 Dec 2012 20:39:47 +0900 Subject: [PATCH] remove useless code Change-Id: I4af6b7643397ad8f7259d9610b53c455778716b3 --- common/include/debug.h | 1 - common/include/ivug-debug.h | 6 - common/include/ivug-mouse-event.h | 1 - common/src/ivug-config.c | 6 - common/src/ivug-file-info.c | 121 +------ common/src/ivug-mouse-event.c | 4 +- common/src/ivug-util.c | 2 - feature/include/ivug-ext-ug.h | 13 - feature/src/ivug-ext-ug.c | 528 ---------------------------- include/ivug-datatypes.h | 6 - include/ivug-define.h | 1 + main/src/control/ivug-detail-info.c | 2 +- main/src/control/ivug-detail-info.h | 2 - main/src/control/ivug-parameter.c | 37 +- main/src/control/ivug-parameter.h | 9 +- main/src/control/ivug-popup.h | 1 - main/src/include/ivug-main-view.h | 5 +- main/src/include/ivug-slider-item.h | 4 +- main/src/slider/ivug-slider-item.cpp | 100 +----- main/src/slider/ivug-slider-mouse.cpp | 1 - main/src/slider/ivug-slider.cpp | 25 +- main/src/ug-image-viewer.cpp | 20 -- main/src/view/ivug-crop-view.cpp | 17 - main/src/view/ivug-details-view.c | 15 +- main/src/view/ivug-main-view-menu.cpp | 223 +----------- main/src/view/ivug-main-view-menu.h | 1 - main/src/view/ivug-main-view-toolbar.cpp | 81 +---- main/src/view/ivug-main-view-toolbar.h | 5 - main/src/view/ivug-main-view.cpp | 75 +--- main/src/view/ivug-name-view.c | 1 - main/src/view/ivug-setas-view-callerid.cpp | 208 +---------- main/src/view/ivug-setas-view-callerid.h | 1 - main/src/view/ivug-setas-view-wallpaper.cpp | 67 +--- main/src/view/ivug-setas-view-wallpaper.h | 1 - main/src/view/ivug-setas-view.c | 24 -- main/src/view/ivug-slideshow-view.cpp | 3 +- medialist/include/ivug-media.h | 12 +- medialist/src/ivug-data-list.c | 4 - medialist/src/ivug-filter.c | 24 -- medialist/src/ivug-mediadata.c | 82 ++--- res/include/ivug-string.h | 6 +- slideshow/src/control/ivug-slideshow.cpp | 17 +- slideshow/src/effect/ivug-anim.c | 1 - slideshow/src/effect/ivug-dissolve.c | 2 - slideshow/src/effect/ivug-xcapture.c | 1 - widget/include/Animation.h | 1 - widget/include/ECoreAnimator.h | 2 - widget/include/Transit.h | 1 - widget/src/image/ivug-image.cpp | 1 - 49 files changed, 57 insertions(+), 1714 deletions(-) mode change 100644 => 100755 common/include/debug.h mode change 100644 => 100755 common/include/ivug-debug.h mode change 100644 => 100755 common/include/ivug-mouse-event.h mode change 100644 => 100755 common/src/ivug-file-info.c mode change 100644 => 100755 common/src/ivug-mouse-event.c mode change 100644 => 100755 common/src/ivug-util.c mode change 100644 => 100755 feature/include/ivug-ext-ug.h mode change 100644 => 100755 feature/src/ivug-ext-ug.c mode change 100644 => 100755 include/ivug-datatypes.h mode change 100644 => 100755 main/src/control/ivug-detail-info.c mode change 100644 => 100755 main/src/control/ivug-detail-info.h mode change 100644 => 100755 main/src/control/ivug-parameter.c mode change 100644 => 100755 main/src/control/ivug-parameter.h mode change 100644 => 100755 main/src/control/ivug-popup.h mode change 100644 => 100755 main/src/include/ivug-slider-item.h mode change 100644 => 100755 main/src/slider/ivug-slider-item.cpp mode change 100644 => 100755 main/src/view/ivug-crop-view.cpp mode change 100644 => 100755 main/src/view/ivug-details-view.c mode change 100644 => 100755 main/src/view/ivug-main-view-menu.h mode change 100644 => 100755 main/src/view/ivug-main-view-toolbar.cpp mode change 100644 => 100755 main/src/view/ivug-main-view-toolbar.h mode change 100644 => 100755 main/src/view/ivug-name-view.c mode change 100644 => 100755 main/src/view/ivug-setas-view-callerid.h mode change 100644 => 100755 main/src/view/ivug-setas-view-wallpaper.h mode change 100644 => 100755 main/src/view/ivug-slideshow-view.cpp mode change 100644 => 100755 medialist/include/ivug-media.h mode change 100644 => 100755 medialist/src/ivug-data-list.c mode change 100644 => 100755 medialist/src/ivug-filter.c mode change 100644 => 100755 medialist/src/ivug-mediadata.c mode change 100644 => 100755 res/include/ivug-string.h mode change 100644 => 100755 slideshow/src/effect/ivug-anim.c mode change 100644 => 100755 slideshow/src/effect/ivug-dissolve.c mode change 100644 => 100755 slideshow/src/effect/ivug-xcapture.c mode change 100644 => 100755 widget/include/Animation.h mode change 100644 => 100755 widget/include/ECoreAnimator.h mode change 100644 => 100755 widget/include/Transit.h diff --git a/common/include/debug.h b/common/include/debug.h old mode 100644 new mode 100755 index c6d03a1..d4e43b2 --- a/common/include/debug.h +++ b/common/include/debug.h @@ -113,7 +113,6 @@ extern "C" { aa = ( tv.tv_sec * 1000 + tv.tv_usec / 1000 ) - aa; \ } while(0) -// TODO : Need align(1) typedef struct { const char *fname; int nline; diff --git a/common/include/ivug-debug.h b/common/include/ivug-debug.h old mode 100644 new mode 100755 index bc40baa..ce30262 --- a/common/include/ivug-debug.h +++ b/common/include/ivug-debug.h @@ -84,12 +84,6 @@ enum { #endif //IVUG_LOG_OUTPUT_DLOG -/* - How to add new Category.. - - TODO: -*/ - #define MSG_MOUSE_SZCAT "IV-MOUSE" #define LVL_MOUSE DBG_MSG_LVL_WARN diff --git a/common/include/ivug-mouse-event.h b/common/include/ivug-mouse-event.h old mode 100644 new mode 100755 index f8393f1..1672aab --- a/common/include/ivug-mouse-event.h +++ b/common/include/ivug-mouse-event.h @@ -28,7 +28,6 @@ typedef struct { } MouseEvent; -// TODO : Review below APIs typedef struct { void (*onMouseDown)(Evas_Object *obj, MouseEvent *down, void *data); void (*onMouseDlbClick)(Evas_Object *obj, MouseEvent *click, void *data); diff --git a/common/src/ivug-config.c b/common/src/ivug-config.c index 99b291d..f96b488 100755 --- a/common/src/ivug-config.c +++ b/common/src/ivug-config.c @@ -31,14 +31,10 @@ #include #include -//TODO: Request vconf key to setting part, Slide show setting vconf key #define VCONFKEY_GALLERY_INTERVAL_TIME "db/setting/gallery/interval_time" //double #define VCONFKEY_GALLERY_REPEAT_STATE "db/setting/gallery/repeat_state" //boolean #define VCONFKEY_GALLERY_SHUFFLE_STATE "db/setting/gallery/shuffle_state" //boolean #define VCONFKEY_GALLERY_TRANSITION_EFFECT "db/setting/gallery/ss_effect" //char -#define VCONFKEY_GALLERY_MUSIC_STATE "db/setting/gallery/music_state" //boolean -#define VCONFKEY_GALLERY_MUSIC_PATH "db/setting/gallery/ss_music" //char - enum { STATE_FALSE = 0, STATE_TRUE = 1, }; @@ -92,7 +88,6 @@ bool ivug_config_set_homescreen_image( const char* filepath ) return FALSE; } -// TODO : Need to check file existence????? /*if(vconf_set_str(VCONFKEY_BGSET, filepath) < 0) { MSG_IMAGEVIEW_ERROR("Homescreen set Error"); @@ -155,7 +150,6 @@ _ivug_config_get_slideshow_interval_time(void) static char * _ivug_config_get_slideshow_effect_type(void) { -// TODO : Free returned string?? char *effect_str = NULL; effect_str = vconf_get_str(VCONFKEY_GALLERY_TRANSITION_EFFECT); diff --git a/common/src/ivug-file-info.c b/common/src/ivug-file-info.c old mode 100644 new mode 100755 index e8ea479..2224a0c --- a/common/src/ivug-file-info.c +++ b/common/src/ivug-file-info.c @@ -254,45 +254,6 @@ bool _get_gps_info_from_exifdata(ExifData *ed, double *latitude, double *longitu return true; } -bool _get_drm_image_gps_info(const char* filepath, double *latitude, double *longitude) -{ - IV_ASSERT(filepath != NULL); - IV_ASSERT(latitude != NULL); - IV_ASSERT(longitude != NULL); - - ExifData *ed = NULL; - - unsigned char *buffer = NULL; - unsigned int buf_size = 0; - - buffer = ivug_data_drm_get_buffer_from_file(filepath, &buf_size); // Returned buffer should be freed by user - - if ( (buffer == NULL) || (buf_size == 0)) - { - MSG_DETAIL_ERROR("Cannot get file buf"); - return false; - } - - ed = exif_data_new_from_data(buffer, buf_size); - if (!ed) - { - free(buffer); - return false; - } - - if(_get_gps_info_from_exifdata(ed, latitude, longitude) == false) - { - exif_data_unref(ed); - free(buffer); - return false; - } - - exif_data_unref(ed); - free(buffer); - - return true; -} - bool _get_image_gps_info(const char* filepath, double *latitude, double *longitude) { IV_ASSERT(filepath != NULL); @@ -563,62 +524,6 @@ static bool _get_image_resolution(const char *path, int * /* OUT */ pWidth, int return true; } - -static bool _get_drm_image_resolution(const char *path, int * /* OUT */ pWidth, int * /* OUT */pHeight) -{ - IV_ASSERT(path != NULL); - - unsigned char *buffer = NULL; - unsigned int buf_size = 0; - - buffer = ivug_data_drm_get_buffer_from_file(path, &buf_size); // Returned buffer should be freed by user - - if ( buffer == NULL ) - { - MSG_DETAIL_ERROR("Cannot get file buf"); - return false; - } - - int width = 0; - int height = 0; - - Evas *canvas; - Ecore_Evas *ee; - - ee = ecore_evas_buffer_new(1, 1); // Dummy canvas for decoding image - if (!ee) - { - MSG_DETAIL_ERROR("Cannot get EVAS"); - free(buffer); - return false; - } - - canvas = ecore_evas_get(ee); - - Evas_Object *img = evas_object_image_add(canvas); - - evas_object_image_file_set(img, NULL, NULL); - evas_object_image_load_orientation_set(img, EINA_TRUE); - evas_object_image_load_scale_down_set(img, 0); - evas_object_image_memfile_set(img, buffer, buf_size, NULL, NULL); // There is no return value - evas_object_image_size_get(img, &width, &height); - - evas_object_image_file_set(img, NULL, NULL); - evas_object_del(img); - - free(buffer); - - ecore_evas_free(ee); - - *pWidth = width; - *pHeight = height; - - MSG_DETAIL_HIGH("widht & height is [%d, %d]", width, height); - - return true; -} - - static bool _get_video_resolution(const char *path, int * /* OUT */ pWidth, int * /* OUT */pHeight) { @@ -742,11 +647,7 @@ bool ivug_fileinfo_get_image_resolution(const char *path, int * /* OUT */ pWidth return false; } - if(ivug_drm_is_drm_file(path) == true) - { - return _get_drm_image_resolution(path, pWidth, pHeight); - } - else + if(ivug_drm_is_drm_file(path) == false) { return _get_image_resolution(path, pWidth, pHeight); } @@ -769,12 +670,7 @@ bool ivug_fileinfo_get_video_resolution(const char *path, int * /* OUT */ pWidth return false; } - if(ivug_drm_is_drm_file(path) == true) - { -// TODO : Currently, Not support to get video resolution for drm. - return false; - } - else + if(ivug_drm_is_drm_file(path) == false) { return _get_video_resolution(path, pWidth, pHeight); } @@ -796,12 +692,7 @@ bool ivug_fileinfo_get_video_gps_info(const char *path, double *latitude, double return false; } - if(ivug_drm_is_drm_file(path) == true) - { -// TODO : Currently, Not support to get video gps info for drm. - return false; - } - else + if(ivug_drm_is_drm_file(path) == false) { return _get_video_gps_info(path, latitude, longitude); } @@ -824,11 +715,7 @@ bool ivug_fileinfo_get_image_gps_info(const char* path, double *latitude, double return false; } - if(ivug_drm_is_drm_file(path) == true) - { - return _get_drm_image_gps_info(path, latitude, longitude); - } - else + if(ivug_drm_is_drm_file(path) == false) { return _get_image_gps_info(path, latitude, longitude); } diff --git a/common/src/ivug-mouse-event.c b/common/src/ivug-mouse-event.c old mode 100644 new mode 100755 index 44db19d..7cf21b9 --- a/common/src/ivug-mouse-event.c +++ b/common/src/ivug-mouse-event.c @@ -119,7 +119,7 @@ static void _on_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, } pData->m_state++; - pData->bDown[pressed] = true; // TODO : probably, can make memory overwritten issues. + pData->bDown[pressed] = true; if ( pData->m_state == MOUSE_DOWN_1 ) { @@ -351,7 +351,6 @@ static void _on_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, pData->bDown[1], pData->bDown[2]); - // TODO : Recover. return; } @@ -567,7 +566,6 @@ Ivug_Event_Handle ivug_mouse_event_add(Evas_Object *obj, mouse_callback_t *pCallback, void *client_data, const char *alias) { mouse_data_t *pData = NULL; -//TODO : Should check parameters pData = calloc(1, sizeof(mouse_data_t)); diff --git a/common/src/ivug-util.c b/common/src/ivug-util.c old mode 100644 new mode 100755 index 6150c9a..ed963bc --- a/common/src/ivug-util.c +++ b/common/src/ivug-util.c @@ -187,7 +187,6 @@ ivug_mktemp(char* filepath, char*ext) snprintf(tempname, sizeof(tempname), "%s_0.%s",filepath, ext); int i = 1; -// TODO : Will implement with another algorithm while(ecore_file_exists(tempname) == EINA_TRUE ) { snprintf(tempname, sizeof(tempname),"%s_%d.%s", filepath, i, ext); @@ -589,7 +588,6 @@ ivug_get_icu_date(time_t mtime) timezone = vconf_get_str(VCONFKEY_SETAPPL_TIMEZONE_ID); // eg Asia/Seoul if(timezone == NULL) { -// TODO : How to get default time zone???? MSG_UTIL_ERROR("Cannot get time zone"); return NULL; } diff --git a/feature/include/ivug-ext-ug.h b/feature/include/ivug-ext-ug.h old mode 100644 new mode 100755 index 098394c..2e26b66 --- a/feature/include/ivug-ext-ug.h +++ b/feature/include/ivug-ext-ug.h @@ -32,7 +32,6 @@ typedef void (*ug_result_cb)(ui_gadget_h ug, service_h service, void *data); /* Launch extern module. */ -bool ivug_ext_launch_videoplayer_allshare(const char *filepath, int mssID); bool ivug_ext_launch_videoplayer_simple(const char *filepath); bool ivug_ext_launch_videoplayer(const char *uri); @@ -42,23 +41,11 @@ ui_gadget_h ivug_ext_launch_bluetooth_send(const char *uri, ug_destroy_cb func, ui_gadget_h ivug_ext_launch_contact(const char *uri, ug_destroy_cb func, void *data); ui_gadget_h ivug_ext_launch_message(const char *uri, ug_destroy_cb func, void *data); -bool ivug_ext_launch_message_through_number(const char *number); -bool ivug_ext_launch_email_through_addr(const char *addr); -ui_gadget_h ivug_ext_launch_select_music(ug_result_cb result_func, ug_destroy_cb destroy_func, void *data); ui_gadget_h ivug_ext_launch_select_contact(ug_result_cb result_func, ug_destroy_cb destroy_func, void *data); -bool ivug_ext_launch_videoeditor(const char *uri); bool ivug_ext_launch_browser(const char *uri); bool ivug_ext_launch_email(const char *uri); -bool ivug_ext_launch_email_account_set(void *data); -bool ivug_ext_launch_facebook_profile(void *data, const char *id); - -/* - Actually, each sns pkg needs different parameter. so hard-coding cannot be removed. -*/ -bool ivug_ext_launch_sns(const char *pkgname, const char *uri); - /* Below functions are not used at Now, but should be needed soon. diff --git a/feature/src/ivug-ext-ug.c b/feature/src/ivug-ext-ug.c old mode 100644 new mode 100755 index 07fa788..bdfbbca --- a/feature/src/ivug-ext-ug.c +++ b/feature/src/ivug-ext-ug.c @@ -302,84 +302,6 @@ WIFI_TRANSFER_END: return (ret == SERVICE_ERROR_NONE ? ug : NULL); } -bool ivug_ext_launch_videoeditor(const char *uri) -{ - MSG_IMAGEVIEW_HIGH("%s. URI=%s", __func__, uri); - - int ret = -1; - int destroy_ret = -1; - - service_h handle; - - ret = service_create(&handle); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_create failed, %d", ret); - return false; - } - - ret = service_set_operation(handle, SERVICE_OPERATION_VIEW); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_operation failed, %d", ret); - goto VIDEO_EDITOR_END; - } - - ret = service_set_uri (handle, uri); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto VIDEO_EDITOR_END; - } - - ret = service_add_extra_data(handle, "path", uri); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto VIDEO_EDITOR_END; - } - - ret = service_add_extra_data(handle, "launching_application", "image_viewer"); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto VIDEO_EDITOR_END; - } - - ret = service_add_extra_data(handle, "edit_mode", "trim"); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto VIDEO_EDITOR_END; - } - - const char *pkgname = VIDEOPLAYER_PKG_NAME; - - ret = service_set_package(handle, pkgname); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto VIDEO_EDITOR_END; - } - - ret = service_send_launch_request(handle, ivug_ext_service_reply_cb, NULL); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_send_launch_request failed, %d", ret); - goto VIDEO_EDITOR_END; - } - -VIDEO_EDITOR_END: - destroy_ret = service_destroy(handle); - if(destroy_ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_destroy failed, %d", destroy_ret); - return false; - } - - return (ret == SERVICE_ERROR_NONE ? true : false); -} - ui_gadget_h ivug_ext_launch_message(const char *uri, ug_destroy_cb func, void *data) { MSG_IMAGEVIEW_HIGH("%s. URI=%s", __func__, uri); @@ -451,71 +373,6 @@ MESSAGE_END: return (ret == SERVICE_ERROR_NONE ? ug : NULL); } -bool ivug_ext_launch_message_through_number(const char *number) -{ - MSG_IMAGEVIEW_HIGH("%s. Number=%s", __func__, number); - - int ret = -1; - int destroy_ret = -1; - - service_h handle; - - ret = service_create(&handle); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_create failed, %d", ret); - return false; - } - - ret = service_set_operation(handle, SERVICE_OPERATION_SEND_TEXT); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_operation failed, %d", ret); - goto MESSAGE_CT_END; - } - - /*ret = service_set_uri (handle, uri); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto MESSAGE_CT_END; - }*/ - - ret = service_add_extra_data(handle, SERVICE_DATA_TO, number); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto MESSAGE_CT_END; - } - - const char *pkgname = MESSAGE_PKG_NAME; - - ret = service_set_package(handle, pkgname); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto MESSAGE_CT_END; - } - - ret = service_send_launch_request(handle, ivug_ext_service_reply_cb, NULL); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_send_launch_request failed, %d", ret); - goto MESSAGE_CT_END; - } - -MESSAGE_CT_END: - destroy_ret = service_destroy(handle); - if(destroy_ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_destroy failed, %d", destroy_ret); - return false; - } - - return (ret == SERVICE_ERROR_NONE ? true : false); -} - - bool ivug_ext_launch_email(const char *uri) { MSG_IMAGEVIEW_HIGH("%s. URI=%s", __func__, uri); @@ -607,84 +464,6 @@ EMAIL_END: return (ret == SERVICE_ERROR_NONE ? true : false); } -bool ivug_ext_launch_email_through_addr(const char *addr) -{ - MSG_IMAGEVIEW_HIGH("%s. Number=%s", __func__, addr); - - int ret = -1; - int destroy_ret = -1; - - service_h handle; - - ret = service_create(&handle); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_create failed, %d", ret); - return false; - } - - ret = service_set_operation(handle, SERVICE_OPERATION_SEND_TEXT); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_operation failed, %d", ret); - goto EMAIL_CT_END; - } - - const char *pkgname = EMAIL_UG_NAME; - - ret = service_set_app_id(handle, pkgname); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto EMAIL_CT_END; - } - - Ecore_X_Window win_id = elm_win_xwindow_get(ug_get_window()); - ret = service_set_window(handle, win_id); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto EMAIL_CT_END; - } - - /*ret = service_set_uri (handle, uri); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto EMAIL_CT_END; - }*/ - - ret = service_add_extra_data(handle, SERVICE_DATA_TO, addr); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto EMAIL_CT_END; - } - /* - service_add_extra_data(service, SERVICE_DATA_CC, email_address); - service_add_extra_data(service, SERVICE_DATA_BCC, email_address); - service_add_extra_data(service, SERVICE_DATA_SUBJECT, subject_text); - service_add_extra_data(service, SERVICE_DATA_TEXT, body_text); - */ - - ret = service_send_launch_request(handle, ivug_ext_service_reply_cb, NULL); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_send_launch_request failed, %d", ret); - goto EMAIL_CT_END; - } - -EMAIL_CT_END: - destroy_ret = service_destroy(handle); - if(destroy_ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_destroy failed, %d", destroy_ret); - return false; - } - - return (ret == SERVICE_ERROR_NONE ? true : false); -} - ui_gadget_h ivug_ext_launch_contact(const char *uri, ug_destroy_cb func, void *data) { MSG_IMAGEVIEW_HIGH("%s. URI=%s", __func__, uri); @@ -1044,97 +823,6 @@ VIDEO_PLAYER_SIMPLE_END: return (ret == SERVICE_ERROR_NONE ? true : false); } -bool ivug_ext_launch_videoplayer_allshare(const char *uri, int mssID) -{ -#define MID_MAX_LEN (8) - - MSG_IMAGEVIEW_HIGH("%s. URI=%s", __func__, uri); - - int ret = -1; - int destroy_ret = -1; - - service_h handle; - - ret = service_create(&handle); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_create failed, %d", ret); - return false; - } - - ret = service_set_operation(handle, SERVICE_OPERATION_VIEW); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_operation failed, %d", ret); - goto VIDEO_PLAYER_ALLSHARE_END; - } - - ret = service_set_uri (handle, uri); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto VIDEO_PLAYER_ALLSHARE_END; - } - - char temp[MID_MAX_LEN] = {0,}; - snprintf(temp, sizeof(temp), "%d", mssID); - - ret = service_add_extra_data(handle, "video_list_type", "all_share"); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto VIDEO_PLAYER_ALLSHARE_END; - } - - ret = service_add_extra_data(handle, "MSS_MediaID", temp); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto VIDEO_PLAYER_ALLSHARE_END; - } - - ret = service_add_extra_data(handle, "path", uri); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto VIDEO_PLAYER_ALLSHARE_END; - } - - ret = service_add_extra_data(handle, "launching_application", "simple_viewer"); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto VIDEO_PLAYER_ALLSHARE_END; - } - - const char *pkgname = VIDEOPLAYER_PKG_NAME; - - ret = service_set_package(handle, pkgname); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto VIDEO_PLAYER_ALLSHARE_END; - } - - ret = service_send_launch_request(handle, ivug_ext_service_reply_cb, NULL); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_send_launch_request failed, %d", ret); - goto VIDEO_PLAYER_ALLSHARE_END; - } - -VIDEO_PLAYER_ALLSHARE_END: - destroy_ret = service_destroy(handle); - if(destroy_ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_destroy failed, %d", destroy_ret); - return false; - } - - return (ret == SERVICE_ERROR_NONE ? true : false); -} - - bool ivug_ext_launch_twitter(const char *uri) { MSG_IMAGEVIEW_HIGH("%s. URI=%s", __func__, uri); @@ -1349,32 +1037,6 @@ PICASA_END: return (ret == SERVICE_ERROR_NONE ? true : false); } -bool ivug_ext_launch_sns(const char *pkgname, const char *uri) -{ - if(strcmp(pkgname, "com.samsung.twitter") == 0) - { - return ivug_ext_launch_twitter(uri); - } - else if(strcmp(pkgname, "com.samsung.facebook") == 0) - { - return ivug_ext_launch_facebook(uri); - } - else if(strcmp(pkgname, "com.samsung.picasa") == 0) - { - return ivug_ext_launch_picasa(uri); - } - else if(strcmp(pkgname, "com.samsung.youtube") == 0) - { - return ivug_ext_launch_default(uri, SERVICE_OPERATION_SEND, pkgname, NULL); - } - else - { - MSG_IMAGEVIEW_ERROR("Unknown package name:%s", pkgname); - } - - return true; -} - bool ivug_ext_launch_browser(const char *uri) { MSG_IMAGEVIEW_HIGH("%s. URI=%s", __func__, uri); @@ -1502,86 +1164,6 @@ PRINT_END: } -ui_gadget_h ivug_ext_launch_select_music(ug_result_cb result_func, ug_destroy_cb destroy_func, void *data) -{ - MSG_IMAGEVIEW_HIGH("%s", __func__); - - const char *pa_cur_ringtone = NULL; - const char *dir_path = NULL; - - int ret = -1; - int destroy_ret = -1; - - service_h handle; - ui_gadget_h ug = NULL; - - pa_cur_ringtone = "/opt/share/settings/Ringtones/Over the horizon.mp3"; - dir_path = "/opt/share/settings/Ringtones/"; - - ret = service_create(&handle); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_create failed, %d", ret); - return NULL; - } - - /*ret = service_set_operation(handle, SERVICE_OPERATION_VIEW); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_operation failed, %d", ret); - goto MYFILE_END; - }*/ - - ret = service_add_extra_data(handle, "marked_mode", pa_cur_ringtone); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto MYFILE_END; - } - - ret = service_add_extra_data(handle, "path", dir_path); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto MYFILE_END; - } - - ret = service_add_extra_data(handle, "select_type", "SINGLE_FILE"); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto MYFILE_END; - } - - ret = service_add_extra_data(handle, "drm_type", "DRM_ALL"); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto MYFILE_END; - } - - /*const char *pkgname = MYFILE_UG_NAME; - - ret = service_set_package(handle, pkgname); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_uri failed, %d", ret); - goto MYFILE_END; - }*/ - - ug = _ivug_ext_launch_ug_with_result(MYFILE_UG_NAME, handle, result_func, destroy_func, data); - -MYFILE_END: - destroy_ret = service_destroy(handle); - if(destroy_ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_destroy failed, %d", destroy_ret); - return NULL; - } - - return (ret == SERVICE_ERROR_NONE ? ug : NULL); -} - ui_gadget_h ivug_ext_launch_select_contact(ug_result_cb result_func, ug_destroy_cb destroy_func, void *data) { MSG_IMAGEVIEW_HIGH("%s", __func__); @@ -1645,116 +1227,6 @@ SELECT_CONTACT_END: return (ret == SERVICE_ERROR_NONE ? ug : NULL); } -bool ivug_ext_launch_email_account_set(void *data) -{ - MSG_IMAGEVIEW_HIGH("%s.", __func__); - - int ret = -1; - int destroy_ret = -1; - - service_h handle; - - ret = service_create(&handle); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_create failed, %d", ret); - return false; - } - - ret = service_add_extra_data(handle, "RUN_TYPE", "9"); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto EMAIL_ACCOUNT_END; - } - - ret = service_set_package(handle, EMAIL_PKG_NAME); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_package failed, %d", ret); - goto EMAIL_ACCOUNT_END; - } - - ret = service_send_launch_request(handle, ivug_ext_service_reply_cb, NULL); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_send_launch_request failed, %d", ret); - goto EMAIL_ACCOUNT_END; - } - -EMAIL_ACCOUNT_END: - destroy_ret = service_destroy(handle); - if(destroy_ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_destroy failed, %d", destroy_ret); - return false; - } - - return (ret == SERVICE_ERROR_NONE ? true : false); -} - -bool ivug_ext_launch_facebook_profile(void *data, const char *id) -{ - MSG_IMAGEVIEW_HIGH("%s.", __func__); - - int ret = -1; - int destroy_ret = -1; - - service_h handle; - - ret = service_create(&handle); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_create failed, %d", ret); - return false; - } - - ret = service_add_extra_data(handle, "fb.appcontrol.launch.type", "profile"); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto FACEBOOK_END; - } - - ret = service_add_extra_data(handle, "fb.appcontrol.launch.info", id); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_add_extra_data failed, %d", ret); - goto FACEBOOK_END; - } - - ret = service_set_operation(handle, "http://tizen.org/fb/appcontrol/operation/view"); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_operation failed, %d", ret); - goto FACEBOOK_END; - } - - ret = service_set_package(handle, FACEBOOK_PKG_NAME); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_set_package failed, %d", ret); - goto FACEBOOK_END; - } - - ret = service_send_launch_request(handle, ivug_ext_service_reply_cb, data); - if(ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_send_launch_request failed, %d", ret); - goto FACEBOOK_END; - } - -FACEBOOK_END: - destroy_ret = service_destroy(handle); - if(destroy_ret != SERVICE_ERROR_NONE) - { - MSG_IMAGEVIEW_ERROR("service_destroy failed, %d", destroy_ret); - return false; - } - - return (ret == SERVICE_ERROR_NONE ? true : false); -} - bool ivug_ext_launch_default(const char *uri, const char *operation, const char *pkg, void *data) { MSG_IMAGEVIEW_HIGH("%s.", __func__); diff --git a/include/ivug-datatypes.h b/include/ivug-datatypes.h old mode 100644 new mode 100755 index 5f9a9b7..14136d4 --- a/include/ivug-datatypes.h +++ b/include/ivug-datatypes.h @@ -38,12 +38,6 @@ typedef enum { IVUG_VIEW_BY_TAG, IVUG_VIEW_BY_FOLDER, // Same as DB Album. will be renamed to BY_ALBUM IVUG_VIEW_BY_PLACES, - IVUG_VIEW_BY_ALLSHARE, - IVUG_VIEW_BY_PTP, - IVUG_VIEW_BY_WEB, - IVUG_VIEW_BY_WEBALBUM, - IVUG_VIEW_BY_CONTACT_ID, - IVUG_VIEW_BY_CONTACT_GROUP, IVUG_VIEW_BY_DIRECTORY, } ivug_view_by; diff --git a/include/ivug-define.h b/include/ivug-define.h index 3179a20..308e6cc 100755 --- a/include/ivug-define.h +++ b/include/ivug-define.h @@ -49,3 +49,4 @@ ADD_DEFINITIONS("-D_USE_MEDIAINFO_STRINGID_") #define ZOOM_LEVEL_STEP (0.7) #define ZOOM_LEVEL_MAX (4) +#define USE_DEFAULT_APP_SERVICE diff --git a/main/src/control/ivug-detail-info.c b/main/src/control/ivug-detail-info.c old mode 100644 new mode 100755 index f8a065d..bccae20 --- a/main/src/control/ivug-detail-info.c +++ b/main/src/control/ivug-detail-info.c @@ -355,7 +355,7 @@ ivug_datail_get_file_info(/*out*/char** name, /*out*/char **contents, case FILE_INFO_RESOLUTION: *name = strdup(IDS_RESOLUTION); *contents = (char *)calloc(1, sizeof(char)*NOMAL_BUF+1); - if(stype == SLIDE_TYPE_IMAGE || stype == SLIDE_TYPE_WEB_IMAGE || stype == SLIDE_TYPE_PTP_IMAGE) + if(stype == SLIDE_TYPE_IMAGE) { if(ivug_fileinfo_get_image_resolution(path, &width, &height) == false) { diff --git a/main/src/control/ivug-detail-info.h b/main/src/control/ivug-detail-info.h old mode 100644 new mode 100755 index cbf940a..2566383 --- a/main/src/control/ivug-detail-info.h +++ b/main/src/control/ivug-detail-info.h @@ -70,8 +70,6 @@ typedef enum extern "C" { #endif -// TODO : Remove dependacy ivug-detail-view and ivug-detail-info. - bool ivug_datail_get_exif_info(/*out*/char** name_, /*out*/char **contents_, const char *path, Media_Type stype, exif_info_type_e type); diff --git a/main/src/control/ivug-parameter.c b/main/src/control/ivug-parameter.c old mode 100644 new mode 100755 index 58ef551..5b02218 --- a/main/src/control/ivug-parameter.c +++ b/main/src/control/ivug-parameter.c @@ -49,15 +49,6 @@ #define IVUG_BUNDLE_KEY_MEDIA_TYPE "Media type" -#define IVUG_BUNDLE_KEY_MSS_SERVER_ID "MSS_ServerID" -#define IVUG_BUNDLE_KEY_MSS_SORT_TYPE "MSS_Sort_type" - -#define IVUG_BUNDLE_KEY_ALLSHARE_DEVICE_ID "Device id" - -#define IVUG_BUNDLE_KEY_ALLSHARE_HANDLE_POINTER "Handle pointer" - -#define IVUG_BUNDLE_KEY_PTP_TOTAL_COUNT "Count" - #define IVUG_BUNDLE_KEY_STANDALONE "Standalone" #define IVUG_BUNDLE_KEY_CONTACT_ID "Contact id" @@ -88,15 +79,10 @@ _get_view_mode(ivug_parameter* data, const char* val) #define IVUG_BUNDLE_VALUE_VIEW_MODE_NORMAL "NORMAL" #define IVUG_BUNDLE_VALUE_VIEW_MODE_SINGLE "SINGLE" #define IVUG_BUNDLE_VALUE_VIEW_MODE_GALLERY "GALLERY" -#define IVUG_BUNDLE_VALUE_VIEW_MODE_WEB "WEB_CLUSTER" #define IVUG_BUNDLE_VALUE_VIEW_MODE_CAMERA "CAMERA" #define IVUG_BUNDLE_VALUE_VIEW_MODE_DISPLAY "DISPLAY" #define IVUG_BUNDLE_VALUE_VIEW_MODE_SETAS "SETAS" -#define IVUG_BUNDLE_VALUE_VIEW_MODE_ALLSHARE "ALLSHARE" -#define IVUG_BUNDLE_VALUE_VIEW_MODE_PTP "PTP" #define IVUG_BUNDLE_VALUE_VIEW_MODE_SLIDESHOW "SLIDESHOW" -#define IVUG_BUNDLE_VALUE_VIEW_MODE_BESTSHOT "BESTSHOT" -#define IVUG_BUNDLE_VALUE_VIEW_MODE_BUDDY "BUDDY PHOTO SHARE" int len = strlen(val); @@ -139,8 +125,7 @@ _get_view_mode(ivug_parameter* data, const char* val) if(data->view_by != IVUG_VIEW_BY_ALL && data->view_by != IVUG_VIEW_BY_FAVORITES && data->view_by != IVUG_VIEW_BY_TAG && - data->view_by != IVUG_VIEW_BY_PLACES && - data->view_by != IVUG_VIEW_BY_WEBALBUM) + data->view_by != IVUG_VIEW_BY_PLACES) { data->view_by = IVUG_VIEW_BY_FOLDER; } @@ -161,9 +146,6 @@ _get_view_by(const char* val) #define IVUG_BUNDLE_VALUE_VIEW_BY_TAGS "Tags" #define IVUG_BUNDLE_VALUE_VIEW_BY_FLODER "By Folder" #define IVUG_BUNDLE_VALUE_VIEW_BY_PLACES "Places" -#define IVUG_BUNDLE_VALUE_VIEW_BY_CONTACT_ID "Contact id" -#define IVUG_BUNDLE_VALUE_VIEW_BY_CONTACT_GROUP "Contact group" -#define IVUG_BUNDLE_VALUE_VIEW_BY_WEB "Web" IV_ASSERT(val != NULL); @@ -189,18 +171,6 @@ _get_view_by(const char* val) { return IVUG_VIEW_BY_PLACES; } - else if (strncmp(val, IVUG_BUNDLE_VALUE_VIEW_BY_CONTACT_ID, len) == 0) - { - return IVUG_VIEW_BY_CONTACT_ID; - } - else if (strncmp(val, IVUG_BUNDLE_VALUE_VIEW_BY_CONTACT_GROUP, len) == 0) - { - return IVUG_VIEW_BY_CONTACT_GROUP; - } - else if (strncmp(val, IVUG_BUNDLE_VALUE_VIEW_BY_WEB, len) == 0) - { - return IVUG_VIEW_BY_WEBALBUM; - } MSG_IVUG_ERROR("Invalid view by : %s", val); @@ -460,8 +430,6 @@ ivug_param_create_from_bundle(service_h service) MSG_IVUG_HIGH("View mode is NULL. Set Default(%d)", data->mode); } - //data->view_by = IVUG_VIEW_BY_ALLSHARE; // TODO: for all share TEST - //parse path char* szFilePath = NULL; @@ -530,7 +498,6 @@ ivug_param_create_from_bundle(service_h service) MSG_IVUG_HIGH("Get Album ID(%s) from file %s", uuid_getchar(data->album_id), data->filepath); } -// TODO : Check parameter integrity service_get_extra_data (service, IVUG_BUNDLE_KEY_MEDIA_TYPE, &val); if(val != NULL) { @@ -622,7 +589,6 @@ ivug_param_create_from_bundle(service_h service) } else { - /* TODO : remove default value, width & height needed */ data->width = 100; data->height = 100; MSG_IVUG_HIGH("Rectangle ratio is not set. Set as default : %dx%d", data->width, data->height); @@ -778,7 +744,6 @@ Filter_struct *ivug_param_create_filter(const ivug_parameter *param) } break; case IVUG_VIEW_BY_DIRECTORY: - // TODO : Need more things? break; case IVUG_VIEW_BY_INVAILD: default: diff --git a/main/src/control/ivug-parameter.h b/main/src/control/ivug-parameter.h old mode 100644 new mode 100755 index 4becf52..5709e69 --- a/main/src/control/ivug-parameter.h +++ b/main/src/control/ivug-parameter.h @@ -27,16 +27,13 @@ typedef enum { IVUG_MODE_INVAILD = 0x00, - IVUG_MODE_NORMAL, // include web album + IVUG_MODE_NORMAL, IVUG_MODE_SINGLE, // just show one slide IVUG_MODE_DISPLAY, // from "take a photo" in messenger IVUG_MODE_FILE, // file viewer(can flick) IVUG_MODE_CAMERA, // camera(can flick) IVUG_MODE_SETAS, // SetAs in setting menu. - IVUG_MODE_PTP, // PTP in gallery IVUG_MODE_SLIDESHOW, // Slideshow - IVUG_MODE_BESTSHOT, // Bestshot - IVUG_MODE_BUDDY, // Buddy photo share } ivug_mode; //set as ug @@ -64,7 +61,7 @@ typedef struct { UUID album_id; //cluster id of media service ivug_media_type media_type; - ivug_sort_type sort_type; // TODO : extract from here. sort type can be used in case of default + ivug_sort_type sort_type; /* for places view */ bool footsteps; @@ -101,7 +98,7 @@ ivug_param_delete(ivug_parameter* data); /* - Covert ivug_paramter to db filter or allshare filter + Covert ivug_paramter to db filter */ Filter_struct * ivug_param_create_filter(const ivug_parameter *param); diff --git a/main/src/control/ivug-popup.h b/main/src/control/ivug-popup.h old mode 100644 new mode 100755 index 2537f7a..83c6b3a --- a/main/src/control/ivug-popup.h +++ b/main/src/control/ivug-popup.h @@ -49,7 +49,6 @@ Evas_Object* ivug_2btn_popup_show(Evas_Object* parent, const char* title, /* Create & show popup with no button. - TODO : Rename function */ Evas_Object *ivug_timeout_popup_show(Evas_Object *parent, Evas_Smart_Cb response, void *data, const char *sztitle, const char *content); diff --git a/main/src/include/ivug-main-view.h b/main/src/include/ivug-main-view.h index 2f1688d..cc19eef 100755 --- a/main/src/include/ivug-main-view.h +++ b/main/src/include/ivug-main-view.h @@ -37,7 +37,6 @@ typedef enum { NAVI_BAR_TYPE_IMAGE, // [Edit, Set, Info] default NAVI_BAR_TYPE_FILE, // [Set, Info] default NAVI_BAR_TYPE_VIDEO, // [Trim, Set, Info] default - NAVI_BAR_TYPE_WEB_IMAGAE, // [Set] default NAVI_BAR_TYPE_SELECT, // [Ok, Cancel] from take photo } ivug_toolbar; @@ -46,7 +45,7 @@ typedef enum { CTRL_BAR_TYPE_NONE = 0x00, CTRL_BAR_TYPE_EMPTY, // not exist ctrl bar CTRL_BAR_TYPE_FILE, // [Delete,Share,Set,Info] file manager, video at gallery - CTRL_BAR_TYPE_READ_ONLY, // [Share, Set, Save, Info] web image + CTRL_BAR_TYPE_READ_ONLY, // [Share, Set, Save, Info] CTRL_BAR_TYPE_IMAGE, // [Delete,Share, Add tag, Slide show, Editor] from gallery CTRL_BAR_TYPE_VIDEO, // [Delete,Share, Add tag, Slide show, Trim] from gallery } ivug_ctrlbar; @@ -65,8 +64,6 @@ typedef enum { TOOLBUTTON_DETAILS, TOOLBUTTON_TRIM, - TOOLBUTTON_ALLSHARE, - // only shows in toolbar TOOLBUTTON_OK, TOOLBUTTON_CANCEL, diff --git a/main/src/include/ivug-slider-item.h b/main/src/include/ivug-slider-item.h old mode 100644 new mode 100755 index f18fc66..df83f6a --- a/main/src/include/ivug-slider-item.h +++ b/main/src/include/ivug-slider-item.h @@ -50,10 +50,8 @@ struct _Slide_Item { Evas_Object* vIcon; //video play icon Evas_Object* photocam; // photocam - Evas_Object* videocam; // videocam - bool bUseInPlay; - Evas_Object* progress; //progress bar for web download. + Evas_Object* progress; //progress bar for download. // Callback bool bMenuVisible; diff --git a/main/src/slider/ivug-slider-item.cpp b/main/src/slider/ivug-slider-item.cpp old mode 100644 new mode 100755 index d3c161f..36f127c --- a/main/src/slider/ivug-slider-item.cpp +++ b/main/src/slider/ivug-slider-item.cpp @@ -49,7 +49,6 @@ static bool _show_thumbnail( Slide_Item* si, const char *filepath) { -// TODO : When image orientatin is not 0 degree, rotate thumbnail also IV_ASSERT(si != NULL); if (si->thumbnail == NULL) @@ -177,11 +176,9 @@ static sitem_type_t _get_sitem_type(Media_Type mtype) switch(mtype) { case SLIDE_TYPE_IMAGE: - case SLIDE_TYPE_WEB_IMAGE: return SITEM_TYPE_IMAGE; case SLIDE_TYPE_VIDEO: - case SLIDE_TYPE_STREAMING: return SITEM_TYPE_VIDEO; case SLIDE_TYPE_NONE: @@ -208,8 +205,6 @@ static char *_get_file_name(Slide_Item* si) static bool _set_mitem(Slide_Item* si, Media_Item *item) { - bool ret = false; - Media_Data *mdata = ivug_medialist_get_data(item); IV_ASSERT(mdata != NULL); @@ -254,7 +249,6 @@ static bool _set_mitem(Slide_Item* si, Media_Item *item) break; case SLIDE_TYPE_VIDEO: - case SLIDE_TYPE_STREAMING: MSG_SITEM_HIGH("Set video. %s", ivug_get_filename(mdata->filepath)); si->state = SLIDE_STATE_READY; // Video dont need to load photocam @@ -281,7 +275,7 @@ static bool _set_mitem(Slide_Item* si, Media_Item *item) static bool _unset_mitem(Slide_Item* si) { -// Unswallow photocam/videocam +// Unswallow photocam elm_object_part_content_unset(si->layout, "slider.contents"); switch(si->type) @@ -397,9 +391,8 @@ _photocam_loaded_cb(void *data, Evas_Object *obj, void *event_info) ivug_image_image_size_get(si->photocam, &w, &h); - if (mdata->slide_type == SLIDE_TYPE_VIDEO || mdata->slide_type == SLIDE_TYPE_STREAMING) //if slide type is video, + if (mdata->slide_type == SLIDE_TYPE_VIDEO) //if slide type is video, { - // TODO : Never get here.. MSG_SITEM_FATAL("slide type is video. thumbnail image "); return; } @@ -415,66 +408,6 @@ _photocam_loaded_cb(void *data, Evas_Object *obj, void *event_info) MSG_SITEM_HIGH("Photocam Pre-loaded. File=%s", ivug_get_filename(mdata->filepath)); } -static void -_videocam_loaded_cb(void *data, Evas_Object *obj, void *event_info) -{ - IV_ASSERT(data != NULL); - - Slide_Item* si = static_cast(data); - - si->state = SLIDE_STATE_LOADED; - - MSG_SITEM_HIGH("Playing video is started"); - - evas_object_show(obj); //show videocam - -#ifdef USE_VIDEO_THUMBNAIL - MSG_SITEM_HIGH("Thumbnail Hide"); - _hide_thumbnail(si); -#endif - - if ( si->bMenuVisible == false ) - { - _hide_videoicon(si); - } - - _call_user_callback(si); -} - - - -static void -_videocam_ready_cb(void *data, Evas_Object *obj, void *event_info) -{ - IV_ASSERT(data != NULL); - -// Slide_Item* si = static_cast(data); - - MSG_SITEM_HIGH("Video is ready"); - -} - - - -static void -_videocam_eos_cb(void *data, Evas_Object *obj, void *event_info) -{ - IV_ASSERT(data != NULL); - - Slide_Item* si = static_cast(data); - - MSG_SITEM_HIGH("Video cam End of Stream"); - -#ifdef USE_VIDEO_THUMBNAIL - edje_object_signal_emit(_EDJ(si->layout), "elm,state,show_thumbnail", "slider"); -#endif - - elm_image_file_set(si->vIcon, EDJ_PATH"/ivug-icons.edj", "btn.video.play"); - _show_videoicon(si); - - evas_object_hide(si->videocam); -} - static void _on_event_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) { MSG_SITEM_HIGH("Event layer clicked : %s Layer=%d", evas_object_name_get(obj), evas_object_layer_get(obj)); @@ -574,7 +507,6 @@ ivug_slider_item_resize(Slide_Item* si, int w, int h) IV_ASSERT(si != NULL ); if ( si->w == w && si->h == h ) return; - // TODO : Impelement MSG_SITEM_HIGH("SLIDER Resize to XYWH(%d,%d,%d,%d)", si->x, si->y, w, h ); // w,h is not Image's scale, but Object's scale @@ -625,12 +557,6 @@ void ivug_slider_item_del(Slide_Item* si) si->photocam = NULL; } - if (si->videocam) - { - evas_object_del(si->videocam); - si->videocam = NULL; - } - if (si->thumbnail) { evas_object_del(si->thumbnail); @@ -814,24 +740,6 @@ ivug_slider_item_load(Slide_Item *si) } break; - case SLIDE_TYPE_STREAMING: - si->state = SLIDE_STATE_LOADED; - return true; - - break; - - case SLIDE_TYPE_WEB_IMAGE: - MSG_SITEM_HIGH("Stored Filename : %s", ivug_get_filename(mdata->filepath)); - si->state = SLIDE_STATE_LOADING; - - if (ivug_image_file_set(si->photocam, mdata->filepath, NULL) != EVAS_LOAD_ERROR_NONE) - { - MSG_SITEM_ERROR("Failed photocam to set file file=%s", path); - si->state = SLIDE_STATE_ERROR; - return false; - } - break; - default: MSG_SITEM_ERROR("slide type invaild. Type=%d", mdata->slide_type); @@ -968,7 +876,7 @@ ivug_slider_item_region_size_get(Slide_Item* si, int *x, int *y, int *w, int *h) if ( mdata == NULL ) { MSG_SITEM_ERROR("slide type is NULL. Item=0x%08x", si); - return false; // TODO : Temp.. + return false; } switch(si->type) @@ -1146,7 +1054,7 @@ ivug_slider_item_icon_click_check(Slide_Item *si, int x, int y) return false; } - if ( mdata->slide_type == SLIDE_TYPE_VIDEO || mdata->slide_type == SLIDE_TYPE_STREAMING ) + if ( mdata->slide_type == SLIDE_TYPE_VIDEO ) { if (si->vIcon) { diff --git a/main/src/slider/ivug-slider-mouse.cpp b/main/src/slider/ivug-slider-mouse.cpp index 8dd4c10..1904fb3 100755 --- a/main/src/slider/ivug-slider-mouse.cpp +++ b/main/src/slider/ivug-slider-mouse.cpp @@ -326,7 +326,6 @@ Evas_Event_Flags _momentum_start(void *data, void *event_info) sd->prev_x = p->x2; sd->prev_y = p->y2; -// End animation. TODO : Preserve monentum sd->anim->Stop(); // Update Center!. diff --git a/main/src/slider/ivug-slider.cpp b/main/src/slider/ivug-slider.cpp index a4fd73f..77a173f 100755 --- a/main/src/slider/ivug-slider.cpp +++ b/main/src/slider/ivug-slider.cpp @@ -134,23 +134,6 @@ static void _do_load_dbg(struct Smart_Data *sd, const char *file, int line) sd->load_idler = ecore_idler_add(_idler_loading_func, sd); } -static bool _ivug_slider_image_rotate_reset(Slide_Item *si) -{ - IV_ASSERT(si != NULL); - - if(si->state != SLIDE_STATE_LOADED) - { - return false; - } - - if ( si->type == SITEM_TYPE_IMAGE ) - { - ivug_image_rotate_set(si->photocam, 0); - } - - return true; -} - static void _ivug_slider_on_center_changed(Evas_Object *obj, Slide_Item *old, Slide_Item *cur) { IV_ASSERT(old != cur ); @@ -160,7 +143,6 @@ static void _ivug_slider_on_center_changed(Evas_Object *obj, Slide_Item *old, Sl if ( old != NULL ) { ivug_slider_item_zoom_reset(old, EINA_FALSE, 0, 0); -// _ivug_slider_image_rotate_reset(old); ivug_slider_item_stop(old); // Stop DRM consume/Animation } @@ -697,10 +679,8 @@ _ivug_slider_slide_move(struct Smart_Data *sd, Evas_Coord x, Evas_Coord y) int nOffset = 100; // For debugging x += nOffset; #endif -// TODO : If size is smaller than screen's, image should be put in middle ivug_slider_item_move(sd->slide[CENTER_SLIDE], x, y); -// TODO : so as to increas perf, dont draw slide under certain condition ivug_slider_item_move(sd->slide[PREV_SLIDE], x - sd->slide[PREV_SLIDE]->w - IMAGE_BETWEEN_MARGIN , y); ivug_slider_item_move(sd->slide[NEXT_SLIDE], x + sd->slide[CENTER_SLIDE]->w + IMAGE_BETWEEN_MARGIN , y); } @@ -776,7 +756,6 @@ _ivug_slider_start_slide(struct Smart_Data *sd, int src_x, int dst_x, int moment return; } -// TODO : If transition is preceeding, change slide item, sd->anim->Stop(); if ( sd->tween ) delete sd->tween; @@ -891,11 +870,9 @@ void ivug_slider_start(Evas_Object *obj) { IV_ASSERT(obj != NULL); - struct Smart_Data *sd = (struct Smart_Data *) evas_object_smart_data_get(obj); MSG_SLIDER_HIGH("Slider start"); - ivug_slider_load(obj); } @@ -1140,7 +1117,7 @@ ivug_slider_resume(Evas_Object *obj) void ivug_slider_skip(Evas_Object* obj) { - ivug_ret_if(!obj); // TODO + ivug_ret_if(!obj); struct Smart_Data *sd = (struct Smart_Data *) evas_object_smart_data_get(obj); if ( sd->last_dir == SLIDE_SHIFT_TO_RIGHT) // <-------------- diff --git a/main/src/ug-image-viewer.cpp b/main/src/ug-image-viewer.cpp index 8098f94..914b715 100755 --- a/main/src/ug-image-viewer.cpp +++ b/main/src/ug-image-viewer.cpp @@ -65,23 +65,6 @@ typedef struct ug_data { #undef TRACE_RENDER -static void _on_parent_resize(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - Evas_Coord x,y,w,h; - evas_object_geometry_get(obj, &x, &y, &w, &h); - - MSG_IMAGEVIEW_HIGH("Parent win(0x%08x) resized geomtery XYWH(%d,%d,%d,%d) angle=%d", obj, x, y, w, h, elm_win_rotation_get((Evas_Object *)ug_get_window())); -} - -static void _on_parent_move(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - Evas_Coord x,y,w,h; - evas_object_geometry_get(obj, &x, &y, &w, &h); - - MSG_IMAGEVIEW_HIGH("Parent win(0x%08x) moved geomtery XYWH(%d,%d,%d,%d) angle=%d", obj, x, y, w, h, elm_win_rotation_get((Evas_Object *)ug_get_window())); -} - - static void _on_base_resize(void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Coord x,y,w,h; @@ -439,9 +422,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, voi evas_object_event_callback_add(ugd->base, EVAS_CALLBACK_SHOW, _on_base_show, NULL); evas_object_event_callback_add(ugd->base, EVAS_CALLBACK_HIDE, _on_base_hide, NULL); -// evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _on_parent_resize, NULL); -// evas_object_event_callback_add(win, EVAS_CALLBACK_MOVE, _on_parent_move, NULL); - evas_object_smart_callback_add(win, "profile,changed", _win_profile_changed_cb, ugd); ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_MMC_STATUS, _on_mmc_state_changed, ugd); diff --git a/main/src/view/ivug-crop-view.cpp b/main/src/view/ivug-crop-view.cpp old mode 100644 new mode 100755 index dfa76e1..505285f --- a/main/src/view/ivug-crop-view.cpp +++ b/main/src/view/ivug-crop-view.cpp @@ -317,21 +317,6 @@ SAVE_FAILED: return; } -static void _on_btn_cancel(void *data, Evas_Object *obj, void *event_info) -{ - IV_ASSERT(data != NULL); - - IvugCropView *pCropView = static_cast(data); - - MSG_HIGH("Cancel clicked"); - - evas_object_smart_callback_call(pCropView->layout, "destroyed", NULL); - - evas_object_smart_callback_call(pCropView->layout, "cancel,clicked", NULL); - - ivug_crop_view_destroy(pCropView); -} - static Evas_Event_Flags _finger_tap_end(void *data , void *event_info) { Elm_Gesture_Taps_Info *p = (Elm_Gesture_Taps_Info *) event_info; @@ -468,8 +453,6 @@ bool ivug_crop_view_file_set(IvugCropView *pCropView, const char *file) Evas_Load_Error err; - Evas_Object *thumbnail = NULL; - if ( pCropView->file_path ) { free(pCropView->file_path); diff --git a/main/src/view/ivug-details-view.c b/main/src/view/ivug-details-view.c old mode 100644 new mode 100755 index 223067f..0bd02e9 --- a/main/src/view/ivug-details-view.c +++ b/main/src/view/ivug-details-view.c @@ -377,11 +377,6 @@ ivug_details_view_screen_create(Evas_Object *parent, Media_Item *mitem, ivug_vie pDetailsView->mitem = mitem; - if(view_by == IVUG_VIEW_BY_ALLSHARE) - { - - } - // Creating GUI pDetailsView->evas = evas_object_evas_get(parent); @@ -413,16 +408,8 @@ ivug_details_view_screen_create(Evas_Object *parent, Media_Item *mitem, ivug_vie genlist = _ivug_details_view_genlist_create(pDetailsView, pDetailsView->layout); pDetailsView->genlist = genlist; - if(stype == SLIDE_TYPE_WEB_IMAGE || stype == SLIDE_TYPE_STREAMING ) - { - _ivug_detail_genlist_view_file_view_create(pDetailsView, mdata->fileurl, stype); - } - else - { - _ivug_detail_genlist_view_file_view_create(pDetailsView, filepath, stype); - } + _ivug_detail_genlist_view_file_view_create(pDetailsView, filepath, stype); -// TODO : Should check below routine. why DRM has no GPS info??? if(mdata->bIsDRMContent == EINA_TRUE) { _ivug_detail_genlist_view_drm_create(pDetailsView, filepath, stype); diff --git a/main/src/view/ivug-main-view-menu.cpp b/main/src/view/ivug-main-view-menu.cpp index cf20461..b123182 100755 --- a/main/src/view/ivug-main-view-menu.cpp +++ b/main/src/view/ivug-main-view-menu.cpp @@ -64,31 +64,6 @@ _on_ext_ug_destroy_cb(ui_gadget_h ug, void *priv) ivug_main_view_set_hide_timer(pMainView); } -static void -_on_ext_music_ug_result_cb(ui_gadget_h ug, service_h service, void *priv) -{ - if (!ug ) return; - - Ivug_MainView *pMainView = (Ivug_MainView *)priv; - IV_ASSERT(pMainView != NULL); - - MSG_IMAGEVIEW_HIGH("UG result sended"); - - char *path = NULL; - - service_get_extra_data(service, "result", &path); - - MSG_IMAGEVIEW_HIGH("selected path = %s", path); - - if(pMainView->ss_music_name != NULL) - { - free(pMainView->ss_music_name); - } - pMainView->ss_music_name = strdup(path); - - free(path); -} - static void _on_selectioninfo_deleted(void * data, Evas * e, Evas_Object * obj, void * event_info) { Ivug_MainView *pMainView = (Ivug_MainView *)data; @@ -191,18 +166,6 @@ static void _on_add_tag_view_response(ivug_name_response resp, const char *str, ivug_main_view_set_hide_timer(pMainView); } -static void -_on_setasview_deleted(void *data, Evas *e , Evas_Object *obj , void *event_info ) -{ - ivug_retm_if(!data, "data is NULL"); - Ivug_MainView *pMainView = (Ivug_MainView *)data; - MSG_MAIN_HIGH("SetAS View is destroyed"); - - pMainView->pSetAsView = NULL; - - ivug_main_view_set_hide_timer(pMainView); -} - static void _on_setas_view_destroyed(void *data, Evas_Object *obj, void *event_info) { IV_ASSERT(data != NULL); @@ -228,8 +191,6 @@ _on_timeout_response(void *data, Evas_Object *obj, void *event_info) } - -#ifdef USE_DEFAULT_APP_SERVICE void _on_share_selected(void *data, Evas_Object *obj, void *event_info) { IV_ASSERT(data != NULL); @@ -261,14 +222,7 @@ void _on_share_selected(void *data, Evas_Object *obj, void *event_info) } char *path = NULL; - if(mdata->slide_type == SLIDE_TYPE_WEB_IMAGE) - { - path = mdata->fileurl; - } - else - { - path = mdata->filepath; - } + path = mdata->filepath; bool ret = false; @@ -282,112 +236,11 @@ void _on_share_selected(void *data, Evas_Object *obj, void *event_info) evas_object_del(obj); } -#else -void _on_share_selected(void *data, Evas_Object *obj, void *event_info) -{ - IV_ASSERT(data != NULL); - - Ivug_MainView *pMainView = (Ivug_MainView *)data; - IV_ASSERT(pMainView->ext_ug == NULL); - - Ivug_ListPopup_Item *item = (Ivug_ListPopup_Item *)event_info; - - const char *label = (const char *)ivug_listpopup_item_get_data(item); - - if(label == NULL) - { - MSG_MAIN_ERROR("label is NULL"); - evas_object_del(obj); - ivug_main_view_set_hide_timer(pMainView); - return; - } - MSG_MAIN_HIGH("text(%s) is clicked", label); - - Media_Item *mitem = ivug_slider_get_item(pMainView->slider); - Media_Data *mdata = ivug_medialist_get_data(mitem); - - if(mdata == NULL) - { - MSG_MAIN_ERROR("sd is NULL"); - evas_object_del(obj); - return; - } - - char *path = NULL; - if(mdata->slide_type == SLIDE_TYPE_WEB_IMAGE) - { - path = mdata->fileurl; - } - else - { - path = mdata->filepath; - } - - bool ret = false; - - if(strncmp(label, IDS_MESSAGE, strlen(label)) == 0) - { - pMainView->ext_ug = ivug_ext_launch_message(path, _on_ext_ug_destroy_cb, data); - } - else if(strncmp(label, IDS_EMAIL, strlen(label)) == 0) - { - ret = ivug_ext_launch_email(path); - } - else if(strncmp(label, IDS_BLUETOOTH, strlen(label)) == 0) - { - pMainView->ext_ug = ivug_ext_launch_bluetooth_send(path, _on_ext_ug_destroy_cb, data); - } - else if(strncmp(label, IDS_PRINT_VIA_BLUETOOH, strlen(IDS_PRINT_VIA_BLUETOOH)) == 0) // for distinguish print - { - pMainView->ext_ug = ivug_ext_launch_bluetooth_print(path, _on_ext_ug_destroy_cb, data); - } - else if(strncmp(label, IDS_FACEBOOK, strlen(label)) == 0) - { - ret = ivug_ext_launch_sns("com.samsung.facebook", path); - } - else if(strncmp(label, IDS_PICASA, strlen(label)) == 0) - { - ret = ivug_ext_launch_sns("com.samsung.picasa", path); - } - else if(strncmp(label, IDS_TWITTER, strlen(label)) == 0) - { - ret = ivug_ext_launch_sns("com.samsung.twitter", path); - } - else if(strncmp(label, IDS_YOUTUBE, strlen(label)) == 0) - { - ret = ivug_ext_launch_sns("com.samsung.youtube", path); - } - else if(strncmp(label, IDS_WIFI_DIRECT, strlen(label)) == 0) - { - pMainView->ext_ug = ivug_ext_launch_wifi_file_transfer(path, _on_ext_ug_destroy_cb, data); - } - else - { - MSG_MAIN_WARN("Unknown Share type : %s", label); - } - - /* appsvc failed or ug_create failed */ - if(ret == false && pMainView->ext_ug == NULL) - { - ivug_timeout_popup_show(pMainView->layout, _on_timeout_response, pMainView, NULL, IDS_APPLICATION_NOT_INSTALLED); - } - - evas_object_del(obj); -} -#endif - -static int -_on_addhome_result_cb(int ret, int pid, void *data) -{ - MSG_MAIN_HIGH("Client pid: %d, Return: %d", pid, ret); - return 0; -} static void _create_setas_view(Ivug_MainView *pMainView, const char *filepath, ivug_set_screen_type type) { pMainView->pSetAsView = ivug_setas_view_screen_create(pMainView->layout, IVUG_SETAS_NORMAL, type); Evas_Object *setasOjbect = ivug_setas_view_object_get(pMainView->pSetAsView); - //evas_object_event_callback_add(setasOjbect, EVAS_CALLBACK_DEL, _on_setasview_deleted, pMainView); evas_object_smart_callback_add(setasOjbect, "destroy", _on_setas_view_destroyed, pMainView); Evas_Object *back_btn = ivug_button_add(pMainView->navi_bar, "naviframe/end_btn/default", @@ -432,8 +285,6 @@ void _on_setas_selected(void *data, Evas_Object *obj, void *event_info) return; } - Evas_Object *setasOjbect; - if(strncmp(label, IDS_HOME_SCREEN, strlen(label)) == 0) { _create_setas_view(pMainView, mdata->filepath, IVUG_CTRLBAR_SET_SCREEN_HOME); @@ -747,7 +598,7 @@ _iter_album_list(media_handle media, void *user_data) if(strlen(name) == 0) { - ivug_listpopup_itemlist_add(items, 0, NULL, IDS_NO_NAME, (void *)strdup(path), false); // TODO : Memory leak uuid. + ivug_listpopup_itemlist_add(items, 0, NULL, IDS_NO_NAME, (void *)strdup(path), false); } else { @@ -1275,9 +1126,6 @@ void on_btn_share_clicked(void *data, Evas_Object *obj, void *event_info) ivug_listpopup_item_append(popup, NULL, IDS_YOUTUBE, IDS_YOUTUBE); break; - case SLIDE_TYPE_STREAMING: - // do not share about streaming - break; case SLIDE_TYPE_UNKNOWN: ivug_listpopup_item_append(popup, NULL, IDS_BLUETOOTH, IDS_BLUETOOTH); break; @@ -1458,27 +1306,6 @@ void on_btn_slideshow_clicked(void *data, Evas_Object *obj, void *event_info) } - -void on_btn_edit_clicked(void *data, Evas_Object *obj, void *event_info) -{ - Ivug_MainView *pMainView = (Ivug_MainView *)data; - IV_ASSERT(pMainView != NULL); - - Media_Item *mitem = ivug_slider_get_item(pMainView->slider); - Media_Data *mdata = ivug_medialist_get_data(mitem); - IV_ASSERT(mdata != NULL); - - if(mdata->slide_type == SLIDE_TYPE_IMAGE) - { - ivug_ext_launch_default(mdata->filepath, SERVICE_OPERATION_EDIT, NULL, NULL); - } - else if(mdata->slide_type == SLIDE_TYPE_VIDEO) - { - ivug_ext_launch_videoeditor(mdata->filepath); - } - -} - void on_btn_details_close_clicked(void *data, Evas_Object *obj, void *event_info) { Ivug_MainView *pMainView = (Ivug_MainView *)data; @@ -1578,18 +1405,7 @@ _on_copy_selected(void *data, Evas_Object *obj) char *path = NULL; int len = 0; - if(mdata->slide_type == SLIDE_TYPE_WEB_IMAGE) - { - if(mdata->filepath) - { - path = mdata->filepath; - } - else - { - path = mdata->thumbnail_path; - } - } - else if(mdata->slide_type == SLIDE_TYPE_VIDEO) + if(mdata->slide_type == SLIDE_TYPE_VIDEO) { path = mdata->thumbnail_path; } @@ -1844,18 +1660,6 @@ static void _on_more_selected(void *data, Evas_Object *obj, void *event_info) _on_rotate_right_selected(data, obj); ivug_main_view_set_hide_timer(pMainView); } - else if(strncmp(label, "Select Music", strlen(label)) == 0) - { - pMainView->ext_ug = ivug_ext_launch_select_music(_on_ext_music_ug_result_cb, _on_ext_ug_destroy_cb, data); - } - else if(strncmp(label, IDS_EDIT, strlen(label)) == 0) - { - on_btn_edit_clicked(data, obj, event_info); - } - else if(strncmp(label, IDS_TRIM, strlen(label)) == 0) - { - on_btn_edit_clicked(data, obj, event_info); - } else if(strncmp(label, IDS_SET_AS, strlen(label)) == 0) { on_btn_setas_clicked(data, obj, event_info); @@ -1885,7 +1689,7 @@ static void _on_more_selected(void *data, Evas_Object *obj, void *event_info) ivug_main_view_set_hide_timer(pMainView); return; } - bool ret = ivug_ext_launch_print(mdata->filepath); + ivug_ext_launch_print(mdata->filepath); } evas_object_del(pMainView->ctx_popup); @@ -1922,17 +1726,12 @@ void on_btn_more_clicked(void *data, Evas_Object *obj, void *event_info) if(mdata->slide_type == SLIDE_TYPE_IMAGE) { - if(mdata->bIsDRMContent == EINA_FALSE) - { - ivug_listpopup_item_append(popup, NULL, IDS_EDIT, IDS_EDIT); - } ivug_listpopup_item_append(popup, NULL, IDS_SET_AS, IDS_SET_AS); ivug_listpopup_item_append(popup, NULL, IDS_SLIDE_SHOW, IDS_SLIDE_SHOW); ivug_listpopup_item_append(popup, NULL, IDS_DETAILS, IDS_DETAILS); ivug_listpopup_item_append(popup, NULL, IDS_ADD_TAG, IDS_ADD_TAG); ivug_listpopup_item_append(popup, NULL, IDS_PRINT, IDS_PRINT); - if(mdata->bIsDRMContent == EINA_FALSE) { ivug_listpopup_item_append(popup, NULL, IDS_CROP, IDS_CROP); @@ -1950,16 +1749,6 @@ void on_btn_more_clicked(void *data, Evas_Object *obj, void *event_info) } } } - else if(mdata->slide_type == SLIDE_TYPE_WEB_IMAGE) - { - ivug_listpopup_item_append(popup, NULL, IDS_SLIDE_SHOW, IDS_SLIDE_SHOW); - slide_state_t state = ivug_slider_get_state(pMainView->slider); - if(state == SLIDE_STATE_LOADED) - { - ivug_listpopup_item_append(popup, NULL, IDS_SET_AS, IDS_SET_AS); - ivug_listpopup_item_append(popup, NULL, IDS_DETAILS, IDS_DETAILS); - } - } else if(mdata->slide_type == SLIDE_TYPE_VIDEO) { if(ivug_is_editable_video_file(mdata->filepath) == true) @@ -1971,10 +1760,6 @@ void on_btn_more_clicked(void *data, Evas_Object *obj, void *event_info) ivug_listpopup_item_append(popup, NULL, IDS_ADD_TAG, IDS_ADD_TAG); //ivug_listpopup_item_append(popup, NULL, IDS_CROP, IDS_CROP); } - else if(mdata->slide_type == SLIDE_TYPE_STREAMING) - { - ivug_listpopup_item_append(popup, NULL, IDS_DETAILS, IDS_DETAILS); - } Evas_Coord x, y; Evas_Coord w, h; diff --git a/main/src/view/ivug-main-view-menu.h b/main/src/view/ivug-main-view-menu.h old mode 100644 new mode 100755 index 9dcbcd0..0137d04 --- a/main/src/view/ivug-main-view-menu.h +++ b/main/src/view/ivug-main-view-menu.h @@ -28,7 +28,6 @@ extern "C" { void on_btn_selectcancel_clicked(void *data, Evas_Object *obj, void *event_info); void on_btn_selectok_clicked(void *data, Evas_Object *obj, void *event_info); -void on_btn_edit_clicked(void *data, Evas_Object *obj, void *event_info); void on_btn_slideshow_clicked(void *data, Evas_Object *obj, void *event_info); void on_btn_tag_clicked(void *data, Evas_Object *obj, void *event_info); void on_btn_save_clicked(void *data, Evas_Object *obj, void *event_info); diff --git a/main/src/view/ivug-main-view-toolbar.cpp b/main/src/view/ivug-main-view-toolbar.cpp old mode 100644 new mode 100755 index 42374bf..8797287 --- a/main/src/view/ivug-main-view-toolbar.cpp +++ b/main/src/view/ivug-main-view-toolbar.cpp @@ -32,7 +32,6 @@ #define ICON_PATH_INFO CONTROL_ICON_DIRECTORY_PATH"/T01_1_controlbar_icon_detail.png" #define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png" #define ICON_PATH_CLOSE CONTROL_ICON_DIRECTORY_PATH"/01_controllbar_icon_close.png" -#define ICON_PATH_ALLSHARE CONTROL_ICON_DIRECTORY_PATH"/T01_1_title_icon_device.png" #define ICON_PATH_MORE CONTROL_ICON_DIRECTORY_PATH"/T01_Title_icon_more.png" @@ -90,14 +89,6 @@ _get_tool_bar_type(ivug_mode mode, Media_Type slide_type ) { tool_bar_type = NAVI_BAR_TYPE_VIDEO; } - else if (slide_type == SLIDE_TYPE_WEB_IMAGE) - { - tool_bar_type = NAVI_BAR_TYPE_WEB_IMAGAE; - } - else if (slide_type == SLIDE_TYPE_STREAMING) - { - tool_bar_type = NAVI_BAR_TYPE_EMPTY; - } else { tool_bar_type = NAVI_BAR_TYPE_EMPTY; @@ -105,11 +96,6 @@ _get_tool_bar_type(ivug_mode mode, Media_Type slide_type ) break; case IVUG_MODE_SINGLE: case IVUG_MODE_FILE: - if(slide_type == SLIDE_TYPE_WEB_IMAGE) - { - tool_bar_type = NAVI_BAR_TYPE_WEB_IMAGAE; - } - else { tool_bar_type = NAVI_BAR_TYPE_FILE; } @@ -157,10 +143,6 @@ _get_ctrl_bar_type(ivug_mode mode, Media_Type slide_type) { type = CTRL_BAR_TYPE_IMAGE; } - else if (slide_type == SLIDE_TYPE_WEB_IMAGE || slide_type == SLIDE_TYPE_STREAMING) - { - type = CTRL_BAR_TYPE_READ_ONLY; - } else if (slide_type == SLIDE_TYPE_VIDEO) { type = CTRL_BAR_TYPE_VIDEO; @@ -177,11 +159,6 @@ _get_ctrl_bar_type(ivug_mode mode, Media_Type slide_type) break; case IVUG_MODE_SINGLE: case IVUG_MODE_FILE: - if(slide_type == SLIDE_TYPE_WEB_IMAGE) - { - type = CTRL_BAR_TYPE_READ_ONLY; - } - else { type = CTRL_BAR_TYPE_FILE; } @@ -202,65 +179,9 @@ _get_ctrl_bar_type(ivug_mode mode, Media_Type slide_type) return type; } -void _update_toolbuttons(Ivug_MainView *pMainView) -{ - -/* - |------------------| - |elm_navigation_bar| - |------------------| - | | - | | - | | - | | - |------------------| - | tool_bar | - |------------------| -*/ - - slide_state_t state = ivug_slider_get_state(pMainView->slider); - - if(pMainView->view_by == IVUG_VIEW_BY_WEB || pMainView->view_by == IVUG_VIEW_BY_WEBALBUM) - { - if(state == SLIDE_STATE_LOADED) - { - elm_object_disabled_set(pMainView->btn_share, EINA_FALSE); - elm_object_disabled_set(pMainView->btn_download, EINA_FALSE); - } - } - else if(pMainView->view_by == IVUG_VIEW_BY_PTP) - { - if(state == SLIDE_STATE_LOADED) - { - elm_object_disabled_set(pMainView->btn_share, EINA_FALSE); - } - } -} - void _create_main_menu(Ivug_MainView *pMainView) { - if(pMainView->view_by == IVUG_VIEW_BY_WEB || pMainView->view_by == IVUG_VIEW_BY_WEBALBUM) - { - Evas_Object *btn_more = ivug_button_add(pMainView->navi_bar, "naviframe/more/default", - NULL, NULL, on_btn_more_clicked, pMainView); - elm_object_item_part_content_set(pMainView->navi_it, "toolbar_more_btn", btn_more); - - pMainView->btn_share = ivug_button_add(pMainView->navi_bar, "naviframe/toolbar/default", - IDS_SHARE, NULL, on_btn_share_clicked, pMainView); - elm_object_item_part_content_set(pMainView->navi_it, "toolbar_button1", pMainView->btn_share); - - pMainView->btn_download = ivug_button_add(pMainView->navi_bar, "naviframe/toolbar/default", - IDS_DOWNLOAD, NULL, on_btn_save_clicked, pMainView); - elm_object_item_part_content_set(pMainView->navi_it, "toolbar_button2", pMainView->btn_download); - - elm_object_disabled_set(pMainView->btn_share, EINA_TRUE); - elm_object_disabled_set(pMainView->btn_download, EINA_TRUE); - } - else if(pMainView->view_by == IVUG_VIEW_BY_ALLSHARE) - { - //TODO: add more, connection info, download btn - } - else if(pMainView->mode == IVUG_MODE_DISPLAY) + if(pMainView->mode == IVUG_MODE_DISPLAY) { Evas_Object *btn_save = ivug_button_add(pMainView->navi_bar, "naviframe/toolbar/default", IDS_SAVE, NULL, on_btn_selectok_clicked, pMainView); diff --git a/main/src/view/ivug-main-view-toolbar.h b/main/src/view/ivug-main-view-toolbar.h old mode 100644 new mode 100755 index bb714e8..24e9aca --- a/main/src/view/ivug-main-view-toolbar.h +++ b/main/src/view/ivug-main-view-toolbar.h @@ -27,11 +27,6 @@ ivug_toolbar _get_tool_bar_type(ivug_mode mode, Media_Type slide_type ); Evas_Object *_create_ctrl_bar(Evas_Object *parent); Evas_Object *_create_tool_bar(Evas_Object *parent); -/* - Enable / Disable buttons on tool bar -*/ -void _update_toolbuttons(Ivug_MainView *pMainView); - void _change_close_to_details(Ivug_MainView *pMainView); void _change_details_to_close(Ivug_MainView *pMainView); diff --git a/main/src/view/ivug-main-view.cpp b/main/src/view/ivug-main-view.cpp index 28ea235..78a1560 100755 --- a/main/src/view/ivug-main-view.cpp +++ b/main/src/view/ivug-main-view.cpp @@ -78,7 +78,6 @@ static void _update_title(Ivug_MainView *pMainView) #define MAX_TITLE_LEN 256 static char title[MAX_TITLE_LEN]; - static char subtitle[MAX_TITLE_LEN]; Media_Item *mitem = ivug_slider_get_item(pMainView->slider); Media_Data *mdata = ivug_medialist_get_data(mitem); @@ -91,9 +90,7 @@ static void _update_title(Ivug_MainView *pMainView) if (pMainView->view_by == IVUG_VIEW_BY_FOLDER || pMainView->view_by == IVUG_VIEW_BY_ALL - || pMainView->view_by == IVUG_VIEW_BY_ALLSHARE - || pMainView->view_by == IVUG_VIEW_BY_PLACES - || pMainView->view_by == IVUG_VIEW_BY_WEBALBUM) + || pMainView->view_by == IVUG_VIEW_BY_PLACES) { snprintf(title, sizeof(title), "%d/%d", mdata->index + 1, @@ -149,13 +146,6 @@ _on_longpress_popup_selected(void *data, Evas_Object *obj, void *event_info) // This Will add to the article char buf[IVUG_MAX_FILE_PATH_LEN] = {0,}; - if(mdata->slide_type == SLIDE_TYPE_WEB_IMAGE || mdata->slide_type == SLIDE_TYPE_STREAMING) - { - path = mdata->fileurl; - len = strlen(mdata->fileurl)+1; - strncpy(buf, mdata->fileurl, IVUG_MAX_FILE_PATH_LEN); - } - else { path = mdata->filepath; len = strlen(mdata->filepath)+strlen("file://")+1; @@ -249,15 +239,6 @@ static void _on_resize(void *data, Evas *e, Evas_Object *obj, void *event_info) elm_slider_value_set(pMainView->zoom_slider, 1.0); } -static void -_on_timeout_response(void *data, Evas_Object *obj, void *event_info) -{ - IV_ASSERT(data != NULL); - Ivug_MainView *pMainView = (Ivug_MainView *)data; - - ivug_main_view_set_hide_timer(pMainView); -} - static bool _destory_slideshow_and_ug(Ivug_MainView *pMainView, int state, bool bMmc_out) @@ -299,11 +280,9 @@ void _ivug_main_on_mmc_state_changed(keynode_t* node, void *data) if(pMainView->ssHandle) { - //ivug_timeout_popup_show(ivug_ss_object_get(pMainView->ssHandle), _on_timeout_response, pMainView, IDS_ERROR, IDS_SD_CARD_REMOVED); ivug_ss_set_stop(pMainView->ssHandle); _destory_slideshow_and_ug(pMainView, SLIDE_SHOW_STOPPED, true); } else { - //ivug_timeout_popup_show(pMainView->layout, _on_timeout_response, pMainView, IDS_ERROR, IDS_SD_CARD_REMOVED); if(pMainView->exit_timer == NULL) { pMainView->exit_timer = ecore_timer_add(0.2, _on_exit_timer_expired, data); @@ -499,7 +478,6 @@ void _ivug_main_view_drm_process(drm_constraints result, int info, void *data) break; case IVUG_DRM_RESULT_ACCUMULATED: MSG_MAIN_HIGH("Accumulated time = %d", info); - /* TODO : get more license popup? */ break; case IVUG_DRM_RESULT_DATETIME: case IVUG_DRM_RESULT_TIMED_COUNT: @@ -528,7 +506,6 @@ _on_slider_clicked(void *data, Evas_Object *obj, void *event_info) return; } -// TODO : Bug. menu bar is blinking when stopping slide show. if (pMainView->bShowMenu) { ivug_main_view_hide_menu_bar(pMainView); @@ -557,11 +534,8 @@ _on_slider_icon_clicked(void *data, Evas_Object *obj, void *event_info) } // "Add tag" in video player shows only when launching from gallery. - if (pMainView->view_by == IVUG_VIEW_BY_ALLSHARE) - { - } else if (pMainView->mode == IVUG_MODE_FILE || pMainView->mode == IVUG_MODE_DISPLAY || pMainView->mode == IVUG_MODE_SINGLE ) - { // TODO : Need description + { MSG_MAIN_HIGH("Launching simple video player. Mode=%d", pMainView->mode); ivug_ext_launch_videoplayer_simple(mdata->filepath); } @@ -771,7 +745,6 @@ _on_slider_item_changed(void *data, Evas_Object *obj, void *event_info) pMainView->longpress_popup = NULL; } -// TODO : DRM consumption drm_data_t *drm_data = ivug_slider_item_check_drm_constraint(sitem); if(drm_data) { @@ -824,16 +797,6 @@ _on_slider_item_state_changed(void *data, Evas_Object *obj, void *event_info) _ivug_selectioninfo_create(pMainView, IDS_DOWNLOAD_FAILED); } -// TODO : DRM consumption - -// Update Main View. - if ( pMainView->bShowMenu == true ) - { - _update_toolbuttons(pMainView); - } - - Media_Data *mdata = ivug_medialist_get_data(ivug_slider_item_data_get(sitem)); - } @@ -1003,28 +966,12 @@ ivug_main_view_set_list(Ivug_MainView *pMainView, ivug_parameter *ivug_param) goto LOAD_LIST_FAILED; } -#ifdef USE_RESCAN_FILE_PATH_AT_LIST - if(filter->view_by != IVUG_VIEW_BY_ALLSHARE) // TODO: for allshare TEST - { - if(strncmp(pData->fileurl, ivug_param->filepath, strlen(pData->fileurl)) != 0) - { - current = ivug_medialist_find_item_by_filename(mlist, ivug_param->filepath); - if(current == NULL) - { - MSG_MAIN_ERROR("Media list load failed, %s is not exist at list", ivug_param->filepath); - goto LOAD_LIST_FAILED; - } - } - } -#endif - if(filter->view_by == IVUG_VIEW_BY_ALL) { pMainView->album_name = strdup(IDS_ALL_ALBUMS); } else if(filter->view_by == IVUG_VIEW_BY_FOLDER) { - // TODO : it is not run!! DB problem!!! /* media_handle m_handle = ivug_db_get_folder_handle(ecore_file_dir_get(ivug_param->filepath)); if(m_handle == NULL) @@ -1430,8 +1377,6 @@ void ivug_main_view_start_slideshow(Ivug_MainView *pMainView, Eina_Bool bSlideFi ivug_slider_pause(pMainView->slider); current = ivug_slider_get_item(pMainView->slider); - // TODO : After slideshow is finished, how can I resume??? - ivug_prohibit_lcd_off(); //ivug_main_view_hide_menu_bar(pMainView); @@ -1495,9 +1440,6 @@ ivug_main_view_resume(Ivug_MainView *pMainView) IV_ASSERT(mdata != NULL); -// TODO : Check this routine!. -// TODO : Should implement again!! - if (mdata->slide_type == SLIDE_TYPE_IMAGE || mdata->slide_type == SLIDE_TYPE_VIDEO ) { if(mdata->filepath && ecore_file_exists(mdata->filepath)) // Current file is not deleted @@ -1620,19 +1562,6 @@ ivug_main_view_destroy(Ivug_MainView *pMainView) return ; } -static Eina_Bool _on_hide_timer_expired(void *data) -{ - ivug_retv_if(!data, ECORE_CALLBACK_CANCEL); - - Ivug_MainView *pMainView = (Ivug_MainView *)data; - - pMainView->hide_timer = NULL; - - ivug_main_view_hide_menu_bar(pMainView); - - return ECORE_CALLBACK_CANCEL; -} - void ivug_main_view_set_hide_timer(Ivug_MainView *pMainView) { IV_ASSERT(pMainView != NULL); diff --git a/main/src/view/ivug-name-view.c b/main/src/view/ivug-name-view.c old mode 100644 new mode 100755 index 5833843..17e8c9f --- a/main/src/view/ivug-name-view.c +++ b/main/src/view/ivug-name-view.c @@ -294,7 +294,6 @@ ivug_name_view_create(Evas_Object *parent, const char *title) IV_ASSERT(parent != NULL); Ivug_NameView *pNameView = calloc(1, sizeof(Ivug_NameView)); - // TODO : ASSERT if ( pNameView == NULL) { MSG_IMAGEVIEW_ERROR("Cannot allocated memory"); diff --git a/main/src/view/ivug-setas-view-callerid.cpp b/main/src/view/ivug-setas-view-callerid.cpp index 4610f55..b329e66 100755 --- a/main/src/view/ivug-setas-view-callerid.cpp +++ b/main/src/view/ivug-setas-view-callerid.cpp @@ -92,29 +92,6 @@ typedef struct { static void _on_moved(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _on_resized(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void -_ConvertARGB888toY(unsigned char* pBuf, unsigned char* pGrayBuf, int width, int height) -{ -/* - User should malloc output buffer -*/ - unsigned char* pSrc = (unsigned char*) pBuf; - unsigned char* pDSt = (unsigned char*) pGrayBuf; - - unsigned char* pEnd = pDSt + height * width; - - while (pDSt < pEnd) - { - pSrc++; // throw Alpaha value - - unsigned long r = *pSrc++; - unsigned long g = *pSrc++; - unsigned long b = *pSrc++; - - *pDSt++ = (308 * r + 600 * g + 116 * b) >> 10; - } -} - static void _put_scissorbox_default(TSetAsData *pSetAsData) { Evas_Object *image = ivug_image_internal_image_get(pSetAsData->photocam); @@ -212,139 +189,6 @@ _on_btn_ok_clicked(void *data, Evas_Object *obj, void *event_info) } - -static void -_on_btn_cancel_clicked(void *data, Evas_Object *obj, void *event_info) -{ - TSetAsData *pSetAsData = SETAS_DATA(data); - IV_ASSERT(pSetAsData != NULL); - - MSG_SETAS_HIGH("Cancel button clicked"); - - evas_object_event_callback_del_full(pSetAsData->layout, EVAS_CALLBACK_MOVE, _on_moved, pSetAsData->layout); - evas_object_event_callback_del_full(pSetAsData->layout, EVAS_CALLBACK_RESIZE, _on_resized, pSetAsData->layout); - - if ( pSetAsData->crop.box ) - { - evas_object_del(pSetAsData->crop.box); - pSetAsData->crop.box = NULL; - } - - evas_object_smart_callback_call(pSetAsData->layout, "cancel,clicked", NULL); - -// _ivug_setas_view_remove(pSetAsData); -} - - -static void -_on_btn_rotate_r_clicked(void *data, Evas_Object *obj, void *event_info) -{ - TSetAsData *pSetAsData = SETAS_DATA(data); - IV_ASSERT(pSetAsData != NULL); - - MSG_SETAS_HIGH("Rotate r button clicked"); - - int degree = (ivug_image_rotate_get(pSetAsData->photocam) - 90) % 360; - - /////////////////////////////////////////////////////////////////// - int org_x, org_y, org_w, org_h; - - ivug_image_region_get(pSetAsData->photocam, &org_x, &org_y, &org_w, &org_h); - MSG_SETAS_MED("org_x=%d, org_y=%d, org_w=%d, org_h=%d", org_x, org_y, org_w, org_h); - - int org_sx, org_sy, org_sw, org_sh; - ivug_scissorbox_region_get(pSetAsData->crop.box, &org_sx, &org_sy, &org_sw, &org_sh); - - int dx = org_sx-org_x; - int dy = org_sy-org_y; - - ivug_image_rotate_set(pSetAsData->photocam, degree); - - int x, y, w, h; - - ivug_image_region_get(pSetAsData->photocam, &x, &y, &w, &h); - MSG_SETAS_MED("x=%d, y=%d, w=%d, h=%d", x, y, w, h); - - int sx, sy, sw, sh; - - double ratio = (double)h/org_w; // h is rotated w - - sw = org_sw*ratio; - sh = org_sh*ratio; - dx *= ratio; - dy *= ratio; - - ivug_scissorbox_boundary_set(pSetAsData->crop.box, x, y, w, h); - - /////////////////////////////////////////////////////////////////// - - int base_x = x+w; - int base_y = y; - - sx = base_x-dy-sh; - sy = base_y+dx; - - MSG_SETAS_MED("sx=%d, sy=%d, sw=%d, sh=%d", sx, sy, sw, sh); - - ivug_scissorbox_region_set(pSetAsData->crop.box, sx, sy, sh, sw); - -} - - -static void -_on_btn_rotate_l_clicked(void *data, Evas_Object *obj, void *event_info) -{ - TSetAsData *pSetAsData = SETAS_DATA(data); - IV_ASSERT(pSetAsData != NULL); - - MSG_SETAS_HIGH("Rotate l button clicked"); - - int degree = (ivug_image_rotate_get(pSetAsData->photocam) + 90) % 360; - - /////////////////////////////////////////////////////////////////// - int org_x, org_y, org_w, org_h; - - ivug_image_region_get(pSetAsData->photocam, &org_x, &org_y, &org_w, &org_h); - MSG_SETAS_MED("org_x=%d, org_y=%d, org_w=%d, org_h=%d", org_x, org_y, org_w, org_h); - - int org_sx, org_sy, org_sw, org_sh; - ivug_scissorbox_region_get(pSetAsData->crop.box, &org_sx, &org_sy, &org_sw, &org_sh); - - int dx = org_sx-org_x; - int dy = org_sy-org_y; - - ivug_image_rotate_set(pSetAsData->photocam, degree); - - int x, y, w, h; - - ivug_image_region_get(pSetAsData->photocam, &x, &y, &w, &h); - MSG_SETAS_MED("x=%d, y=%d, w=%d, h=%d", x, y, w, h); - - int sx, sy, sw, sh; - - double ratio = (double)h/org_w; // h is rotated w - - sw = org_sw*ratio; - sh = org_sh*ratio; - dx *= ratio; - dy *= ratio; - - ivug_scissorbox_boundary_set(pSetAsData->crop.box, x, y, w, h); - - /////////////////////////////////////////////////////////////////// - - int base_x = x; - int base_y = y+h; - - sx = base_x+dy; - sy = base_y-dx-sw; - - MSG_SETAS_MED("sx=%d, sy=%d, sw=%d, sh=%d", sx, sy, sw, sh); - - ivug_scissorbox_region_set(pSetAsData->crop.box, sx, sy, sh, sw); -} - - static void _on_photocam_loaded(void *data, Evas_Object *obj, void *event_info) { @@ -507,46 +351,6 @@ static void _on_resized(void *data, Evas *e, Evas_Object *obj, void *event_info) pSetAsData->prev_h = org_h; } -static void _on_removed(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - TSetAsData *pSetAsData = (TSetAsData *)data; - - MSG_SETAS_HIGH("Remoing SetAsData"); - - if(pSetAsData->notify) - { - evas_object_del(pSetAsData->notify); - pSetAsData->notify = NULL; - } - - if(pSetAsData->crop.box) - { - evas_object_del(pSetAsData->crop.box); - pSetAsData->crop.box = NULL; - } - if(pSetAsData->filepath) - { - free(pSetAsData->filepath); - pSetAsData->filepath = NULL; - } - - if(pSetAsData->drm_filepath) - { - ivug_remove_file(pSetAsData->drm_filepath); - free(pSetAsData->drm_filepath); - pSetAsData->drm_filepath = NULL; - } - - if(pSetAsData->btn_ok) - { - evas_object_del(pSetAsData->btn_ok); - pSetAsData->btn_ok = NULL; - } - - free(pSetAsData); - -} - static Evas_Event_Flags _finger_tap_end(void *data , void *event_info) { Elm_Gesture_Taps_Info *p = (Elm_Gesture_Taps_Info *) event_info; @@ -608,9 +412,6 @@ Evas_Object *_ivug_setas_callerid_create_layout(Evas_Object *parent) return NULL; } - Elm_Object_Item *item[4]; - Evas_Object *controlbar = NULL; - Evas_Object *photocam = NULL; pSetAsData->layout = ivug_layout_add2(parent, SETAS_EDJ_FILE, "setas_view"); @@ -656,7 +457,6 @@ Evas_Object *_ivug_setas_callerid_create_layout(Evas_Object *parent) elm_object_part_content_set(pSetAsData->layout, "setasview.contents", pSetAsData->contents_area); evas_object_data_set(pSetAsData->layout, "pSetAsData", pSetAsData); - //evas_object_event_callback_add(pSetAsData->layout, EVAS_CALLBACK_DEL, _on_removed, pSetAsData); evas_object_event_callback_add(pSetAsData->layout, EVAS_CALLBACK_MOVE, _on_moved, pSetAsData->layout); evas_object_event_callback_add(pSetAsData->layout, EVAS_CALLBACK_RESIZE, _on_resized, pSetAsData->layout); @@ -750,17 +550,11 @@ bool _ivug_setas_callerid_load_file(Evas_Object *obj, const char *filepath) pSetAsData->filepath = strdup(filepath); -// Set thumnail first - Evas_Object *thumbnail = NULL; Evas_Load_Error error = EVAS_LOAD_ERROR_NONE; - - { - error = ivug_image_file_set(pSetAsData->photocam, filepath, "noAnim"); - } + error = ivug_image_file_set(pSetAsData->photocam, filepath, "noAnim"); if ( error != EVAS_LOAD_ERROR_NONE ) { - // TODO : What is good for error handing?????? MSG_SETAS_ERROR("FileSet Error=%d", error); if ( error == EVAS_LOAD_ERROR_UNKNOWN_FORMAT ) diff --git a/main/src/view/ivug-setas-view-callerid.h b/main/src/view/ivug-setas-view-callerid.h old mode 100644 new mode 100755 index 2591307..69a060b --- a/main/src/view/ivug-setas-view-callerid.h +++ b/main/src/view/ivug-setas-view-callerid.h @@ -28,7 +28,6 @@ extern "C" { /* - "download,failed" - Web downloading error "load,failed" - Image decoding error "ok,clicked" - Button "OK" clicked "cancel,clicked" - Button "Cancel" clicked diff --git a/main/src/view/ivug-setas-view-wallpaper.cpp b/main/src/view/ivug-setas-view-wallpaper.cpp index d6d84ea..e00f52a 100755 --- a/main/src/view/ivug-setas-view-wallpaper.cpp +++ b/main/src/view/ivug-setas-view-wallpaper.cpp @@ -73,44 +73,6 @@ _on_btn_ok_clicked(void *data, Evas_Object *obj, void *event_info) evas_object_smart_callback_call(pSetAsData->layout, "ok,clicked", NULL); } - -static void -_on_btn_cancel_clicked(void *data, Evas_Object *obj, void *event_info) -{ - TSetAsData *pSetAsData = SETAS_DATA(data); - IV_ASSERT(pSetAsData != NULL); - - MSG_SETAS_HIGH("Cancel button clicked"); - evas_object_smart_callback_call(pSetAsData->layout, "cancel,clicked", NULL); - -// _ivug_setas_view_remove(pSetAsData); -} - - -static void -_on_btn_rotate_r_clicked(void *data, Evas_Object *obj, void *event_info) -{ - TSetAsData *pSetAsData = SETAS_DATA(data); - IV_ASSERT(pSetAsData != NULL); - - MSG_SETAS_HIGH("Rotate r button clicked"); - - ivug_image_rotate_set( pSetAsData->photocam, ( (ivug_image_rotate_get(pSetAsData->photocam) - 90) % 360 )); -} - - -static void -_on_btn_rotate_l_clicked(void *data, Evas_Object *obj, void *event_info) -{ - TSetAsData *pSetAsData = SETAS_DATA(data); - IV_ASSERT(pSetAsData != NULL); - - MSG_SETAS_HIGH("Rotate l button clicked"); - - ivug_image_rotate_set( pSetAsData->photocam, ( (ivug_image_rotate_get(pSetAsData->photocam) + 90) % 360 )); -} - - static void _on_photocam_loaded(void *data, Evas_Object *obj, void *event_info) { @@ -178,23 +140,6 @@ static void _on_resized(void *data, Evas *e, Evas_Object *obj, void *event_info) } -static void _on_removed(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - TSetAsData *pSetAsData = (TSetAsData *)data; - - MSG_SETAS_HIGH("Remoing SetAsData"); - if(pSetAsData->drm_filepath) - { - ivug_remove_file(pSetAsData->drm_filepath); - free(pSetAsData->drm_filepath); - pSetAsData->drm_filepath = NULL; - } - - free(pSetAsData); - -} - - static void _on_bg_clicked(void *data, Evas_Object* obj, const char *emission, const char *source ) { @@ -206,12 +151,10 @@ _on_bg_clicked(void *data, Evas_Object* obj, const char *emission, const char *s if(pSetAsData->bShowMenu == true) { pSetAsData->bShowMenu = false; - //TODO: hide menu } else { pSetAsData->bShowMenu = true; - //TODO: show menu } } @@ -257,7 +200,6 @@ Evas_Object *_ivug_setas_create_layout(Evas_Object *parent) MSG_SETAS_HIGH("Create setas layout"); evas_object_data_set(pSetAsData->layout, "pSetAsData", pSetAsData); - //evas_object_event_callback_add(pSetAsData->layout, EVAS_CALLBACK_DEL, _on_removed, pSetAsData); pSetAsData->contents_area = ivug_default_layout_add(parent); evas_object_name_set(pSetAsData->contents_area, "contets_area"); @@ -329,19 +271,12 @@ bool _ivug_setas_load_file(Evas_Object *obj, const char *filepath) TSetAsData *pSetAsData = SETAS_DATA(obj); MSG_SETAS_HIGH("Load image file : %s", filepath); -// Set thumnail first - Evas_Object *thumbnail = NULL; - Evas_Load_Error error = EVAS_LOAD_ERROR_NONE; - - { - error = ivug_image_file_set(pSetAsData->photocam, filepath, "noAnim"); - } + error = ivug_image_file_set(pSetAsData->photocam, filepath, "noAnim"); if ( error != EVAS_LOAD_ERROR_NONE ) { - // TODO : What is good for error handing?????? MSG_SETAS_ERROR("FileSet Error=%d", error); if ( error == EVAS_LOAD_ERROR_UNKNOWN_FORMAT ) diff --git a/main/src/view/ivug-setas-view-wallpaper.h b/main/src/view/ivug-setas-view-wallpaper.h old mode 100644 new mode 100755 index 1052524..5fb181a --- a/main/src/view/ivug-setas-view-wallpaper.h +++ b/main/src/view/ivug-setas-view-wallpaper.h @@ -25,7 +25,6 @@ extern "C" { /* - "download,failed" - Web downloading error "load,failed" - Image decoding error "ok,clicked" - Button "OK" clicked "cancel,clicked" - Button "Cancel" clicked diff --git a/main/src/view/ivug-setas-view.c b/main/src/view/ivug-setas-view.c index f268454..2cd8496 100755 --- a/main/src/view/ivug-setas-view.c +++ b/main/src/view/ivug-setas-view.c @@ -364,7 +364,6 @@ static void _on_setas_bothscreen(Ivug_SetAsView *pSetAsView) ret = ivug_config_set_lockscreen_image(lockscreen_path); if ( ret == false) { - // TODO : Do I revet homescreen if either failed????? _show_exit_popup(pSetAsView->content, title, IDS_FAILED, pSetAsView); } else @@ -601,29 +600,6 @@ _OnCancel(Ivug_SetAsView *pSetAsView) _ivug_setas_view_remove(pSetAsView); } -#ifdef TRANSITION_EFFECT -static void _signal_hide_finished(void *data, Evas_Object *obj, const char *emission, const char *source) -{ - Ivug_SetAsView *pSetAsView = data; - - IV_ASSERT(pSetAsView != NULL); - - MSG_SETAS_HIGH("_signal_hide_finished. pData=0x%08x", pSetAsView); - - ivug_setas_view_destroy(pSetAsView); -} - -static void _signal_show_finished(void *data, Evas_Object *obj, const char *emission, const char *source) -{ - Ivug_SetAsView *pSetAsView = data; - - IV_ASSERT(pSetAsView != NULL); - - MSG_SETAS_HIGH("_signal_show_finished. pData=0x%08x", pSetAsView); -} - -#endif // UG_TRANSITION_EFFECT - static void _on_setas_show(void *data, Evas *e, Evas_Object *obj, void *event_info) { MSG_SETAS_HIGH("SetAs show"); diff --git a/main/src/view/ivug-slideshow-view.cpp b/main/src/view/ivug-slideshow-view.cpp old mode 100644 new mode 100755 index e09b9c3..cd6dbf4 --- a/main/src/view/ivug-slideshow-view.cpp +++ b/main/src/view/ivug-slideshow-view.cpp @@ -258,7 +258,6 @@ ivug_slideshow_view_set_list(Ivug_SlideShowView *pSSView, ivug_parameter *ivug_p } else if(ivug_param->view_by == IVUG_VIEW_BY_FOLDER) { - // TODO : it is not run!! DB problem!!! /* media_handle m_handle = ivug_db_get_folder_handle(ecore_file_dir_get(ivug_param->filepath)); if(m_handle == NULL) @@ -388,7 +387,7 @@ ivug_slideshow_view_resume(Ivug_SlideShowView *pSSView) MSG_HIGH("Slideshow View Resumed"); - Media_Item *mitem = pSSView->ss_curItem; // TODO: Check this!!!! + Media_Item *mitem = pSSView->ss_curItem; Media_Data *mdata = ivug_medialist_get_data(mitem); IV_ASSERT(mdata != NULL); diff --git a/medialist/include/ivug-media.h b/medialist/include/ivug-media.h old mode 100644 new mode 100755 index 4439214..a62f0f1 --- a/medialist/include/ivug-media.h +++ b/medialist/include/ivug-media.h @@ -28,15 +28,10 @@ typedef enum { SLIDE_TYPE_NONE = 0x00, SLIDE_TYPE_IMAGE, SLIDE_TYPE_VIDEO, - SLIDE_TYPE_WEB_IMAGE, // Web album or All share Image - SLIDE_TYPE_STREAMING, - SLIDE_TYPE_PTP_IMAGE, SLIDE_TYPE_UNKNOWN, // File is exists but it's type is unknown. } Media_Type; -// Meida_Data can be one in File, DB, PTP, DLNA - -typedef void * allshare_item; +// Meida_Data can be one in File, DB /* This struct represents data for slide. @@ -50,14 +45,11 @@ typedef struct { int index; //Data - Media_Type slide_type; //image, video, web image. + Media_Type slide_type; //image, video bool bIsDRMContent; UUID mediaID; // Unique Media ID - allshare_item asf_item; // Allshare item - char *serverID; // Allshare server ID - char* thumbnail_path; // thumbnail image file path. char* fileurl; // file url. diff --git a/medialist/src/ivug-data-list.c b/medialist/src/ivug-data-list.c old mode 100644 new mode 100755 index 61471f6..5ee9ee5 --- a/medialist/src/ivug-data-list.c +++ b/medialist/src/ivug-data-list.c @@ -367,10 +367,6 @@ int ivug_list_get_item_cnt(const Filter_struct *filter) case IVUG_VIEW_BY_FILE: count = 1; // item count is always 1 when by file break; - case IVUG_VIEW_BY_ALLSHARE: - MSG_SDATA_FATAL("All share cannot support get count"); - goto GET_COUNT_ERROR; - break; default: MSG_SDATA_ERROR("Unhandled view_by : %d", filter->view_by); goto GET_COUNT_ERROR; diff --git a/medialist/src/ivug-filter.c b/medialist/src/ivug-filter.c old mode 100644 new mode 100755 index b374cf3..67679e5 --- a/medialist/src/ivug-filter.c +++ b/medialist/src/ivug-filter.c @@ -61,17 +61,6 @@ void ivug_data_filter_delete(Filter_struct *filter_str) uuid_free(filter->album_id); break; - case IVUG_VIEW_BY_WEB: - if ( filter->file_path ) - { - free(filter->file_path); - } - break; - - case IVUG_VIEW_BY_WEBALBUM: - uuid_free(filter->album_id); - break; - case IVUG_VIEW_BY_INVAILD: default: MSG_SDATA_WARN("Invalid ViewBy : %d", filter_str->view_by); @@ -124,19 +113,6 @@ Filter_struct *ivug_data_filter_copy(const Filter_struct *filter_str) cFilter->album_id = uuid_assign( filter->album_id ); break; - case IVUG_VIEW_BY_WEB: - cFilter->file_path = strdup( filter->file_path ); - - if ( filter->file_path ) - { - free(filter->file_path); - } - break; - - case IVUG_VIEW_BY_WEBALBUM: - cFilter->album_id = uuid_assign( filter->album_id ); - break; - case IVUG_VIEW_BY_INVAILD: default: MSG_SDATA_WARN("Invalid ViewBy : %d", filter_str->view_by); diff --git a/medialist/src/ivug-mediadata.c b/medialist/src/ivug-mediadata.c old mode 100644 new mode 100755 index dbc76f4..45d88c7 --- a/medialist/src/ivug-mediadata.c +++ b/medialist/src/ivug-mediadata.c @@ -127,18 +127,10 @@ Media_Data *ivug_alloc_mediadata_from_media_handle(media_handle media) if(media_type == MEDIA_CONTENT_TYPE_IMAGE) { - if (ivug_is_web_uri(mdata->fileurl) == true) - { - MSG_SDATA_MED("Remote image : %s. %s", uuid_getchar(mdata->mediaID), mdata->fileurl); - mdata->slide_type = SLIDE_TYPE_WEB_IMAGE; - } - else - { - MSG_SDATA_MED("Local image : %s. %s", uuid_getchar( mdata->mediaID ), mdata->fileurl); + MSG_SDATA_MED("Local image : %s. %s", uuid_getchar( mdata->mediaID ), mdata->fileurl); - mdata->slide_type = SLIDE_TYPE_IMAGE; - mdata->filepath = strdup(mdata->fileurl); - } + mdata->slide_type = SLIDE_TYPE_IMAGE; + mdata->filepath = strdup(mdata->fileurl); } else if(media_type == MEDIA_CONTENT_TYPE_VIDEO) { @@ -220,64 +212,36 @@ Media_Data *ivug_alloc_mediadata_from_filepath(const char *filepath) free(mime_type); //free strdup if (slide_type == SLIDE_TYPE_IMAGE) { - if (ivug_is_web_uri(filepath) == true) + mdata->slide_type = SLIDE_TYPE_IMAGE; + mdata->fileurl = strdup(filepath); + if (mdata->fileurl == NULL) { - mdata->slide_type = SLIDE_TYPE_WEB_IMAGE; - mdata->fileurl = strdup(filepath); - if (mdata->fileurl == NULL) - { - MSG_SDATA_ERROR("strdup return NULL"); - goto ERROR; - } - mdata->filepath = NULL; + MSG_SDATA_ERROR("strdup return NULL"); + goto ERROR; } - else + mdata->filepath = strdup(filepath); + if (mdata->filepath == NULL) { - mdata->slide_type = SLIDE_TYPE_IMAGE; - mdata->fileurl = strdup(filepath); - if (mdata->fileurl == NULL) - { - MSG_SDATA_ERROR("strdup return NULL"); - goto ERROR; - } - mdata->filepath = strdup(filepath); - if (mdata->filepath == NULL) - { - MSG_SDATA_ERROR("strdup return NULL"); - free(mdata->fileurl); - goto ERROR; - } + MSG_SDATA_ERROR("strdup return NULL"); + free(mdata->fileurl); + goto ERROR; } } else if (slide_type == SLIDE_TYPE_VIDEO) { - if (ivug_is_web_uri(filepath) == true) + mdata->slide_type = SLIDE_TYPE_VIDEO; + mdata->fileurl = strdup(filepath); + if (mdata->fileurl == NULL) { - mdata->slide_type = SLIDE_TYPE_STREAMING; - mdata->fileurl = strdup(filepath); - if (mdata->fileurl == NULL) - { - MSG_SDATA_ERROR("strdup return NULL"); - goto ERROR; - } - mdata->filepath = NULL; + MSG_SDATA_ERROR("strdup return NULL"); + goto ERROR; } - else + mdata->filepath = strdup(filepath); + if (mdata->filepath == NULL) { - mdata->slide_type = SLIDE_TYPE_VIDEO; - mdata->fileurl = strdup(filepath); - if (mdata->fileurl == NULL) - { - MSG_SDATA_ERROR("strdup return NULL"); - goto ERROR; - } - mdata->filepath = strdup(filepath); - if (mdata->filepath == NULL) - { - MSG_SDATA_ERROR("strdup return NULL"); - free(mdata->fileurl); - goto ERROR; - } + MSG_SDATA_ERROR("strdup return NULL"); + free(mdata->fileurl); + goto ERROR; } } else diff --git a/res/include/ivug-string.h b/res/include/ivug-string.h old mode 100644 new mode 100755 index 8bf7727..365f07f --- a/res/include/ivug-string.h +++ b/res/include/ivug-string.h @@ -26,7 +26,7 @@ #define N_(str) gettext_noop(str) /**< gettext_noop alias */ -#define LOCALE_PATH PREFIX"/res/locale" /*TODO!!!*/ +#define LOCALE_PATH PREFIX"/res/locale" #ifndef PACKAGE #error PACKAGE is not defined @@ -93,8 +93,6 @@ #define IDS_CALLER_ID_NOTIFY (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_SELECTED_AREA_WILL_BE_APPLIED_TO_THE_CONTACT_PICTURE")) #define IDS_PRINT_NOTIFY (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_SELECTED_AREA_WILL_BE_PRINTED")) -#define IDS_ALLSHARE_NOTIFY (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_YOU_CAN_SHARE_YOUR_MEDIA_WITH_OTHER_DEVICES_USING_NEARBY_DEVICES")) - /* Registered string in STMS IV */ #define IDS_ACCUMULATED_TIME (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_ACCUMULATED_TIME")) #define IDS_ADD_TAG (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_HEADER_ADD_TAG")) @@ -135,7 +133,6 @@ #define IDS_MAX_CHAR_LENGTH_REACHED (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_POP_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_REACHED")) #define IDS_ME (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_ME")) #define IDS_N_A (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_N_A")) -#define IDS_NEAR_DEVICES (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_NEARBY_DEVICES_T_ALLSHARE")) #define IDS_NEW_TAG (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_NEW_TAG")) #define IDS_PERMISSION_DENIED (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_POP_PERMISSION_DENIED")) #define IDS_POSSIBLE (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_POSSIBLE")) @@ -175,7 +172,6 @@ #define IDS_TWITTER (dgettext("sys_string", "IDS_COM_BODY_TWITTER")) #define IDS_YOUTUBE (dgettext("sys_string", "IDS_COM_BODY_YOU_TUBE")) -#define IDS_ALLSHARE (dgettext("sys_string", "IDS_COM_BODY_ALLSHARE")) #define IDS_APPLICATION_NOT_INSTALLED (dgettext("sys_string", "IDS_COM_BODY_APPLICATION_NOT_INSTALLED")) #define IDS_BACK (dgettext("sys_string", "IDS_COM_BODY_BACK")) #define IDS_CANCEL (dgettext("sys_string", "IDS_COM_SK_CANCEL")) diff --git a/slideshow/src/control/ivug-slideshow.cpp b/slideshow/src/control/ivug-slideshow.cpp index cd3eb19..ca266f9 100755 --- a/slideshow/src/control/ivug-slideshow.cpp +++ b/slideshow/src/control/ivug-slideshow.cpp @@ -47,18 +47,6 @@ #undef LOG_CAT #define LOG_CAT "IV-SLIDESHOW" -/* - Basic functionality is implemented. - but codes have many bugs. plz check this. - - TODO: - Resize is not handled. - Mouse routine is not handled. - Decoding faied is not processed. - - Not test except slide effect. - -*/ #define EDJ_PATH PREFIX"/res/edje/"PACKAGE #define IVUG_SS_LY_EDJ_PATH EDJ_PATH"/ivug-ss-ly.edj" @@ -212,7 +200,7 @@ static bool _ivug_ss_set_content(Slide_Layout *pSlide, Media_Item *item) MSG_HIGH("Start Loading : %s", mdata->filepath); - if(mdata->slide_type == SLIDE_TYPE_VIDEO || mdata->slide_type == SLIDE_TYPE_STREAMING) + if(mdata->slide_type == SLIDE_TYPE_VIDEO) { /* Display play icon */ edje_object_signal_emit(elm_layout_edje_get(pSlide->layout), @@ -689,7 +677,7 @@ SlideShow *ivug_ss_create(Evas_Object *parent) ivug_config_get_slideshow_setting(&(pSlideShow->ss_mode), &(pSlideShow->ss_interval_time), &ivug_effect); if(ivug_effect == IVUG_EFFECT_TYPE_UNKNOWN) { - free(pSlideShow); // TODO Memory leak. + free(pSlideShow); pSlideShow = NULL; return NULL; } @@ -875,7 +863,6 @@ bool ivug_ss_stop(SlideShow *pSlideShow) MSG_HIGH("Slide effect_engine = NULL"); pSlideShow->state = SLIDE_SHOW_STOPPED; pSlideShow->ss_Header = NULL; - // TODO : Mis-implementation evas_object_smart_callback_call(ivug_ss_object_get(pSlideShow), "slideshow,finished", (void *)SLIDE_SHOW_STOPPED); pSlideShow->bSS_StopFlag = EINA_FALSE; } diff --git a/slideshow/src/effect/ivug-anim.c b/slideshow/src/effect/ivug-anim.c old mode 100644 new mode 100755 index bdb6903..19bd0b2 --- a/slideshow/src/effect/ivug-anim.c +++ b/slideshow/src/effect/ivug-anim.c @@ -34,7 +34,6 @@ static double _anim_linear(double t, double b, double c, double d) static double _anim_sine(double t, double b, double c, double d) { -/* TODO : Consider below table reconstruct. need only 0.0 ~ 1.0 range*/ static const double const SIN_TABLE[91] = { 0.0000f, 0.0174f, 0.0349f, 0.0523f, 0.0698f, 0.0872f, 0.1045f, 0.1219f, 0.1392f, 0.1564f, diff --git a/slideshow/src/effect/ivug-dissolve.c b/slideshow/src/effect/ivug-dissolve.c old mode 100644 new mode 100755 index ed94768..7def000 --- a/slideshow/src/effect/ivug-dissolve.c +++ b/slideshow/src/effect/ivug-dissolve.c @@ -25,7 +25,6 @@ #define DISSOLVE_NUM 240 // 20 * 12 -/* TODO: Optimize the order */ const int const DISSOLVE_TABLE[DISSOLVE_NUM] = { 201, 8, 82, 163, 181, 215, 0, 126, 30, 106, 162, 122, 216, 18, 99, 70, 223, 89, 22, 191, @@ -298,7 +297,6 @@ static void __ivug_dissolve_anim(void *data, double percent) int count = (eng_data->n_row * eng_data->n_col) * percent / MAX_PERCENT; MSG_EFFECT_MED("percent = %f, count = %d", percent, count); - /* TODO: Start from last cleared pos */ int i; for (i = 0; i < count; i++) { MSG_EFFECT_MED("diss_array[%d] = %d", i, DISSOLVE_TABLE[i]); diff --git a/slideshow/src/effect/ivug-xcapture.c b/slideshow/src/effect/ivug-xcapture.c old mode 100644 new mode 100755 index 84c5735..026d5ef --- a/slideshow/src/effect/ivug-xcapture.c +++ b/slideshow/src/effect/ivug-xcapture.c @@ -173,7 +173,6 @@ static inline void *__ivug_xcapture_get_data(struct xcapture_t *handle, } -// TODO : Will rotate using pixman.. refer x11-server-utils-ex static void __ivug_xcapture_data_rotate_180cw(unsigned int **dst, unsigned int *src, int width, int height) diff --git a/widget/include/Animation.h b/widget/include/Animation.h old mode 100644 new mode 100755 index 6cbfefa..7b269d8 --- a/widget/include/Animation.h +++ b/widget/include/Animation.h @@ -48,7 +48,6 @@ class CSingleAnimator : public CAnimator private: CSingleAnimator() {}; public: -// TODO. Using factory CSingleAnimator(double first, double last, double duration, TranstionFunc transition, AnimationCB callback, void *data) { m_actor = new CActor(first, last, duration, transition, callback, data); }; diff --git a/widget/include/ECoreAnimator.h b/widget/include/ECoreAnimator.h old mode 100644 new mode 100755 index 08f0e42..9220a4a --- a/widget/include/ECoreAnimator.h +++ b/widget/include/ECoreAnimator.h @@ -42,8 +42,6 @@ private: }; #endif -// TODO : Implement using Functor. - class ECoreAnimator { static Eina_Bool _on_anim(void *data) { diff --git a/widget/include/Transit.h b/widget/include/Transit.h old mode 100644 new mode 100755 index f7d4988..bbc59d5 --- a/widget/include/Transit.h +++ b/widget/include/Transit.h @@ -148,7 +148,6 @@ public: CActor() { m_tween = new CTransit(); }; -// TODO : Using functor! CActor(double first, double last, double duration, TranstionFunc transition, AnimationCB callback, void *data) : m_callback(callback), m_data(data) { m_tween = new CTransit(first, last, duration, transition); }; diff --git a/widget/src/image/ivug-image.cpp b/widget/src/image/ivug-image.cpp index 18f954e..90bf3c6 100755 --- a/widget/src/image/ivug-image.cpp +++ b/widget/src/image/ivug-image.cpp @@ -28,7 +28,6 @@ static Evas_Object *_crop_image(const char *file, int /* image coord */crop_x, int crop_y, int crop_w, int crop_h, int final_w, int final_h) { -// TODO : Should implement no-region image cropping (bmp or gif ) MSG_HIGH("Crop image XYWH(%d,%d,%d,%d) Dimension(%d,%d)", crop_x, crop_y, crop_w, crop_h, final_w, final_h); // 1. Load source image into buffer canvas. -- 2.7.4