From bcc521125fdb654a6c29d8af8a39cd74c82cbeae Mon Sep 17 00:00:00 2001 From: "minje.ahn" Date: Thu, 30 Jun 2022 13:03:03 +0900 Subject: [PATCH] Rename log macro Change-Id: Ibf4a2f130f8482386bad597191c07fe7eb3033d9 Signed-off-by: minje.ahn --- include/metadata_editor_private.h | 25 +--- src/metadata_editor.cpp | 212 +++++++++++++++--------------- 2 files changed, 111 insertions(+), 126 deletions(-) diff --git a/include/metadata_editor_private.h b/include/metadata_editor_private.h index 105a677..8220a72 100755 --- a/include/metadata_editor_private.h +++ b/include/metadata_editor_private.h @@ -35,44 +35,29 @@ extern "C" { #define FONT_COLOR_YELLOW "\033[33m" #define FONT_COLOR_CYAN "\033[36m" -#define metadata_editor_debug(fmt, arg...) do { \ +#define ME_DBG(fmt, arg...) do { \ LOGD(FONT_COLOR_RESET"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) -#define metadata_editor_info(fmt, arg...) do { \ +#define ME_INFO(fmt, arg...) do { \ LOGI(FONT_COLOR_GREEN"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) -#define metadata_editor_error(fmt, arg...) do { \ +#define ME_ERR(fmt, arg...) do { \ LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) -#define metadata_editor_debug_fenter() do { \ - LOGD(FONT_COLOR_YELLOW"" FONT_COLOR_RESET); \ - } while (0) - -#define metadata_editor_debug_fleave() do { \ - LOGD(FONT_COLOR_YELLOW"" FONT_COLOR_RESET); \ - } while (0) - -#define metadata_editor_sec_debug(fmt, arg...) do { \ +#define ME_SDBG(fmt, arg...) do { \ SECURE_LOGD(FONT_COLOR_CYAN"" fmt "" FONT_COLOR_RESET, ##arg); \ } while (0) -#define metadata_editor_retvm_if(expr, val, fmt, arg...) do { \ +#define ME_RETVM_IF(expr, val, fmt, arg...) do { \ if ((expr)) { \ LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ return (val); \ } \ } while (0) -#define metadata_editor_retm_if(expr, fmt, arg...) do { \ - if ((expr)) { \ - LOGE(FONT_COLOR_RED"" fmt "" FONT_COLOR_RESET, ##arg); \ - return; \ - } \ - } while (0) - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/src/metadata_editor.cpp b/src/metadata_editor.cpp index 48a2310..c40ab11 100755 --- a/src/metadata_editor.cpp +++ b/src/metadata_editor.cpp @@ -80,7 +80,7 @@ static metadata_editor_format_e __metadata_editor_get_file_type(const char *path /* get content type and mime type from file. */ if (aul_get_mime_from_file(path, mimetype, sizeof(mimetype)) < 0) { - metadata_editor_debug("aul_get_mime_from_file fail.. Now trying to get type by extension"); + ME_DBG("aul_get_mime_from_file fail.. Now trying to get type by extension"); String ext = __get_file_ext(path); if (ext == "MP3") @@ -97,7 +97,7 @@ static metadata_editor_format_e __metadata_editor_get_file_type(const char *path return METADATA_EDITOR_FORMAT_NOTYPE; } - metadata_editor_debug("mime type : %s", mimetype); + ME_DBG("mime type : %s", mimetype); /* categorize from mimetype */ if (strstr(mimetype, "mpeg") != NULL) @@ -122,7 +122,7 @@ static int __metadata_editor_get_picture_type(const char *path, char **type) /* get content type and mime type from file. */ if (aul_get_mime_from_file(path, mimetype, sizeof(mimetype)) < 0) { - metadata_editor_debug("aul_get_mime_from_file fail.. Now trying to get type by extension"); + ME_DBG("aul_get_mime_from_file fail.. Now trying to get type by extension"); String ext = __get_file_ext(path); if (ext == "JPG" || ext == "JPEG") { @@ -136,7 +136,7 @@ static int __metadata_editor_get_picture_type(const char *path, char **type) } } - metadata_editor_debug("mime type : %s", mimetype); + ME_DBG("mime type : %s", mimetype); /* categorize from mimetype */ if (strstr(mimetype, "jpeg") != NULL) { @@ -157,10 +157,10 @@ static int __metadata_editor_get_picture_info(const char *path, char **picture, char *mime_type = NULL; ret = __metadata_editor_get_picture_type(path, &mime_type); - metadata_editor_retvm_if(ret != METADATA_EDITOR_ERROR_NONE, ret, "__metadata_editor_get_picture_type failed"); + ME_RETVM_IF(ret != METADATA_EDITOR_ERROR_NONE, ret, "__metadata_editor_get_picture_type failed"); if (!g_file_get_contents(path, picture, size, &error)) { - metadata_editor_error("Unable to read [%s], error [%s]", path, error->message); + ME_ERR("Unable to read [%s], error [%s]", path, error->message); if (error->code == G_FILE_ERROR_NOENT || error->code == G_FILE_ERROR_ISDIR) ret = METADATA_EDITOR_ERROR_FILE_EXISTS; else @@ -179,16 +179,16 @@ static int __metadata_editor_get_picture_info(const char *path, char **picture, static int __check_file_validity(const char *path) { - metadata_editor_retvm_if(!path, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid path"); - metadata_editor_sec_debug("path : [%s]", path); + ME_RETVM_IF(!path, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid path"); + ME_SDBG("path : [%s]", path); if (access(path, R_OK) < 0) { if (errno == EACCES || errno == EPERM) { - metadata_editor_error("Permission denied"); + ME_ERR("Permission denied"); return METADATA_EDITOR_ERROR_PERMISSION_DENIED; } - metadata_editor_error("Fail to open path"); + ME_ERR("Fail to open path"); return METADATA_EDITOR_ERROR_FILE_EXISTS; } @@ -215,25 +215,25 @@ static char * __get_mime_type_from_cover_art(const MP4::CoverArt& cover_art) static int __is_valid_picture_index(bool is_empty, unsigned int list_size, int index) { - metadata_editor_debug("list size [%d] picture index[%d]", list_size, index); - metadata_editor_retvm_if(is_empty, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "No picture"); - metadata_editor_retvm_if((index < 0) || (list_size <= (uint)index), METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Out of range"); + ME_DBG("list size [%d] picture index[%d]", list_size, index); + ME_RETVM_IF(is_empty, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "No picture"); + ME_RETVM_IF((index < 0) || (list_size <= (uint)index), METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Out of range"); return METADATA_EDITOR_ERROR_NONE; } static int __get_APIC(ID3v2::Tag *tag, int index, void **picture, int *size, char **mime_type) { - metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Tag does not exist"); + ME_RETVM_IF(!tag, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Tag does not exist"); auto lst = tag->frameListMap()["APIC"]; - metadata_editor_retvm_if(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); + ME_RETVM_IF(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); auto pictureFrame = static_cast(lst[index]); uint pictureSize = pictureFrame->picture().size(); - metadata_editor_retvm_if(pictureSize == 0, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Size of picture is 0"); + ME_RETVM_IF(pictureSize == 0, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Size of picture is 0"); *picture = g_memdup2(pictureFrame->picture().data(), pictureSize); *size = pictureSize; @@ -244,16 +244,16 @@ static int __get_APIC(ID3v2::Tag *tag, int index, void **picture, int *size, cha static int __get_ogg_picture(Ogg::XiphComment *xtag, int index, void **picture, int *size, char **mime_type) { - metadata_editor_retvm_if(!xtag, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid XiphComment"); + ME_RETVM_IF(!xtag, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid XiphComment"); auto lst = xtag->pictureList(); - metadata_editor_retvm_if(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); + ME_RETVM_IF(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); auto pictureFrame = static_cast(lst[index]); int pictureSize = pictureFrame->data().size(); - metadata_editor_retvm_if(pictureSize == 0, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Size of picture is 0"); + ME_RETVM_IF(pictureSize == 0, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Size of picture is 0"); *picture = g_memdup2(pictureFrame->data().data(), pictureSize); *size = pictureSize; @@ -264,11 +264,11 @@ static int __get_ogg_picture(Ogg::XiphComment *xtag, int index, void **picture, static int __append_APIC(ID3v2::Tag *tag, const char *picture, size_t size, const char *mime_type) { - metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_METADATA_UPDATE_NOT_POSSIBLE, "Invalid ID3v2"); + ME_RETVM_IF(!tag, METADATA_EDITOR_ERROR_METADATA_UPDATE_NOT_POSSIBLE, "Invalid ID3v2"); auto pictureFrame = new ID3v2::AttachedPictureFrame(); - metadata_editor_info("New APIC frame will be added to the ID3v2 tag"); + ME_INFO("New APIC frame will be added to the ID3v2 tag"); pictureFrame->setPicture(ByteVector(picture, size)); pictureFrame->setType(ID3v2::AttachedPictureFrame::FrontCover); @@ -282,7 +282,7 @@ static int __append_APIC(ID3v2::Tag *tag, const char *picture, size_t size, cons static int __append_ogg_picture(Ogg::XiphComment *xtag, const char *picture, size_t size, const char *mime_type) { - metadata_editor_retvm_if(!xtag, METADATA_EDITOR_ERROR_METADATA_UPDATE_NOT_POSSIBLE, "Invalid XiphComment"); + ME_RETVM_IF(!xtag, METADATA_EDITOR_ERROR_METADATA_UPDATE_NOT_POSSIBLE, "Invalid XiphComment"); auto frontCover = new FLAC::Picture; @@ -297,11 +297,11 @@ static int __append_ogg_picture(Ogg::XiphComment *xtag, const char *picture, siz static int __remove_APIC(ID3v2::Tag *tag, int index) { - metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid ID3v2"); + ME_RETVM_IF(!tag, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid ID3v2"); auto lst = tag->frameListMap()["APIC"]; - metadata_editor_retvm_if(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); + ME_RETVM_IF(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); tag->removeFrame(lst[index]); @@ -310,11 +310,11 @@ static int __remove_APIC(ID3v2::Tag *tag, int index) static int __remove_ogg_picture(Ogg::XiphComment *xtag, int index) { - metadata_editor_retvm_if(!xtag, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid XiphComment"); + ME_RETVM_IF(!xtag, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid XiphComment"); auto lst = xtag->pictureList(); - metadata_editor_retvm_if(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); + ME_RETVM_IF(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); TagLib::List::Iterator it = lst.begin(); std::advance(it, index); @@ -325,17 +325,17 @@ static int __remove_ogg_picture(Ogg::XiphComment *xtag, int index) static int __append_picture(File *f, metadata_editor_format_e format, const char *picture, size_t size, const char *mime_type) { - metadata_editor_retvm_if(!f, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!f, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); switch (format) { case METADATA_EDITOR_FORMAT_MP3: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __append_APIC(_file->ID3v2Tag(true), picture, size, mime_type); } case METADATA_EDITOR_FORMAT_MP4: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); auto tag = dynamic_cast(_file->tag()); MP4::CoverArtList lst; auto format = MP4::CoverArt::Unknown; @@ -345,7 +345,7 @@ static int __append_picture(File *f, metadata_editor_format_e format, const char format = MP4::CoverArt::PNG; if (tag->contains("covr")) { - metadata_editor_info("The item exists. Adding picture"); + ME_INFO("The item exists. Adding picture"); lst = tag->item("covr").toCoverArtList(); } @@ -356,7 +356,7 @@ static int __append_picture(File *f, metadata_editor_format_e format, const char } case METADATA_EDITOR_FORMAT_FLAC: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); auto frontCover = new FLAC::Picture; frontCover->setData(ByteVector(picture, size)); @@ -368,17 +368,17 @@ static int __append_picture(File *f, metadata_editor_format_e format, const char } case METADATA_EDITOR_FORMAT_OGG_VORBIS: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __append_ogg_picture(_file->tag(), picture, size, mime_type); } case METADATA_EDITOR_FORMAT_OGG_FLAC: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __append_ogg_picture(_file->tag(), picture, size, mime_type); } case METADATA_EDITOR_FORMAT_WAV: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __append_APIC(dynamic_cast(_file->tag()), picture, size, mime_type); } default: @@ -388,24 +388,24 @@ static int __append_picture(File *f, metadata_editor_format_e format, const char static int __remove_picture(File *f, metadata_editor_format_e format, int index) { - metadata_editor_retvm_if(!f, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!f, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); switch (format) { case METADATA_EDITOR_FORMAT_MP3: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __remove_APIC(_file->ID3v2Tag(true), index); } case METADATA_EDITOR_FORMAT_MP4: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); auto tag = dynamic_cast(_file->tag()); - metadata_editor_retvm_if(!(tag->contains("covr")), METADATA_EDITOR_ERROR_INVALID_PARAMETER, "No picture"); + ME_RETVM_IF(!(tag->contains("covr")), METADATA_EDITOR_ERROR_INVALID_PARAMETER, "No picture"); auto lst = tag->item("covr").toCoverArtList(); - metadata_editor_retvm_if(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); + ME_RETVM_IF(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); auto picIt = lst.begin(); std::advance(picIt, index); @@ -417,27 +417,27 @@ static int __remove_picture(File *f, metadata_editor_format_e format, int index) } case METADATA_EDITOR_FORMAT_FLAC: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); auto lst = _file->pictureList(); - metadata_editor_retvm_if(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); + ME_RETVM_IF(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); _file->removePicture(lst[index], true); return METADATA_EDITOR_ERROR_NONE; } case METADATA_EDITOR_FORMAT_OGG_VORBIS: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __remove_ogg_picture(_file->tag(), index); } case METADATA_EDITOR_FORMAT_OGG_FLAC: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __remove_ogg_picture(_file->tag(), index); } case METADATA_EDITOR_FORMAT_WAV: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __remove_APIC(dynamic_cast(_file->tag()), index); } default: @@ -447,32 +447,32 @@ static int __remove_picture(File *f, metadata_editor_format_e format, int index) static int __get_picture(File *f, metadata_editor_format_e format, int index, void **picture, int *size, char **mime_type) { - metadata_editor_retvm_if(!f, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); - metadata_editor_retvm_if(!picture, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture"); - metadata_editor_retvm_if(!size, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid size"); - metadata_editor_retvm_if(!mime_type, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid mime_type"); + ME_RETVM_IF(!f, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!picture, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture"); + ME_RETVM_IF(!size, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid size"); + ME_RETVM_IF(!mime_type, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid mime_type"); switch (format) { case METADATA_EDITOR_FORMAT_MP3: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __get_APIC(_file->ID3v2Tag(), index, picture, size, mime_type); } case METADATA_EDITOR_FORMAT_MP4: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); auto tag = dynamic_cast(_file->tag()); - metadata_editor_retvm_if(!(tag->contains("covr")), METADATA_EDITOR_ERROR_INVALID_PARAMETER, "No picture"); + ME_RETVM_IF(!(tag->contains("covr")), METADATA_EDITOR_ERROR_INVALID_PARAMETER, "No picture"); auto lst = tag->item("covr").toCoverArtList(); - metadata_editor_retvm_if(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); + ME_RETVM_IF(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); auto pictureFrame = static_cast(lst[index]); int pictureSize = pictureFrame.data().size(); - metadata_editor_retvm_if(pictureSize == 0, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Size of picture is 0"); + ME_RETVM_IF(pictureSize == 0, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Size of picture is 0"); *picture = g_memdup2(pictureFrame.data().data(), pictureSize); *size = pictureSize; @@ -482,15 +482,15 @@ static int __get_picture(File *f, metadata_editor_format_e format, int index, vo } case METADATA_EDITOR_FORMAT_FLAC: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); auto lst = _file->pictureList(); - metadata_editor_retvm_if(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); + ME_RETVM_IF(__is_valid_picture_index(lst.isEmpty(), lst.size(), index) != METADATA_EDITOR_ERROR_NONE, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture index"); auto pictureFrame = static_cast(lst[index]); int pictureSize = pictureFrame->data().size(); - metadata_editor_retvm_if(pictureSize == 0, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Size of picture is 0"); + ME_RETVM_IF(pictureSize == 0, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Size of picture is 0"); *picture = g_memdup2(pictureFrame->data().data(), pictureSize); *size = pictureSize; @@ -500,17 +500,17 @@ static int __get_picture(File *f, metadata_editor_format_e format, int index, vo } case METADATA_EDITOR_FORMAT_OGG_VORBIS: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __get_ogg_picture(_file->tag(), index, picture, size, mime_type); } case METADATA_EDITOR_FORMAT_OGG_FLAC: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __get_ogg_picture(_file->tag(), index, picture, size, mime_type); } case METADATA_EDITOR_FORMAT_WAV:{ auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); return __get_APIC(_file->tag(), index, picture, size, mime_type); } default: @@ -520,19 +520,19 @@ static int __get_picture(File *f, metadata_editor_format_e format, int index, vo static int __get_picture_number(File *f, metadata_editor_format_e format, char **value) { - metadata_editor_retvm_if(!f, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); - metadata_editor_retvm_if(!value, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid value"); + ME_RETVM_IF(!f, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!value, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid value"); switch (format) { case METADATA_EDITOR_FORMAT_MP3: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); *value = g_strdup_printf("%u", _file->ID3v2Tag() ? _file->ID3v2Tag()->frameListMap()["APIC"].size() : 0); break; } case METADATA_EDITOR_FORMAT_MP4: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); if (_file->tag() && _file->tag()->contains("covr")) *value = g_strdup_printf("%u", _file->tag()->item("covr").toCoverArtList().size()); else @@ -541,27 +541,27 @@ static int __get_picture_number(File *f, metadata_editor_format_e format, char * } case METADATA_EDITOR_FORMAT_FLAC: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); *value = g_strdup_printf("%u", _file ? _file->pictureList().size() : 0); break; } case METADATA_EDITOR_FORMAT_OGG_VORBIS: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); *value = g_strdup_printf("%u", _file->tag() ? _file->tag()->pictureList().size() : 0); break; } case METADATA_EDITOR_FORMAT_OGG_FLAC: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); *value = g_strdup_printf("%u", _file->tag() ? _file->tag()->pictureList().size() : 0); break; } case METADATA_EDITOR_FORMAT_WAV: { auto _file = dynamic_cast(f); - metadata_editor_retvm_if(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(!_file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); auto tag = dynamic_cast(_file->tag()); - metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid tag"); + ME_RETVM_IF(!tag, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid tag"); *value = g_strdup_printf("%u", tag ? tag->frameListMap()["APIC"].size() : 0); break; } @@ -574,8 +574,8 @@ static int __get_picture_number(File *f, metadata_editor_format_e format, char * static int __set_to_property_map(File *file, String key, const char *value) { - metadata_editor_retvm_if(!file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); - metadata_editor_retvm_if(key.isEmpty(), METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid key"); + ME_RETVM_IF(!file, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid file"); + ME_RETVM_IF(key.isEmpty(), METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid key"); PropertyMap tags = file->properties(); @@ -591,8 +591,8 @@ static int __set_to_property_map(File *file, String key, const char *value) static int __get_from_property_map(PropertyMap tags, String key, char **value) { - metadata_editor_retvm_if(key.isEmpty(), METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid field_name"); - metadata_editor_retvm_if(!value, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid value"); + ME_RETVM_IF(key.isEmpty(), METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid field_name"); + ME_RETVM_IF(!value, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid value"); if (tags.isEmpty()) return METADATA_EDITOR_ERROR_NONE; @@ -621,7 +621,7 @@ class OggFileTypeResolver : public TagLib::FileRef::FileTypeResolver { extern "C" int metadata_editor_create(metadata_editor_h *metadata) { - metadata_editor_retvm_if(!metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); + ME_RETVM_IF(!metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); metadata_editor_s* _metadata = (metadata_editor_s*)malloc(sizeof(metadata_editor_s)); memset(_metadata, 0, sizeof(metadata_editor_s)); @@ -634,7 +634,7 @@ extern "C" int metadata_editor_create(metadata_editor_h *metadata) extern "C" int metadata_editor_destroy(metadata_editor_h metadata) { auto _metadata = static_cast(metadata); - metadata_editor_retvm_if(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); + ME_RETVM_IF(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); delete _metadata->fref; free(_metadata); @@ -648,28 +648,28 @@ extern "C" int metadata_editor_set_path(metadata_editor_h metadata, const char * metadata_editor_format_e media_type = METADATA_EDITOR_FORMAT_NOTYPE; auto _metadata = static_cast(metadata); - metadata_editor_retvm_if(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); + ME_RETVM_IF(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); ret = __check_file_validity(path); - metadata_editor_retvm_if(ret != METADATA_EDITOR_ERROR_NONE, ret, "Invalid path"); + ME_RETVM_IF(ret != METADATA_EDITOR_ERROR_NONE, ret, "Invalid path"); media_type = __metadata_editor_get_file_type(path); - metadata_editor_retvm_if(media_type == METADATA_EDITOR_FORMAT_NOTYPE, ret, "Not supported type [%d]", media_type); + ME_RETVM_IF(media_type == METADATA_EDITOR_FORMAT_NOTYPE, ret, "Not supported type [%d]", media_type); if (_metadata->fref) { - metadata_editor_info("file free [%p]", _metadata->fref); + ME_INFO("file free [%p]", _metadata->fref); delete _metadata->fref; } - metadata_editor_debug("media_type : [%d]", media_type); + ME_DBG("media_type : [%d]", media_type); _metadata->format = media_type; try { //FileTypeResolver is not deleted until terminated. So, it should be called only once. static auto oggResolver = FileRef::addFileTypeResolver(new OggFileTypeResolver); - metadata_editor_info("%p", oggResolver); + ME_INFO("%p", oggResolver); _metadata->fref = new FileRef(path); } catch (const std::bad_alloc &ex) { - metadata_editor_retvm_if(!_metadata->fref, METADATA_EDITOR_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); + ME_RETVM_IF(!_metadata->fref, METADATA_EDITOR_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); } if (!_metadata->fref->file()->isOpen()) { @@ -689,16 +689,16 @@ extern "C" int metadata_editor_append_picture(metadata_editor_h metadata, const char *mime_type = NULL; auto _metadata = static_cast(metadata); - metadata_editor_retvm_if(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); - metadata_editor_retvm_if(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); - metadata_editor_retvm_if(_metadata->fref->file()->readOnly(), METADATA_EDITOR_ERROR_PERMISSION_DENIED, "Readonly error"); - metadata_editor_retvm_if(!path, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid path"); + ME_RETVM_IF(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); + ME_RETVM_IF(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); + ME_RETVM_IF(_metadata->fref->file()->readOnly(), METADATA_EDITOR_ERROR_PERMISSION_DENIED, "Readonly error"); + ME_RETVM_IF(!path, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid path"); ret = __check_file_validity(path); - metadata_editor_retvm_if(ret != METADATA_EDITOR_ERROR_NONE, ret, "Invalid path"); + ME_RETVM_IF(ret != METADATA_EDITOR_ERROR_NONE, ret, "Invalid path"); ret = __metadata_editor_get_picture_info(path, &picture, &size, &mime_type); - metadata_editor_retvm_if(ret != METADATA_EDITOR_ERROR_NONE, ret, "File does not exist or you have no rights to open it"); + ME_RETVM_IF(ret != METADATA_EDITOR_ERROR_NONE, ret, "File does not exist or you have no rights to open it"); ret = __append_picture(_metadata->fref->file(), _metadata->format, picture, size, mime_type); @@ -712,9 +712,9 @@ extern "C" int metadata_editor_remove_picture(metadata_editor_h metadata, int in { auto _metadata = static_cast(metadata); - metadata_editor_retvm_if(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); - metadata_editor_retvm_if(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); - metadata_editor_retvm_if(_metadata->fref->file()->readOnly(), METADATA_EDITOR_ERROR_PERMISSION_DENIED, "Readonly error"); + ME_RETVM_IF(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); + ME_RETVM_IF(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); + ME_RETVM_IF(_metadata->fref->file()->readOnly(), METADATA_EDITOR_ERROR_PERMISSION_DENIED, "Readonly error"); return __remove_picture(_metadata->fref->file(), _metadata->format, index); } @@ -723,11 +723,11 @@ extern "C" int metadata_editor_get_picture(metadata_editor_h metadata, int index { auto _metadata = static_cast(metadata); - metadata_editor_retvm_if(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); - metadata_editor_retvm_if(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); - metadata_editor_retvm_if(!picture, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture"); - metadata_editor_retvm_if(!size, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid size"); - metadata_editor_retvm_if(!mime_type, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid mime_type"); + ME_RETVM_IF(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); + ME_RETVM_IF(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); + ME_RETVM_IF(!picture, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid picture"); + ME_RETVM_IF(!size, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid size"); + ME_RETVM_IF(!mime_type, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid mime_type"); return __get_picture(_metadata->fref->file(), _metadata->format, index, picture, size, mime_type); } @@ -736,9 +736,9 @@ extern "C" int metadata_editor_set_metadata(metadata_editor_h metadata, metadata { auto _metadata = static_cast(metadata); - metadata_editor_retvm_if(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); - metadata_editor_retvm_if(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); - metadata_editor_retvm_if(_metadata->fref->file()->readOnly(), METADATA_EDITOR_ERROR_PERMISSION_DENIED, "Readonly error"); + ME_RETVM_IF(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); + ME_RETVM_IF(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); + ME_RETVM_IF(_metadata->fref->file()->readOnly(), METADATA_EDITOR_ERROR_PERMISSION_DENIED, "Readonly error"); switch (attribute) { case METADATA_EDITOR_ATTR_ARTIST: @@ -766,7 +766,7 @@ extern "C" int metadata_editor_set_metadata(metadata_editor_h metadata, metadata case METADATA_EDITOR_ATTR_UNSYNCLYRICS: return __set_to_property_map(_metadata->fref->file(), String("LYRICS"), value); default: - metadata_editor_error("Invalid attribute"); + ME_ERR("Invalid attribute"); return METADATA_EDITOR_ERROR_INVALID_PARAMETER; } } @@ -775,9 +775,9 @@ extern "C" int metadata_editor_get_metadata(metadata_editor_h metadata, metadata { auto _metadata = static_cast(metadata); - metadata_editor_retvm_if(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); - metadata_editor_retvm_if(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); - metadata_editor_retvm_if(!value, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid value"); + ME_RETVM_IF(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); + ME_RETVM_IF(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); + ME_RETVM_IF(!value, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid value"); PropertyMap tags = _metadata->fref->file()->properties(); @@ -809,7 +809,7 @@ extern "C" int metadata_editor_get_metadata(metadata_editor_h metadata, metadata case METADATA_EDITOR_ATTR_PICTURE_NUM: return __get_picture_number(_metadata->fref->file(), _metadata->format, value); default: - metadata_editor_error("Invalid attribute [%d]", attribute); + ME_ERR("Invalid attribute [%d]", attribute); return METADATA_EDITOR_ERROR_INVALID_PARAMETER; } } @@ -818,9 +818,9 @@ extern "C" int metadata_editor_update_metadata(metadata_editor_h metadata) { auto _metadata = static_cast(metadata); - metadata_editor_retvm_if(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); - metadata_editor_retvm_if(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); - metadata_editor_retvm_if(_metadata->fref->file()->readOnly(), METADATA_EDITOR_ERROR_PERMISSION_DENIED, "Readonly error"); + ME_RETVM_IF(!_metadata, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid metadata"); + ME_RETVM_IF(!_metadata->fref, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "File loading fail"); + ME_RETVM_IF(_metadata->fref->file()->readOnly(), METADATA_EDITOR_ERROR_PERMISSION_DENIED, "Readonly error"); if (!_metadata->fref->file()->save()) return METADATA_EDITOR_ERROR_OPERATION_FAILED; -- 2.34.1