From 4157d9b221b6610fa0ddf49c7742b89185b9f719 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 21 Dec 2017 11:06:43 +0900 Subject: [PATCH] [ACR-1129] Add feature Change-Id: I8244836284444864a619fbf2bbca9395bca235a0 Signed-off-by: Minje Ahn --- doc/media_content_doc.h | 16 +++++------ include/media_content.h | 4 +++ include/media_content_type.h | 54 ++++++++++++++++++++++++++++++++++++ include/media_info.h | 8 ++++++ include_product/media_content.h | 4 +++ include_product/media_content_type.h | 54 ++++++++++++++++++++++++++++++++++++ include_product/media_info.h | 8 ++++++ 7 files changed, 140 insertions(+), 8 deletions(-) diff --git a/doc/media_content_doc.h b/doc/media_content_doc.h index a6aff7e..3f650da 100755 --- a/doc/media_content_doc.h +++ b/doc/media_content_doc.h @@ -197,7 +197,7 @@ * The Media Filter API provides functions for creating and destroying media filters.\n * It provide functions to set and get properties of the filter associated with a given media filter. \n * For creating a media filter (@ref filter_h), call #media_filter_create() function and call #media_filter_destroy() function for destroying an existing filter. \n - * For setting filter properties call the respective set functions e.g. to set offset position, call #media_filter_set_offset() function and + * For setting filter properties call the respective set functions e.g. to set offset position, call #media_filter_set_offset() function and * call #media_filter_set_condition() function to set the condition like an sql "where" clause. \n * Searchable expression can use one of the following forms: * @@ -225,12 +225,12 @@ * And the optional ESCAPE clause is supported. Both percent symbol("%") and underscore symbol("_") are used in the LIKE pattern.\n * If these characters are used as value of LIKE operation, then the expression following the ESCAPE caluse of sqlite will be ignored. \n * - * For example, + * For example, * - column LIKE ('#%') ESCAPE('#') - "#" is escape character, it will be ignored. *\n * * - * Similarly, call respective get function to get filter properties e.g. call #media_filter_get_condition() function + * Similarly, call respective get function to get filter properties e.g. call #media_filter_get_condition() function * to get condition of the media filter and call #media_filter_get_order() function to get order (#media_content_order_e) of the filtered items and so on. * * @section CAPI_CONTENT_MEDIA_FILTER_MODULE_EXAMPLE Example @@ -392,7 +392,7 @@ * *

* For getting the audio handle (#audio_meta_h) from the media information (#media_info_h), call #media_info_get_audio() function.\n - * For getting the information related to audio files stored in the device, call the respective get functions e.g. to get the artist of a audio, call #audio_meta_get_artist() function and + * For getting the information related to audio files stored in the device, call the respective get functions e.g. to get the artist of a audio, call #audio_meta_get_artist() function and * to get bitrate of a audio, call #audio_meta_get_bit_rate() function and so on.\n * When the audio handle is no longer needed, it should be destroyed by calling #audio_meta_destroy() function.\n * @@ -416,7 +416,7 @@ * * For inserting new playlist (#media_playlist_h) in the database, call #media_playlist_insert_to_db() function and call #media_playlist_delete_from_db() function * to delete a playlist from the database.\n - * For adding a media item to the playlist, call #media_playlist_add_media() function, for removing a media item from the playlist, call + * For adding a media item to the playlist, call #media_playlist_add_media() function, for removing a media item from the playlist, call * #media_playlist_remove_media() function.\n * Finally, #media_playlist_update_to_db() function should be called so as to update the given item in the media database. * @@ -495,7 +495,7 @@ * @section CAPI_CONTENT_MEDIA_GROUP_MODULE_OVERVIEW Overview * A Media Group represents logical grouping of media files with respect to their group name. It is also used for filtering media items.\n * - * The API provides functions to get and search image, video and audio items in media group. + * The API provides functions to get and search image, video and audio items in media group. * For getting the count of media items associated with a given group, call #media_group_get_media_count_from_db() function. * * @@ -616,7 +616,7 @@ * *

* For getting the image handle (#image_meta_h) from the media information (#media_info_h), call #media_info_get_image() function.\n - * For getting the information related to image files stored in the device call the respective get functions e.g. to get the width of a image, call #image_meta_get_width() function and + * For getting the information related to image files stored in the device call the respective get functions e.g. to get the width of a image, call #image_meta_get_width() function and * to get orientation (#media_content_orientation_e) of a image, call #image_meta_get_orientation() function and so on.\n * When the image handle is no longer needed, it should be destroyed by calling #image_meta_destroy() function.\n * @@ -827,7 +827,7 @@ * - insert new bookmarks * - delete bookmarks * - * For inserting a bookmark to media item, call media_bookmark_insert_to_db() function and for deleting already set bookmark from a media, call + * For inserting a bookmark to media item, call media_bookmark_insert_to_db() function and for deleting already set bookmark from a media, call * #media_bookmark_delete_from_db() function. * For retrieving time where the bookmark is placed on the media, call #media_bookmark_get_marked_time() function. * diff --git a/include/media_content.h b/include/media_content.h index 5a70a1b..a69091a 100755 --- a/include/media_content.h +++ b/include/media_content.h @@ -103,6 +103,9 @@ int media_content_disconnect(void); * If you want to access only internal storage by using this API, you should add privilege http://tizen.org/privilege/mediastorage. \n * Or if you want to access only external storage by using this API, you should add privilege http://tizen.org/privilege/externalstorage. \n * If you can access both storage, you must add all privilege. + * @remarks Since 4.0, this function is related to the following feature:\n + * %http://tizen.org/feature/content.scanning.others\n + * If this feature is not suppported on the device, MEDIA_CONTENT_TYPE_OTHERS type file is not scanned. * * @param[in] path The file path * @@ -115,6 +118,7 @@ int media_content_disconnect(void); * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied * @retval #MEDIA_CONTENT_ERROR_DB_FAILED DB Operation failed * @retval #MEDIA_CONTENT_ERROR_DB_BUSY DB Operation busy + * @retval #MEDIA_CONTENT_ERROR_NOT_SUPPORTED Not supported * * @pre This function requires opened connection to content service by media_content_connect(). * @see media_content_connect() diff --git a/include/media_content_type.h b/include/media_content_type.h index d98562d..43203cd 100755 --- a/include/media_content_type.h +++ b/include/media_content_type.h @@ -42,6 +42,9 @@ extern "C" { * @ingroup CAPI_MEDIA_CONTENT_MODULE * @brief Enumeration for the media file format. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif + * @remarks Since 4.0, #MEDIA_CONTENT_TYPE_OTHERS is related to the following feature:\n + * %http://tizen.org/feature/content.scanning.others\n + * If this feature is not suppported on the device, MEDIA_CONTENT_TYPE_OTHERS type file is not scanned. */ typedef enum { MEDIA_CONTENT_TYPE_IMAGE = 0, /**