From 22dccb0c616a366794db2f8dceb78b9b79539deb Mon Sep 17 00:00:00 2001 From: "Haejeong, Kim" Date: Thu, 8 Oct 2015 10:34:37 +0900 Subject: [PATCH] Sync audio and video like parameter name and API descriptions Change-Id: Id615c9aa67aa20ce44888148dd5a52e0a85dfd4f --- include/media_audio.h | 141 +++++++++++++++++++++++++------------------------- include/media_video.h | 62 ++++++++++------------ src/media_audio.c | 40 +++++++------- src/media_video.c | 1 - 4 files changed, 118 insertions(+), 126 deletions(-) diff --git a/include/media_audio.h b/include/media_audio.h index 2766578..391fac5 100755 --- a/include/media_audio.h +++ b/include/media_audio.h @@ -20,14 +20,13 @@ #include - #ifdef __cplusplus extern "C" { -#endif +#endif /* __cplusplus */ /** * @file media_audio.h - * @brief This file contains the audio metadata API and related structure and enumeration. \n + * @brief This file contains the audio metadata API and related functions to proceed with audio metadata. \n * Description of the audio content involves: album, artist, album_artist, author, genre and description tags. \n * Parameters of the recording are also supported such as format, bitrate, duration, size etc. */ @@ -37,51 +36,54 @@ extern "C" { * @{ */ - /** - * @brief Destroys the audio metadata. + * @brief Clones the audio metadata. + * @details This function copies the audio metadata handle from a source to destination. + * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * - * @param[in] audio The audio metadata handle + * @remarks You must release the destination handle using audio_meta_destroy(). + * + * @param[out] dst The destination handle to the audio metadata + * @param[in] src The source handle to the audio metadata * * @return @c 0 on success, * otherwise a negative error value * - * @retval #MEDIA_CONTENT_ERROR_NONE Successful + * @retval #MEDIA_CONTENT_ERROR_NONE Successful * @retval #MEDIA_CONTENT_ERROR_INVALID_PARAMETER Invalid parameter + * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied * - * @pre Get a copy of audio metadata handle handle by calling audio_meta_clone(). - * - * @see audio_meta_clone() + * @see audio_meta_destroy() */ -int audio_meta_destroy(audio_meta_h audio); +int audio_meta_clone(audio_meta_h *dst, audio_meta_h src); /** - * @brief Clones the audio metadata. - * @details This function copies the audio metadata handle from source to destination. + * @brief Destroys the audio metadata. + * @details This function frees all resources related to the audio metadata handle. This handle + * no longer can be used to perform any operation. A new handle has to + * be created before the next use. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * - * @remarks The destination handle must be released using audio_meta_destroy(). - * - * @param[out] dst The destination handle to audio metadata - * @param[in] src The source handle to the audio metadata + * @param[in] audio The audio metadata handle * * @return @c 0 on success, * otherwise a negative error value * * @retval #MEDIA_CONTENT_ERROR_NONE Successful * @retval #MEDIA_CONTENT_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied * - * @see audio_meta_destroy() + * @pre Get a copy of audio metadata handle handle by calling audio_meta_clone(). + * + * @see audio_meta_clone() */ -int audio_meta_clone(audio_meta_h *dst, audio_meta_h src); +int audio_meta_destroy(audio_meta_h audio); /** - * @brief Gets the audio ID of the given audio metadata. + * @brief Gets the ID of the media of the given audio metadata. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @remarks You must release @a media_id using free(). @@ -100,15 +102,15 @@ int audio_meta_clone(audio_meta_h *dst, audio_meta_h src); int audio_meta_get_media_id(audio_meta_h audio, char **media_id); /** - * @brief Gets the album name of the given audio metadata. + * @brief Gets the album of the given audio metadata. * @details If the value is an empty string, the method returns "Unknown". * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * - * @remarks You must release @a album_name using free(). + * @remarks You must release @a album using free(). * - * @param[in] audio The audio metadata handle - * @param[out] album_name The name of the album + * @param[in] audio The audio metadata handle + * @param[out] album The album of the audio metadata * * @return @c 0 on success, * otherwise a negative error value @@ -118,18 +120,18 @@ int audio_meta_get_media_id(audio_meta_h audio, char **media_id); * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied */ -int audio_meta_get_album(audio_meta_h audio, char **album_name); +int audio_meta_get_album(audio_meta_h audio, char **album); /** - * @brief Gets the artist name of the given audio metadata. + * @brief Gets the artist of the given audio metadata. * @details If the value is an empty string, the method returns "Unknown". * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * - * @remarks You must release @a artist_name using free(). + * @remarks You must release @a artist using free(). * - * @param[in] audio The audio metadata handle - * @param[out] artist_name The name of the artist + * @param[in] audio The audio metadata handle + * @param[out] artist The artist of the audio metadata * * @return @c 0 on success, * otherwise a negative error value @@ -139,18 +141,18 @@ int audio_meta_get_album(audio_meta_h audio, char **album_name); * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied */ -int audio_meta_get_artist(audio_meta_h audio, char **artist_name); +int audio_meta_get_artist(audio_meta_h audio, char **artist); /** - * @brief Gets the album artist name of the given audio metadata. + * @brief Gets the album artist of the given audio metadata. * @details If the value is an empty string, the method returns "Unknown". * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * - * @remarks You must release @a album_artist_name using free(). + * @remarks You must release @a album_artist using free(). * - * @param[in] audio The audio metadata handle - * @param[out] album_artist_name The name of the album artist + * @param[in] audio The audio metadata handle + * @param[out] album_artist The album artist of the audio metadata * * @return @c 0 on success, * otherwise a negative error value @@ -160,18 +162,18 @@ int audio_meta_get_artist(audio_meta_h audio, char **artist_name); * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied */ -int audio_meta_get_album_artist(audio_meta_h audio, char **album_artist_name); +int audio_meta_get_album_artist(audio_meta_h audio, char **album_artist); /** - * @brief Gets the genre name of the given audio metadata. + * @brief Gets the genre of the given audio metadata. * @details If the value is an empty string, the method returns "Unknown". * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * - * @remarks You must release @a genre_name using free(). + * @remarks You must release @a genre using free(). * - * @param[in] audio The audio metadata handle - * @param[out] genre_name The name of the genre + * @param[in] audio The audio metadata handle + * @param[out] genre The genre of the audio metadata * * @return @c 0 on success, * otherwise a negative error value @@ -181,18 +183,18 @@ int audio_meta_get_album_artist(audio_meta_h audio, char **album_artist_name); * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied */ -int audio_meta_get_genre(audio_meta_h audio, char **genre_name); +int audio_meta_get_genre(audio_meta_h audio, char **genre); /** - * @brief Gets the composer name of the given audio metadata. + * @brief Gets the composer of the given audio metadata. * @details If the value is an empty string, the method returns "Unknown". * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * - * @remarks You must release @a author_name using free(). + * @remarks You must release @a composer using free(). * - * @param[in] audio The audio metadata handle - * @param[out] composer_name The name of the author of the audio + * @param[in] audio The audio metadata handle + * @param[out] composer The composer of the audio metadata * * @return @c 0 on success, * otherwise a negative error value @@ -202,7 +204,7 @@ int audio_meta_get_genre(audio_meta_h audio, char **genre_name); * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied */ -int audio_meta_get_composer(audio_meta_h audio, char **composer_name); +int audio_meta_get_composer(audio_meta_h audio, char **composer); /** * @brief Gets the year of the given audio metadata. @@ -213,7 +215,7 @@ int audio_meta_get_composer(audio_meta_h audio, char **composer_name); * @remarks You must release @a year using free(). * * @param[in] audio The audio metadata handle - * @param[out] year The year of the audio file + * @param[out] year The year of the audio metadata * * @return @c 0 on success, * otherwise a negative error value @@ -232,7 +234,7 @@ int audio_meta_get_year(audio_meta_h audio, char **year); * @remarks You must release @a recorded_date using free(). * * @param[in] audio The audio metadata handle - * @param[out] recorded_date The recorded date of the audio file + * @param[out] recorded_date The recorded date of the audio metadata * * @return @c 0 on success, * otherwise a negative error value @@ -251,7 +253,7 @@ int audio_meta_get_recorded_date(audio_meta_h audio, char **recorded_date); * @remarks You must release @a copyright using free(). * * @param[in] audio The audio metadata handle - * @param[out] copyright The audio copyright notice + * @param[out] copyright The copyright of the audio metadata * * @return @c 0 on success, * otherwise a negative error value @@ -269,14 +271,17 @@ int audio_meta_get_copyright(audio_meta_h audio, char **copyright); * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * + * @remarks You must release @a track_num using free(). + * * @param[in] audio The audio metadata handle - * @param[out] track_num The audio track number + * @param[out] track_num The audio track number of the audio metadata * * @return @c 0 on success, * otherwise a negative error value * * @retval #MEDIA_CONTENT_ERROR_NONE Successful * @retval #MEDIA_CONTENT_ERROR_INVALID_PARAMETER Invalid parameter + * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied */ int audio_meta_get_track_num(audio_meta_h audio, char **track_num); @@ -311,7 +316,6 @@ int audio_meta_get_bit_rate(audio_meta_h audio, int *bit_rate); * @retval #MEDIA_CONTENT_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied */ - int audio_meta_get_bitpersample(audio_meta_h audio, int *bitpersample); /** @@ -381,14 +385,12 @@ int audio_meta_get_played_count(audio_meta_h audio, int *played_count); /** * @deprecated Deprecated since 2.4. [Use media_info_get_played_time() instead] - * @brief Gets the played time parameter of an audio. - * @details This function returns audio's elapsed playback time parameter as a period - * starting from the beginning of the track. + * @brief Gets the last played time parameter of the audio. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @param[in] audio The audio metadata handle - * @param[out] played_time The elapsed time of the audio + * @param[out] played_time The last played time of the audio * * @return @c 0 on success, * otherwise a negative error value @@ -401,8 +403,8 @@ int audio_meta_get_played_time(audio_meta_h audio, time_t *played_time); /** * @deprecated Deprecated since 2.4. - * @brief Gets the played position parameter of an audio. - * @details This function returns audio's elapsed playback position parameter as a period + * @brief Gets the played position parameter of the audio. + * @details This function returns the elapsed playback position parameter of the audio as a period * starting from the beginning of the track. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif @@ -421,7 +423,7 @@ int audio_meta_get_played_position(audio_meta_h audio, int *played_position); /** * @deprecated Deprecated since 2.4. [Use media_info_increase_played_count() instead] - * @brief Sets the played count to an audio meta handle. + * @brief Sets the played count of the audio. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @param[in] audio The audio metadata handle @@ -440,11 +442,11 @@ int audio_meta_set_played_count(audio_meta_h audio, int played_count); /** * @deprecated Deprecated since 2.4. [Use media_info_set_played_time() instead] - * @brief Sets the played time to an audio meta handle. + * @brief Sets the last played time of the audio. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @param[in] audio The audio metadata handle - * @param[in] played_time The played time of the audio + * @param[in] played_time The last played time of the audio * * @return @c 0 on success, * otherwise a negative error value @@ -459,7 +461,8 @@ int audio_meta_set_played_time(audio_meta_h audio, time_t played_time); /** * @deprecated Deprecated since 2.4. - * @brief Sets the played position to an audio meta handle. + * @brief Sets the played position of the audio. + * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @remarks It is NOT recommended to use this attribute for your application-specific purpose because this attribute can be overwritten by other applications (even 0). @@ -480,16 +483,15 @@ int audio_meta_set_played_position(audio_meta_h audio, int played_position); /** * @brief Updates an audio metadata with modified attributes in the media database. - * @details The function updates the given audio meta in the media database. + * @details The function updates the given audio meta in the media database. The function should be called after any change in audio attributes, to be updated to the media + * database. For example, for setting the played time using audio_meta_get_played_time(), after that the audio_meta_update_to_db() function should be called to update media database. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif + * * @privlevel public * @privilege %http://tizen.org/privilege/content.write * - * @remarks The function should be called after any change in the attributes, to update the media database. - * For example, after using audio_meta_set_played_count() for changing the count of the played, the - * audio_meta_update_to_db() function should be called to update the given attributes in the media database. \n - * Do not call this function in callback function of foreach function like media_info_foreach_media_from_db(). + * @remarks Do not call this function in callback function of foreach function like media_info_foreach_media_from_db(). * * @param[in] audio The audio metadata handle * @@ -508,19 +510,18 @@ int audio_meta_set_played_position(audio_meta_h audio, int played_position); * @pre This function requires opened connection to content service by media_content_connect(). * * @see media_content_connect() - * @see audio_meta_set_played_count() * @see audio_meta_set_played_time() + * @see audio_meta_set_played_count() * @see audio_meta_set_played_position() */ int audio_meta_update_to_db(audio_meta_h audio); /** - * @} + *@} */ - #ifdef __cplusplus } -#endif +#endif /* __cplusplus */ #endif /*__TIZEN_AUDIO_META_H__*/ diff --git a/include/media_video.h b/include/media_video.h index c73be4a..765555d 100755 --- a/include/media_video.h +++ b/include/media_video.h @@ -15,7 +15,6 @@ */ - #ifndef __TIZEN_VIDEO_META_H__ #define __TIZEN_VIDEO_META_H__ @@ -39,8 +38,7 @@ extern "C" { /** * @brief Clones the video metadata. - * @details This function copies the video metadata handle from a source to - * destination. + * @details This function copies the video metadata handle from a source to destination. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * @@ -104,7 +102,7 @@ int video_meta_destroy(video_meta_h video); int video_meta_get_media_id(video_meta_h video, char **media_id); /** - * @brief Gets the video's album. + * @brief Gets the album of the given video metadata. * @details If the value is an empty string, the method returns "Unknown". * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif @@ -112,7 +110,7 @@ int video_meta_get_media_id(video_meta_h video, char **media_id); * @remarks You must release @a album using free(). * * @param[in] video The video metadata handle - * @param[out] album The video album or @c NULL + * @param[out] album The album of the video metadata * * @return @c 0 on success, * otherwise a negative error value @@ -125,7 +123,7 @@ int video_meta_get_media_id(video_meta_h video, char **media_id); int video_meta_get_album(video_meta_h video, char **album); /** - * @brief Gets the video artist. + * @brief Gets the artist of the given video metadata. * @details If the value is an empty string, the method returns "Unknown". * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif @@ -167,7 +165,7 @@ int video_meta_get_artist(video_meta_h video, char **artist); int video_meta_get_album_artist(video_meta_h video, char **album_artist); /** - * @brief Gets the video genre. + * @brief Gets the genre of the given video metadata. * @details If the value is an empty string, the method returns "Unknown". * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif @@ -188,7 +186,7 @@ int video_meta_get_album_artist(video_meta_h video, char **album_artist); int video_meta_get_genre(video_meta_h video, char **genre); /** - * @brief Gets the video composer. + * @brief Gets the composer of the given video metadata. * @details If the value is an empty string, the method returns "Unknown". * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif @@ -209,7 +207,7 @@ int video_meta_get_genre(video_meta_h video, char **genre); int video_meta_get_composer(video_meta_h video, char **composer); /** - * @brief Gets the year of the video. + * @brief Gets the year of the given video metadata. * @details If the value is an empty string, the method returns "Unknown". * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif @@ -249,7 +247,7 @@ int video_meta_get_year(video_meta_h video, char **year); int video_meta_get_recorded_date(video_meta_h video, char **recorded_date); /** - * @brief Gets the video copyright. + * @brief Gets the copyright notice of the given video metadata. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @remarks You must release @a copyright using free(). @@ -268,7 +266,7 @@ int video_meta_get_recorded_date(video_meta_h video, char **recorded_date); int video_meta_get_copyright(video_meta_h video, char **copyright); /** - * @brief Gets the track number of the video. + * @brief Gets the track number of the given videoo metadata. * @details If the value is an empty string, the method returns "Unknown". * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif @@ -289,26 +287,23 @@ int video_meta_get_copyright(video_meta_h video, char **copyright); int video_meta_get_track_num(video_meta_h video, char **track_num); /** - * @brief Gets the video bit rate. + * @brief Gets the bitrate of the given video metadata in bitrate per second. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * - * @remarks You must release @a bit_rate using free(). - * - * @param[in] video The video metadata handle - * @param[out] bit_rate The bit rate of the video metadata + * @param[in] video The video metadata handle + * @param[out] bit_rate The video bit rate in bit per second [bps] * * @return @c 0 on success, * otherwise a negative error value * * @retval #MEDIA_CONTENT_ERROR_NONE Successful * @retval #MEDIA_CONTENT_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied */ int video_meta_get_bit_rate(video_meta_h video, int *bit_rate); /** - * @brief Gets the duration of video metadata. + * @brief Gets the track duration of the given videoo metadata. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @param[in] video The video metadata handle @@ -324,7 +319,7 @@ int video_meta_get_bit_rate(video_meta_h video, int *bit_rate); int video_meta_get_duration(video_meta_h video, int *duration); /** - * @brief Gets the video width in pixels. + * @brief Gets the width of the given videoo metadata. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @param[in] video The video metadata handle @@ -340,7 +335,7 @@ int video_meta_get_duration(video_meta_h video, int *duration); int video_meta_get_width(video_meta_h video, int *width); /** - * @brief Gets the video height in pixels. + * @brief Gets the height of the given videoo metadata. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @param[in] video The video metadata handle @@ -361,7 +356,7 @@ int video_meta_get_height(video_meta_h video, int *height); * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @param[in] video The video metadata handle - * @param[out] played_count The number of played + * @param[out] played_count The counter of the video played * * @return @c 0 on success, * otherwise a negative error value @@ -378,7 +373,7 @@ int video_meta_get_played_count(video_meta_h video, int *played_count); * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @param[in] video The video metadata handle - * @param[out] played_time The time last played in the video + * @param[out] played_time The last played time of the video * * @return @c 0 on success, * otherwise a negative error value @@ -391,14 +386,14 @@ int video_meta_get_played_time(video_meta_h video, time_t *played_time); /** * @deprecated Deprecated since 2.4. - * @brief Gets the position played parameter of the video. - * @details This function returns the elapsed playback time parameter of the video as period + * @brief Gets the played position parameter of the video. + * @details This function returns the elapsed playback position parameter of the video as period * starting from the beginning of the movie. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @param[in] video The video metadata handle - * @param[out] played_position The position from the beginning of the video (in milliseconds) + * @param[out] played_position The elapsed time of the video * * @return @c 0 on success, * otherwise a negative error value @@ -430,11 +425,11 @@ int video_meta_set_played_count(video_meta_h video, int played_count); /** * @deprecated Deprecated since 2.4. [Use media_info_set_played_time() instead] - * @brief Sets the time last played parameter of the video. + * @brief Sets the last played time of the video. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * * @param[in] video The video metadata handle - * @param[in] played_time The time last played in the video + * @param[in] played_time The last played time of the video * * @return @c 0 on success, * otherwise a negative error value @@ -449,9 +444,7 @@ int video_meta_set_played_time(video_meta_h video, time_t played_time); /** * @deprecated Deprecated since 2.4. - * @brief Sets the position played parameter of the video. - * @details This function returns video's elapsed playback time parameter as period - * starting from the beginning of the movie. + * @brief Sets the played position of the video. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * @@ -472,11 +465,9 @@ int video_meta_set_played_time(video_meta_h video, time_t played_time); int video_meta_set_played_position(video_meta_h video, int played_position); /** - * @brief Updates the video to the media database. - * + * @brief Updates an video metadata with modified attributes in the media database. * @details The function updates the given video meta in the media database. The function should be called after any change in video attributes, to be updated to the media - * database. For example, after using video_meta_get_played_time() for setting the played time of the video, the video_meta_update_to_db() function should be called so as to update - * the given video attributes in the media database. + * database. For example, for setting the played time using video_meta_get_played_time(), after that the video_meta_update_to_db() function should be called to update media database. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * @@ -503,7 +494,7 @@ int video_meta_set_played_position(video_meta_h video, int played_position); * * @see media_content_connect() * @see video_meta_set_played_time() - * @see video_meta_set_played_count()s + * @see video_meta_set_played_count() * @see video_meta_set_played_position() */ int video_meta_update_to_db(video_meta_h video); @@ -515,4 +506,5 @@ int video_meta_update_to_db(video_meta_h video); #ifdef __cplusplus } #endif /* __cplusplus */ + #endif /*__TIZEN_VIDEO_META_H__*/ diff --git a/src/media_audio.c b/src/media_audio.c index 551f0cb..073d75a 100755 --- a/src/media_audio.c +++ b/src/media_audio.c @@ -229,7 +229,7 @@ int audio_meta_get_media_id(audio_meta_h audio, char **media_id) return ret; } -int audio_meta_get_album(audio_meta_h audio, char **album_name) +int audio_meta_get_album(audio_meta_h audio, char **album) { int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; @@ -237,12 +237,12 @@ int audio_meta_get_album(audio_meta_h audio, char **album_name) { if(STRING_VALID(_audio->album)) { - *album_name = strdup(_audio->album); - media_content_retvm_if(*album_name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); + *album = strdup(_audio->album); + media_content_retvm_if(*album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); } else { - *album_name = NULL; + *album = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; @@ -256,7 +256,7 @@ int audio_meta_get_album(audio_meta_h audio, char **album_name) return ret; } -int audio_meta_get_artist(audio_meta_h audio, char **artist_name) +int audio_meta_get_artist(audio_meta_h audio, char **artist) { int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; @@ -265,12 +265,12 @@ int audio_meta_get_artist(audio_meta_h audio, char **artist_name) { if(STRING_VALID(_audio->artist)) { - *artist_name = strdup(_audio->artist); - media_content_retvm_if(*artist_name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); + *artist = strdup(_audio->artist); + media_content_retvm_if(*artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); } else { - *artist_name = NULL; + *artist = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; @@ -284,7 +284,7 @@ int audio_meta_get_artist(audio_meta_h audio, char **artist_name) return ret; } -int audio_meta_get_album_artist(audio_meta_h audio, char **album_artist_name) +int audio_meta_get_album_artist(audio_meta_h audio, char **album_artist) { int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; @@ -293,12 +293,12 @@ int audio_meta_get_album_artist(audio_meta_h audio, char **album_artist_name) { if(STRING_VALID(_audio->album_artist)) { - *album_artist_name = strdup(_audio->album_artist); - media_content_retvm_if(*album_artist_name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); + *album_artist = strdup(_audio->album_artist); + media_content_retvm_if(*album_artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); } else { - *album_artist_name = NULL; + *album_artist = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; @@ -312,7 +312,7 @@ int audio_meta_get_album_artist(audio_meta_h audio, char **album_artist_name) return ret; } -int audio_meta_get_genre(audio_meta_h audio, char **genre_name) +int audio_meta_get_genre(audio_meta_h audio, char **genre) { int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; @@ -321,12 +321,12 @@ int audio_meta_get_genre(audio_meta_h audio, char **genre_name) { if(STRING_VALID(_audio->genre)) { - *genre_name = strdup(_audio->genre); - media_content_retvm_if(*genre_name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); + *genre = strdup(_audio->genre); + media_content_retvm_if(*genre == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); } else { - *genre_name = NULL; + *genre = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; @@ -340,7 +340,7 @@ int audio_meta_get_genre(audio_meta_h audio, char **genre_name) return ret; } -int audio_meta_get_composer(audio_meta_h audio, char **composer_name) +int audio_meta_get_composer(audio_meta_h audio, char **composer) { int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; @@ -349,12 +349,12 @@ int audio_meta_get_composer(audio_meta_h audio, char **composer_name) { if(STRING_VALID(_audio->composer)) { - *composer_name = strdup(_audio->composer); - media_content_retvm_if(*composer_name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); + *composer = strdup(_audio->composer); + media_content_retvm_if(*composer == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); } else { - *composer_name = NULL; + *composer = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; diff --git a/src/media_video.c b/src/media_video.c index e1cce6f..2214224 100755 --- a/src/media_video.c +++ b/src/media_video.c @@ -287,7 +287,6 @@ int video_meta_get_artist(video_meta_h video, char **artist) } return ret; - } int video_meta_get_album_artist(video_meta_h video, char **album_artist) -- 2.7.4