From: hj kim Date: Tue, 12 May 2020 10:10:59 +0000 (+0900) Subject: Use auto keyword X-Git-Tag: submit/tizen/20200602.021203~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6fa9fc5c8c3168175ab13ff9a8dd8cac6d7d17bd;p=platform%2Fcore%2Fapi%2Fmetadata-editor.git Use auto keyword Change-Id: I9d87e1c47f93554cf79867044f01260a7546e682 --- diff --git a/src/metadata_editor.cpp b/src/metadata_editor.cpp index 29b4010..726160d 100755 --- a/src/metadata_editor.cpp +++ b/src/metadata_editor.cpp @@ -413,17 +413,16 @@ static int __ID3_setLyricsFrame(metadata_editor_s* _metadata, TagLib::ID3v2::Tag return METADATA_EDITOR_ERROR_NONE; } -// *** This function extracts string values from tag in MP4 file *** // -static int __MP4_getStringItem(metadata_editor_s* _metadata, const char* itemname, char **value) { +static int __MP4_getStringItem(metadata_editor_s* _metadata, const char* itemname, char **value) +{ int ret = METADATA_EDITOR_ERROR_NONE; ret = __check_metadata_get_parameter(_metadata, value); metadata_editor_retvm_if(ret != METADATA_EDITOR_ERROR_NONE, ret, "fail to __check_metadata_get_parameter() [%d]", ret); metadata_editor_retvm_if(!itemname, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid itemname"); - TagLib::MP4::File* _file = (TagLib::MP4::File*) _metadata->file; - TagLib::MP4::Tag* tag = _file->tag(); - metadata_editor_retvm_if(tag == NULL, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist"); + auto tag = dynamic_cast(_metadata->file->tag()); + metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist"); // Get map of items directly from tag and launch a search of specific item TagLib::MP4::ItemListMap& itemMap = tag->itemListMap(); @@ -445,17 +444,16 @@ static int __MP4_getStringItem(metadata_editor_s* _metadata, const char* itemnam } } -// *** This function extracts integer value from item in MP4 tag *** // -static int __MP4_getIntegerItem(metadata_editor_s* _metadata, const char* itemname, char** value) { +static int __MP4_getIntegerItem(metadata_editor_s* _metadata, const char* itemname, char** value) +{ int ret = METADATA_EDITOR_ERROR_NONE; ret = __check_metadata_get_parameter(_metadata, value); metadata_editor_retvm_if(ret != METADATA_EDITOR_ERROR_NONE, ret, "fail to __check_metadata_get_parameter() [%d]", ret); metadata_editor_retvm_if(!itemname, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid itemname"); - TagLib::MP4::File* _file = (TagLib::MP4::File*) _metadata->file; - TagLib::MP4::Tag* tag = _file->tag(); - metadata_editor_retvm_if(tag == NULL, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist"); + auto tag = dynamic_cast(_metadata->file->tag()); + metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist"); // Get map of items directly from tag and launch a search of specific item TagLib::MP4::ItemListMap& itemMap = tag->itemListMap(); @@ -475,17 +473,16 @@ static int __MP4_getIntegerItem(metadata_editor_s* _metadata, const char* itemna } } -// *** This function adds (or changes) string item of itemname type *** // -static int __MP4_updateStringItem(metadata_editor_s* _metadata, const char* itemname, const char* value) { +static int __MP4_updateStringItem(metadata_editor_s* _metadata, const char* itemname, const char* value) +{ int ret = METADATA_EDITOR_ERROR_NONE; ret = __check_metadata_set_parameter(_metadata); metadata_editor_retvm_if(ret != METADATA_EDITOR_ERROR_NONE, ret, "fail to __check_metadata_set_parameter() [%d]", ret); metadata_editor_retvm_if(!itemname, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid itemname"); - TagLib::MP4::File* _file = (TagLib::MP4::File*) _metadata->file; - TagLib::MP4::Tag* tag = _file->tag(); - metadata_editor_retvm_if(tag == NULL, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag was not created"); + auto tag = dynamic_cast(_metadata->file->tag()); + metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist"); // Get map of items directly from tag and launch a search of specific item TagLib::MP4::ItemListMap& itemMap = tag->itemListMap(); @@ -503,17 +500,16 @@ static int __MP4_updateStringItem(metadata_editor_s* _metadata, const char* item return METADATA_EDITOR_ERROR_NONE; } -// *** This function adds (or changes) integer item of itemname type *** // -static int __MP4_updateIntegerItem(metadata_editor_s* _metadata, const char* itemname, const char* value) { +static int __MP4_updateIntegerItem(metadata_editor_s* _metadata, const char* itemname, const char* value) +{ int ret = METADATA_EDITOR_ERROR_NONE; ret = __check_metadata_set_parameter(_metadata); metadata_editor_retvm_if(ret != METADATA_EDITOR_ERROR_NONE, ret, "fail to __check_metadata_set_parameter() [%d]", ret); metadata_editor_retvm_if(!itemname, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid itemname"); - TagLib::MP4::File* _file = (TagLib::MP4::File*) _metadata->file; - TagLib::MP4::Tag* tag = _file->tag(); - metadata_editor_retvm_if(tag == NULL, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag was not created"); + auto tag = dynamic_cast(_metadata->file->tag()); + metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist"); // Get map of items directly from tag and launch a search of specific item TagLib::MP4::ItemListMap& itemMap = tag->itemListMap(); @@ -1388,7 +1384,6 @@ static int __get_mp3_picture(metadata_editor_s* metadata, int index, void **pict static int __get_mp4_picture(metadata_editor_s* metadata, int index, void **picture, int *size, char **mime_type) { auto tag = dynamic_cast(metadata->file->tag()); - metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist"); if (!(tag->contains("covr"))) { @@ -1508,8 +1503,7 @@ static int __append_mp3_picture(metadata_editor_s* metadata, void *picture ,size static int __append_mp4_picture(metadata_editor_s* metadata, void *picture, size_t size, const char *mime_type) { auto tag = dynamic_cast(metadata->file->tag()); - - metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag was not created"); + metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist"); TagLib::MP4::CoverArtList lst; TagLib::MP4::CoverArt::Format format = TagLib::MP4::CoverArt::Unknown; @@ -1623,7 +1617,7 @@ static int __remove_mp3_picture(metadata_editor_s* metadata, int index) static int __remove_mp4_picture(metadata_editor_s* metadata, int index) { auto tag = dynamic_cast(metadata->file->tag()); - metadata_editor_retvm_if(tag == NULL, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Error. tag not exist."); + metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist"); if (!(tag->contains("covr"))) { metadata_editor_error("No item in file. No pictures in file");