From: ji.yong.seo Date: Thu, 11 Jun 2015 01:46:15 +0000 (+0900) Subject: update code by Tizen coding convention X-Git-Tag: submit/tizen/20150611.015100^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=994624c6684e280d248b24b54bec116ba7594b67;p=platform%2Fcore%2Fapi%2Fmetadata-editor.git update code by Tizen coding convention Change-Id: I2387a7611ea4eea9aba7b8cdcc9cbfccea899410 --- diff --git a/include/metadata_editor_private.h b/include/metadata_editor_private.h index 2471416..c8f1612 100755 --- a/include/metadata_editor_private.h +++ b/include/metadata_editor_private.h @@ -55,27 +55,26 @@ extern "C" { #define LOG_TAG "CAPI_MEDIA_METADATA_EDITOR" #define metadata_editor_debug(fmt, arg...) do { \ - LOGD(""fmt"", ##arg); \ - } while (0) + LOGD(""fmt"", ##arg); \ + } while (0) #define metadata_editor_info(fmt, arg...) do { \ - LOGI(""fmt"", ##arg); \ - } while (0) + LOGI(""fmt"", ##arg); \ + } while (0) #define metadata_editor_error(fmt, arg...) do { \ - LOGE(""fmt"", ##arg); \ - } while (0) + LOGE(""fmt"", ##arg); \ + } while (0) #define metadata_editor_debug_fenter() do { \ - LOGD(""); \ - } while (0) + LOGD(""); \ + } while (0) #define metadata_editor_debug_fleave() do { \ - LOGD(""); \ - } while (0) + LOGD(""); \ + } while (0) -typedef struct -{ +typedef struct { void* file; int filetype; bool isOpen; diff --git a/include/metadata_editor_type.h b/include/metadata_editor_type.h index 7755ce9..5b5d222 100755 --- a/include/metadata_editor_type.h +++ b/include/metadata_editor_type.h @@ -53,8 +53,7 @@ typedef enum * @brief The enumerations of attribute * @since_tizen 2.4 */ -typedef enum -{ +typedef enum { METADATA_EDITOR_ATTR_ARTIST, /**< Artist*/ METADATA_EDITOR_ATTR_TITLE, /**< Title*/ METADATA_EDITOR_ATTR_ALBUM, /**< Album*/ diff --git a/packaging/capi-media-metadata-editor.spec b/packaging/capi-media-metadata-editor.spec index 6899516..025f9aa 100755 --- a/packaging/capi-media-metadata-editor.spec +++ b/packaging/capi-media-metadata-editor.spec @@ -1,6 +1,6 @@ Name: capi-media-metadata-editor Summary: A metadata editor library in SLP C API -Version: 0.1.0 +Version: 0.1.1 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/test/metadata_editor_test.c b/test/metadata_editor_test.c index 0816bcf..fe26dc4 100755 --- a/test/metadata_editor_test.c +++ b/test/metadata_editor_test.c @@ -26,7 +26,7 @@ int dummy; void __flush(); -void __printRetValue(const char* func_name, int result); +void __printRetValue(const char *func_name, int result); static bool __get_tag_info(metadata_editor_h metadata); static bool __write_tag_info(metadata_editor_h metadata); static bool __add_picture(metadata_editor_h metadata); @@ -35,17 +35,17 @@ static bool __delete_pictures(metadata_editor_h metadata); void __flush() { char c; - while((c = getc(stdin)) != '\n'); + while ((c = getc(stdin)) != '\n'); } -void __printRetValue(const char* func_name, int result) +void __printRetValue(const char *func_name, int result) { printf("In function %s result is ", func_name); - if(result == METADATA_EDITOR_ERROR_NONE) printf("METADATA_EDITOR_ERROR_NONE\n"); - else if(result == METADATA_EDITOR_ERROR_INVALID_PARAMETER) printf("METADATA_EDITOR_ERROR_INVALID_PARAMETER\n"); - else if(result == METADATA_EDITOR_ERROR_OUT_OF_MEMORY) printf("METADATA_EDITOR_ERROR_OUT_OF_MEMORY\n"); - else if(result == METADATA_EDITOR_ERROR_FILE_EXISTS) printf("METADATA_EDITOR_ERROR_FILE_EXISTS\n"); - else if(result == METADATA_EDITOR_ERROR_OPERATION_FAILED) printf("METADATA_EDITOR_ERROR_OPERATION_FAILED\n"); + if (result == METADATA_EDITOR_ERROR_NONE) printf("METADATA_EDITOR_ERROR_NONE\n"); + else if (result == METADATA_EDITOR_ERROR_INVALID_PARAMETER) printf("METADATA_EDITOR_ERROR_INVALID_PARAMETER\n"); + else if (result == METADATA_EDITOR_ERROR_OUT_OF_MEMORY) printf("METADATA_EDITOR_ERROR_OUT_OF_MEMORY\n"); + else if (result == METADATA_EDITOR_ERROR_FILE_EXISTS) printf("METADATA_EDITOR_ERROR_FILE_EXISTS\n"); + else if (result == METADATA_EDITOR_ERROR_OPERATION_FAILED) printf("METADATA_EDITOR_ERROR_OPERATION_FAILED\n"); else printf("Unallowed value. Error!\n"); } @@ -63,7 +63,7 @@ static bool __get_tag_info(metadata_editor_h metadata) char *description = NULL; char *comment = NULL; char *track_num = NULL; - char* picture_index = NULL; + char *picture_index = NULL; int picture_size = 0; char *picture_type = NULL; void *picture = NULL; @@ -71,90 +71,83 @@ static bool __get_tag_info(metadata_editor_h metadata) char *lyric = NULL; ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_ARTIST, &artist); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("1. - artist = [%s]\n", artist); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_TITLE, &title); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("2. - title = [%s]\n", title); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_ALBUM, &album); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("3. - album = [%s]\n", album); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_GENRE, &genre); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("4. - genre = [%s]\n", genre); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_AUTHOR, &composer); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("5. - composer = [%s]\n", composer); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_COPYRIGHT, ©right); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("6. - copyright = [%s]\n", copyright); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_DATE, &date); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("7. - date = [%s]\n", date); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_DESCRIPTION, &description); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("8. - description = [%s]\n", description); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_COMMENT, &comment); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("9. - comment = [%s]\n", comment); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_TRACK_NUM, &track_num); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("10. - track_num = [%s]\n", track_num); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_PICTURE_NUM, &picture_index); - //__printRetValue("metadata_editor_get_metadata(...)",ret); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ printf("Picture index is [%s]\n", picture_index); #if 0 - if((filetype == METADATA_EDITOR_TYPE_OGG_VORBIS) || (filetype == METADATA_EDITOR_TYPE_OGG_FLAC)) - { - if(ret != METADATA_EDITOR_ERROR_INVALID_PARAMETER) - printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - } - else - { + if ((filetype == METADATA_EDITOR_TYPE_OGG_VORBIS) || (filetype == METADATA_EDITOR_TYPE_OGG_FLAC)) { + if (ret != METADATA_EDITOR_ERROR_INVALID_PARAMETER) + printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + } else { #endif - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - else if((ret == METADATA_EDITOR_ERROR_NONE) && picture_index) - { + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + else if ((ret == METADATA_EDITOR_ERROR_NONE) && picture_index) { uint num, i; num = atoi(picture_index); printf("Number of pictures: %u\n", num); - for(i = 0; i < num; ++i) - { + for (i = 0; i < num; ++i) { ret = metadata_editor_get_picture(metadata, i, &picture, &picture_size, &picture_type); - //__printRetValue("metadata_editor_get_picture(...)", ret); - if(ret == METADATA_EDITOR_ERROR_NONE && picture) - { + /*__printRetValue("metadata_editor_get_picture(...)", ret); */ + if (ret == METADATA_EDITOR_ERROR_NONE && picture) { printf("Saving picture number %u\n", i); int size = 30; char picture_file_name[size]; - snprintf(picture_file_name, size, "outputFile_%u" ,i+1); - if(strncmp(picture_type, "image/jpeg", strlen("image/jpeg")) == 0) strcat(picture_file_name,".jpg"); - else if(strncmp(picture_type, "image/png", strlen("image/jpeg")) == 0) strcat(picture_file_name,".png"); - FILE * fout = fopen(picture_file_name, "wb"); + snprintf(picture_file_name, size, "outputFile_%u" , i + 1); + if (strncmp(picture_type, "image/jpeg", strlen("image/jpeg")) == 0) strcat(picture_file_name, ".jpg"); + else if (strncmp(picture_type, "image/png", strlen("image/jpeg")) == 0) strcat(picture_file_name, ".png"); + FILE *fout = fopen(picture_file_name, "wb"); fwrite(picture, picture_size, 1, fout); fclose(fout); - } - else + } else printf("Error occured while picture extraction\n"); } free(picture_index); @@ -165,13 +158,13 @@ static bool __get_tag_info(metadata_editor_h metadata) printf("11. - picture size = [%u]\n", picture_size); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_CONDUCTOR, &conductor); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("12. - conductor = [%s]\n", conductor); ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_UNSYNCLYRICS, &lyric); - //__printRetValue("metadata_editor_get_metadata(...)",ret); - if(ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); + /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ + if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); printf("13. - lyric = [%s]\n", lyric); SAFE_FREE(artist); @@ -201,64 +194,64 @@ static bool __write_tag_info(metadata_editor_h metadata) printf("\n===========================================\n"); printf("\n 1. - Writing artist: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_ARTIST, input_data); *input_data = '\0'; printf("2. - Writing title: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_TITLE, input_data); *input_data = '\0'; printf("3. - Writing album: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_ALBUM, input_data); *input_data = '\0'; printf("4. - Writing genre: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_GENRE, input_data); *input_data = '\0'; printf("5. - Writing composer: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_AUTHOR, input_data); *input_data = '\0'; printf("6. - Writing copyright: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_COPYRIGHT, input_data); *input_data = '\0'; printf("7. - Writing year: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_DATE, input_data); *input_data = '\0'; printf("8. - Writing description: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_DESCRIPTION, input_data); *input_data = '\0'; printf("9. - Writing track: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_TRACK_NUM, input_data); *input_data = '\0'; printf("10. - Writing comment: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_COMMENT, input_data); *input_data = '\0'; printf("11. - Writing conductor: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_CONDUCTOR, input_data); *input_data = '\0'; printf("12. - Writing lyrics: "); - dummy = scanf("%[^\n]",input_data); + dummy = scanf("%[^\n]", input_data); __flush(); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_UNSYNCLYRICS,input_data); + metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_UNSYNCLYRICS, input_data); *input_data = '\0'; metadata_editor_update_metadata(metadata); @@ -312,19 +305,18 @@ static bool __add_picture(metadata_editor_h metadata) dummy = scanf("%u", &c2); __flush(); - switch (c2) - { + switch (c2) { case 1: - printf("\n==========================="); - printf("\n Your choice is TestImage.png\n"); - picture_filename = "TestImage.png"; - break; + printf("\n==========================="); + printf("\n Your choice is TestImage.png\n"); + picture_filename = "TestImage.png"; + break; case 2: - printf("\n==========================="); - printf("\n Your choice is TestImage.jpg\n"); - picture_filename = "TestImage.jpg"; - break; + printf("\n==========================="); + printf("\n Your choice is TestImage.jpg\n"); + picture_filename = "TestImage.jpg"; + break; } metadata_editor_append_picture(metadata, picture_filename); @@ -340,18 +332,15 @@ static bool __delete_pictures(metadata_editor_h metadata) metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_PICTURE_NUM, &picture_index); printf("The number of pictures is [%s]\n", picture_index); - if(picture_index) - { + if (picture_index) { num = atoi(picture_index); printf("Number of pictures: %u\n", num); - for(i = 0; i < num; ++i) - { + for (i = 0; i < num; ++i) { metadata_editor_remove_picture(metadata, 0); - //__printRetValue("metadata_editor_remove_picture(...)", ret); + /*__printRetValue("metadata_editor_remove_picture(...)", ret); */ } - } - else + } else printf("There are no pictures to delete\n"); return true; } @@ -369,11 +358,10 @@ int main(int argc, char *argv[]) { int ret = METADATA_EDITOR_ERROR_NONE; metadata_editor_h metadata = NULL; - int cnt = argc -1; + int cnt = argc - 1; uint c2 = 0; - if(cnt < 1) - { + if (cnt < 1) { printf("\n===================================================================================================="); printf("\n Please type file path and media type as media-metadata-test /opt/usr/media/Sounds/ "); printf("\n===================================================================================================="); @@ -382,25 +370,22 @@ int main(int argc, char *argv[]) printf("\n\n --- media metadata test start ---\n\n"); ret = metadata_editor_create(&metadata); - //__printRetValue("metadata_editor_create(...)",ret); + /*__printRetValue("metadata_editor_create(...)",ret); */ - if(ret != METADATA_EDITOR_ERROR_NONE) - { + if (ret != METADATA_EDITOR_ERROR_NONE) { printf("Fail metadata_editor_create() at line [%d]\n", __LINE__); return 0; } ret = metadata_editor_set_path(metadata, argv[1]); - //__printRetValue("metadata_editor_set_path(...)",ret); + /*__printRetValue("metadata_editor_set_path(...)",ret); */ - if(ret != METADATA_EDITOR_ERROR_NONE) - { + if (ret != METADATA_EDITOR_ERROR_NONE) { printf("Fail metadata_editor_set_path() at line [%d]\n", __LINE__); goto exception; } - while (c2 != 9) - { + while (c2 != 9) { c2 = 0; printf("\n========================================================================"); printf("\n The file you are working with is %s", argv[1]); @@ -418,8 +403,7 @@ int main(int argc, char *argv[]) dummy = scanf("%u", &c2); __flush(); - switch (c2) - { + switch (c2) { case 1: printf("\n=============="); printf("\n Reading tags \n"); @@ -455,8 +439,7 @@ int main(int argc, char *argv[]) exception: ret = metadata_editor_destroy(metadata); - if(ret != METADATA_EDITOR_ERROR_NONE) - { + if (ret != METADATA_EDITOR_ERROR_NONE) { printf("Fail metadata_editor_destroy [%d]\n", ret); return 0; }