projects / platform / core / api / metadata-editor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0c7bb0e)
Unify Code for getting ID3tag to __ID3_getTwixFrameByName() 20/234420/3
authorhj kim <backto.kim@samsung.com>
Tue, 26 May 2020 08:22:51 +0000 (17:22 +0900)
committerhj kim <backto.kim@samsung.com>
Wed, 27 May 2020 03:11:43 +0000 (03:11 +0000)
Change-Id: I3dde3b8339f68e74ae5e69ca204497b3e0d6ac88

src/metadata_editor.cpp patch | blob | history

diff --git a/src/metadata_editor.cpp b/src/metadata_editor.cpp
index 7bf2748..93d79a4 100755 (executable)
--- a/src/metadata_editor.cpp
+++ b/src/metadata_editor.cpp
@@ -213,18 +213,6 @@ static int __ID3_setTwixFrameByName(ID3v1::Tag *tag1, ID3v2::Tag *tag2, const ch
        return __ID3v2_setFrameByName(tag2, frameID, value);
 }
 
-static int __ID3_getFrameByName(ID3v2::Tag *tag2, const char *frameID, char **value)
-{
-       metadata_editor_retvm_if(!frameID, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid frameID");
-       metadata_editor_retvm_if(!tag2 || tag2->frameListMap()[frameID].isEmpty(), METADATA_EDITOR_ERROR_NONE, "The frame %s does not exist", frameID);
-
-       metadata_editor_info("The frame %s exists", frameID);
-
-       *value = g_strdup(tag2->frameListMap()[frameID][0]->toString().toCString(true));
-
-       return METADATA_EDITOR_ERROR_NONE;
-}
-
 static int __ID3_getNumberOfPictures(ID3v2::Tag *tag2, char **value)
 {
        metadata_editor_retvm_if(!value, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid value");
@@ -677,13 +665,13 @@ static int __metadata_editor_get_mp3_metadata(metadata_editor_s *metadata, metad
                case METADATA_EDITOR_ATTR_TITLE:                        return __ID3_getTwixFrameByName(tag1, tag2, "TIT2", value);
                case METADATA_EDITOR_ATTR_ALBUM:                        return __ID3_getTwixFrameByName(tag1, tag2, "TALB", value);
                case METADATA_EDITOR_ATTR_GENRE:                        return __ID3_getTwixFrameByName(tag1, tag2, "TCON", value);
-               case METADATA_EDITOR_ATTR_AUTHOR:                       return __ID3_getFrameByName(tag2, "TCOM", value);
-               case METADATA_EDITOR_ATTR_COPYRIGHT:                    return __ID3_getFrameByName(tag2, "TCOP", value);
+               case METADATA_EDITOR_ATTR_AUTHOR:                       return __ID3_getTwixFrameByName(NULL, tag2, "TCOM", value);
+               case METADATA_EDITOR_ATTR_COPYRIGHT:                    return __ID3_getTwixFrameByName(NULL, tag2, "TCOP", value);
                case METADATA_EDITOR_ATTR_DATE:                 return __ID3_getTwixFrameByName(tag1, tag2, "TDRC", value);
-               case METADATA_EDITOR_ATTR_DESCRIPTION:          return __ID3_getFrameByName(tag2, "TIT3", value);
+               case METADATA_EDITOR_ATTR_DESCRIPTION:          return __ID3_getTwixFrameByName(NULL, tag2, "TIT3", value);
                case METADATA_EDITOR_ATTR_COMMENT:                      return __ID3_getTwixFrameByName(tag1, tag2, "COMM", value);
                case METADATA_EDITOR_ATTR_TRACK_NUM:                    return __ID3_getTwixFrameByName(tag1, tag2, "TRCK", value);
-               case METADATA_EDITOR_ATTR_CONDUCTOR:                    return __ID3_getFrameByName(tag2, "TPE3", value);
+               case METADATA_EDITOR_ATTR_CONDUCTOR:                    return __ID3_getTwixFrameByName(NULL, tag2, "TPE3", value);
                case METADATA_EDITOR_ATTR_PICTURE_NUM:                  return __ID3_getNumberOfPictures(tag2, value);
                case METADATA_EDITOR_ATTR_UNSYNCLYRICS:                 return __ID3_getLyricsFrame(tag2, value);
                default:
@@ -841,17 +829,17 @@ static int __metadata_editor_get_wav_metadata(metadata_editor_s *metadata, metad
        }
 
        switch (attribute) {                                    // Check which one of frame types was given to the function for processing
-               case METADATA_EDITOR_ATTR_ARTIST:                       return __ID3_getFrameByName(tag2, "TPE1", value);
-               case METADATA_EDITOR_ATTR_TITLE:                        return __ID3_getFrameByName(tag2, "TIT2", value);
-               case METADATA_EDITOR_ATTR_ALBUM:                        return __ID3_getFrameByName(tag2, "TALB", value);
-               case METADATA_EDITOR_ATTR_GENRE:                        return __ID3_getFrameByName(tag2, "TCON", value);
-               case METADATA_EDITOR_ATTR_AUTHOR:                       return __ID3_getFrameByName(tag2, "TCOM", value);
-               case METADATA_EDITOR_ATTR_COPYRIGHT:                    return __ID3_getFrameByName(tag2, "TCOP", value);
-               case METADATA_EDITOR_ATTR_DATE:                 return __ID3_getFrameByName(tag2, "TDRC", value);
-               case METADATA_EDITOR_ATTR_DESCRIPTION:          return __ID3_getFrameByName(tag2, "TIT3", value);
-               case METADATA_EDITOR_ATTR_COMMENT:                      return __ID3_getFrameByName(tag2, "COMM", value);
-               case METADATA_EDITOR_ATTR_TRACK_NUM:                    return __ID3_getFrameByName(tag2, "TRCK", value);
-               case METADATA_EDITOR_ATTR_CONDUCTOR:                    return __ID3_getFrameByName(tag2, "TPE3", value);
+               case METADATA_EDITOR_ATTR_ARTIST:                       return __ID3_getTwixFrameByName(NULL, tag2, "TPE1", value);
+               case METADATA_EDITOR_ATTR_TITLE:                        return __ID3_getTwixFrameByName(NULL, tag2, "TIT2", value);
+               case METADATA_EDITOR_ATTR_ALBUM:                        return __ID3_getTwixFrameByName(NULL, tag2, "TALB", value);
+               case METADATA_EDITOR_ATTR_GENRE:                        return __ID3_getTwixFrameByName(NULL, tag2, "TCON", value);
+               case METADATA_EDITOR_ATTR_AUTHOR:                       return __ID3_getTwixFrameByName(NULL, tag2, "TCOM", value);
+               case METADATA_EDITOR_ATTR_COPYRIGHT:                    return __ID3_getTwixFrameByName(NULL, tag2, "TCOP", value);
+               case METADATA_EDITOR_ATTR_DATE:                 return __ID3_getTwixFrameByName(NULL, tag2, "TDRC", value);
+               case METADATA_EDITOR_ATTR_DESCRIPTION:          return __ID3_getTwixFrameByName(NULL, tag2, "TIT3", value);
+               case METADATA_EDITOR_ATTR_COMMENT:                      return __ID3_getTwixFrameByName(NULL, tag2, "COMM", value);
+               case METADATA_EDITOR_ATTR_TRACK_NUM:                    return __ID3_getTwixFrameByName(NULL, tag2, "TRCK", value);
+               case METADATA_EDITOR_ATTR_CONDUCTOR:                    return __ID3_getTwixFrameByName(NULL, tag2, "TPE3", value);
                case METADATA_EDITOR_ATTR_PICTURE_NUM:                  return __ID3_getNumberOfPictures(tag2, value);
                case METADATA_EDITOR_ATTR_UNSYNCLYRICS:                 return __ID3_getLyricsFrame(tag2, value);
                default:
Domain: Multimedia / Media Editing;