Bug fix of MP4 metadata when using auto keyword

Change-Id: I9aac227c38061475c2ed07e15c073682428239f4

diff --git a/src/metadata_editor.cpp b/src/metadata_editor.cpp
index 10e8343..da684d0 100755 (executable)
--- a/src/metadata_editor.cpp
+++ b/src/metadata_editor.cpp
@@ -369,7 +369,7 @@ static int __MP4_getStringItem(metadata_editor_s *_metadata, const char *itemnam
        auto tag = dynamic_cast<MP4::Tag*>(_metadata->file->tag());
        metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist");
 
-       auto itemMap = tag->itemListMap();
+       auto &itemMap = tag->itemListMap();
        auto it = itemMap.find(itemname);
 
        if (it != itemMap.end())
@@ -391,7 +391,7 @@ static int __MP4_getIntegerItem(metadata_editor_s *_metadata, const char *itemna
        auto tag = dynamic_cast<MP4::Tag*>(_metadata->file->tag());
        metadata_editor_retvm_if(!tag, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist");
 
-       auto itemMap = tag->itemListMap();
+       auto &itemMap = tag->itemListMap();
        auto it = itemMap.find(itemname);
        if (it != itemMap.end())
                *value = g_strdup_printf("%u", it->second.toInt());
@@ -413,7 +413,7 @@ static int __MP4_updateStringItem(metadata_editor_s *_metadata, const char *item
        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
-       auto itemMap = tag->itemListMap();
+       auto &itemMap = tag->itemListMap();
        // Check if it is a request for deletion
        if ((value == NULL) || value[0] == '\0') {
                metadata_editor_info("Request for deleting of item <%s>", itemname);
@@ -440,7 +440,7 @@ static int __MP4_updateIntegerItem(metadata_editor_s *_metadata, const char *ite
        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
-       auto itemMap = tag->itemListMap();
+       auto &itemMap = tag->itemListMap();
        // Check if it is a request for deletion
        if ((value == NULL) || value[0] == '\0') {
                metadata_editor_info("Request for deleting of item <%s>", itemname);
@@ -486,7 +486,7 @@ static int __xiph_getFieldValue(metadata_editor_s *_metadata, Ogg::XiphComment *
        metadata_editor_retvm_if(!fieldname, METADATA_EDITOR_ERROR_INVALID_PARAMETER, "Invalid fieldname");
        metadata_editor_retvm_if(!xtag, METADATA_EDITOR_ERROR_OPERATION_FAILED, "Tag does not exist");
 
-       auto fieldMap = xtag->fieldListMap();
+       auto &fieldMap = xtag->fieldListMap();
        auto it = fieldMap.find(fieldname);
 
        if ((xtag->contains(fieldname)) && (it != fieldMap.end()))