X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia_info.c;h=32c0f0adc27f2c1ebeed1e1d5b790149a9fa15b6;hb=e84e224cbb3cda3a91cea699a6d096401db850b8;hp=74873abcaf4c43036410a5e87ba5611af9a0be5b;hpb=05f99f8f2009914416a63293f8694e7b88c5ee39;p=platform%2Fcore%2Fapi%2Fmedia-content.git diff --git a/src/media_info.c b/src/media_info.c index 74873ab..32c0f0a 100644 --- a/src/media_info.c +++ b/src/media_info.c @@ -582,10 +582,6 @@ int media_info_destroy(media_info_h media) g_free(_media->modified_month); #endif g_free(_media->storage_uuid); -#ifdef _USE_SENIOR_MODE - g_free(_media->contact); - g_free(_media->app_data); -#endif if (_media->image_meta) { g_free(_media->image_meta->media_id); @@ -651,11 +647,6 @@ int media_info_clone(media_info_h *dst, media_info_h src) #ifdef _USE_TVPD_MODE _dst->modified_month = g_strdup(_src->modified_month); #endif -#ifdef _USE_SENIOR_MODE - _dst->contact = g_strdup(_src->contact); - _dst->app_data = g_strdup(_src->app_data); -#endif - _dst->media_type = _src->media_type; _dst->size = _src->size; _dst->added_time = _src->added_time; @@ -1149,140 +1140,6 @@ int media_info_get_storage_type(media_info_h media, media_content_storage_e *sto return MEDIA_CONTENT_ERROR_NONE; } -#ifdef _USE_SENIOR_MODE -int media_info_set_contact(media_info_h media, const char *contact) -{ - media_info_s *_media = (media_info_s*)media; - - content_retip_if_fail(media); - - g_free(_media->contact); - _media->contact = g_strdup(contact); - - return MEDIA_CONTENT_ERROR_NONE; -} - -int media_info_set_app_data(media_info_h media, const char *app_data) -{ - media_info_s *_media = (media_info_s*)media; - - content_retip_if_fail(media); - - g_free(_media->app_data); - _media->app_data = g_strdup(app_data); - - return MEDIA_CONTENT_ERROR_NONE; -} - -int media_info_insert_to_db_with_contact_data(const char *path, const char* contact, const char* app_data, media_info_h *info) -{ - int ret = media_info_insert_to_db(path, info); - content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "media_info_insert_to_db [%s] failed", path); - - ret = media_info_set_contact(*info, contact); - if (ret != MEDIA_CONTENT_ERROR_NONE) { - content_error("media_info_set_contact [%s] failed", contact); - - media_info_s* _media_info = (media_info_s*)*info; - ret = media_info_delete_from_db(_media_info->media_id); - content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "media_info_delete_from_db [%s] failed", _media_info->media_id); - - media_info_destroy(*info); - return ret; - } - - ret = media_info_set_app_data(*info, app_data); - if (ret != MEDIA_CONTENT_ERROR_NONE) { - content_error("media_info_set_app_data [%s] failed", app_data); - - media_info_s* _media_info = (media_info_s*)*info; - ret = media_info_delete_from_db(_media_info->media_id); - content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "media_info_delete_from_db [%s] failed", _media_info->media_id); - - media_info_destroy(*info); - return ret; - } - - ret = media_info_update_to_db(*info); - if (ret != MEDIA_CONTENT_ERROR_NONE) { - content_error("media_info_update_to_db [] failed"); - - media_info_s* _media_info = (media_info_s*)*info; - ret = media_info_delete_from_db(_media_info->media_id); - content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "media_info_delete_from_db [%s] failed", _media_info->media_id); - - media_info_destroy(*info); - return ret; - } - - return ret; -} - -int media_info_delete_contact_from_db(const char* contact, const char* storage_id) -{ - return -1; -} - -int media_info_delete_item(const char *media_id) -{ - int ret = MEDIA_CONTENT_ERROR_NONE; - char *path = NULL; - char *storage_id = NULL; - - content_retip_if_fail(STRING_VALID(media_id)); - - ret = __media_info_get_media_path_by_id_from_db(media_id, &path); - if (ret != MEDIA_CONTENT_ERROR_NONE) { - content_error("__media_info_get_media_path_by_id_from_db failed : %d", ret); - g_free(path); - return ret; - } - - ret = _media_db_get_storage_id_by_media_id(media_id, &storage_id); - if (ret != MEDIA_CONTENT_ERROR_NONE) { - content_error("_media_db_get_storage_id_by_media_id failed : %d", ret); - g_free(path); - return ret; - } - - ret = media_svc_delete_item_by_path(_content_get_db_handle(), storage_id, path, tzplatform_getuid(TZ_USER_NAME)); - g_free(storage_id); - if (ret != MEDIA_CONTENT_ERROR_NONE) { - content_error("remove from DB failed : %d", ret); - g_free(path); - return ret; - } - - ret = media_svc_remove_file(path); - g_free(path); - - return _content_error_capi(ret); -} - -int media_info_get_contact(media_info_h media, char **contact) -{ - media_info_s *_media = (media_info_s*)media; - - content_retip_if_fail(media); - content_retip_if_fail(contact); - - *contact = g_strdup(_media->contact); - - return MEDIA_CONTENT_ERROR_NONE; -} - -int media_info_get_app_data(media_info_h media, char **app_data) -{ - media_info_s *_media = (media_info_s*)media; - - content_retip_if_fail(media); - content_retip_if_fail(app_data); - - *app_data = g_strdup(_media->app_data); - - return MEDIA_CONTENT_ERROR_NONE; -} -#endif #ifdef _USE_TVPD_MODE int media_info_get_played_count(media_info_h media, int *played_count) { @@ -1489,16 +1346,8 @@ int media_info_update_to_db(media_info_h media) media_svc_get_pinyin(_media->description, &description_pinyin); } #ifdef _USE_TVPD_MODE -#ifdef _USE_SENIOR_MODE - if (_media_content_is_support_senior_mode()) { - set_sql = sqlite3_mprintf("media_display_name=%Q, media_description=%Q, media_longitude=%f, media_latitude=%f, media_file_name_pinyin=%Q, media_description_pinyin=%Q, played_count=%d, last_played_time=%d, last_played_position=%d, media_rating=%d, media_favourite=%d, contact=%Q, app_data=%Q", - _media->display_name, _media->description, _media->longitude, _media->latitude, file_name_pinyin, description_pinyin, _media->played_count, _media->played_time, _media->played_position, _media->rating, _media->favourite, _media->contact, _media->app_data); - } else -#endif - { - set_sql = sqlite3_mprintf("media_display_name=%Q, media_description=%Q, media_longitude=%f, media_latitude=%f, media_file_name_pinyin=%Q, media_description_pinyin=%Q, played_count=%d, last_played_time=%d, last_played_position=%d, media_rating=%d, media_favourite=%d", + set_sql = sqlite3_mprintf("media_display_name=%Q, media_description=%Q, media_longitude=%f, media_latitude=%f, media_file_name_pinyin=%Q, media_description_pinyin=%Q, played_count=%d, last_played_time=%d, last_played_position=%d, media_rating=%d, media_favourite=%d", _media->display_name, _media->description, _media->longitude, _media->latitude, file_name_pinyin, description_pinyin, _media->played_count, _media->played_time, _media->played_position, _media->rating, _media->favourite); - } #else set_sql = sqlite3_mprintf("media_display_name=%Q, media_description=%Q, media_longitude=%f, media_latitude=%f, media_file_name_pinyin=%Q, media_description_pinyin=%Q, media_rating=%d, media_favourite=%d", _media->display_name, _media->description, _media->longitude, _media->latitude, file_name_pinyin, description_pinyin, _media->rating, _media->favourite); #endif