Update change log and spec for wrt-plugins-tizen_0.4.29

[framework/web/wrt-plugins-tizen.git] / src / Content / ContentManager.cpp

diff --git a/src/Content/ContentManager.cpp b/src/Content/ContentManager.cpp
index 5f8ef50..0bbfb3e 100755 (executable)
--- a/src/Content/ContentManager.cpp
+++ b/src/Content/ContentManager.cpp
@@ -224,6 +224,16 @@ void MediacontentManager::readCommonDataFromMediaInfo(media_info_h info, Mediaco
                }
        }
 
+       if (MEDIA_CONTENT_ERROR_NONE == media_info_get_title(info, &tmpStr) )
+       {
+               if (tmpStr)
+               {
+                   newMedia->setTitle(tmpStr);
+                   free(tmpStr);
+                   tmpStr = NULL;
+               }
+       }
+
        if ( MEDIA_CONTENT_ERROR_NONE == media_info_get_file_path(info, &tmpStr) )
        {
                if (tmpStr)
@@ -303,7 +313,7 @@ void MediacontentManager::readImageFromMediaInfo( media_info_h info, Mediaconten
                                {
                                        struct tm *result = (struct tm *)calloc(1, sizeof(struct tm));
                                        if (strptime(tmpStr, "%Y:%m:%d %H:%M:%S", result) == NULL) {
-                                               LogError( "Couldn't convert supplied date.");
+                                               LoggerE( "Couldn't convert supplied date.");
                                        }
                                
                                        newImage->setReleasedDate(result);
@@ -311,16 +321,6 @@ void MediacontentManager::readImageFromMediaInfo( media_info_h info, Mediaconten
                                        tmpStr = NULL;
                                }
                        }
-                       if ( MEDIA_CONTENT_ERROR_NONE == image_meta_get_title(img, &tmpStr) )
-                       {
-                               if( tmpStr )
-                               {
-                                       newImage->setTitle(tmpStr);
-                                       free(tmpStr);
-                                       tmpStr = NULL;
-                               }
-                       }
-
                        if ( MEDIA_CONTENT_ERROR_NONE == image_meta_get_width(img, &tmpInt) )
                        {
                                newImage->setImageWidth(tmpInt);
@@ -421,7 +421,7 @@ void MediacontentManager::readVideoFromMediaInfo( media_info_h info, Mediaconten
                                {       
                                        struct tm *result=(struct tm *)calloc(1, sizeof(struct tm));
                                        if (strptime(tmpStr, "%Y:%m:%d %H:%M:%S", result) == NULL) {
-                                               LogError( "Couldn't convert supplied date.");
+                                               LoggerE( "Couldn't convert supplied date.");
                                        }
                                        newVideo->setReleasedDate(result);
                                        
@@ -440,16 +440,6 @@ void MediacontentManager::readVideoFromMediaInfo( media_info_h info, Mediaconten
                                }
                        }
 
-                       if ( MEDIA_CONTENT_ERROR_NONE == video_meta_get_title(video, &tmpStr) )
-                       {
-                               if( tmpStr )
-                               {
-                                       newVideo->setTitle(tmpStr);
-                                       free(tmpStr);
-                                       tmpStr = NULL;
-                               }
-                       }
-
                        if ( MEDIA_CONTENT_ERROR_NONE == video_meta_get_artist(video, &tmpStr) )
                        {       
                                if ( tmpStr)
@@ -532,7 +522,7 @@ void MediacontentManager::readMusicFromMediaInfo( media_info_h info, Mediaconten
                                {       
                                        struct tm *result = (struct tm *)calloc(1, sizeof(struct tm));
                                        if (strptime(tmpStr, "%Y:%m:%d %H:%M:%S", result) == NULL) {
-                                               LogError( "Couldn't convert supplied date.");
+                                               LoggerE( "Couldn't convert supplied date.");
                                        }
                                        newAudio->setReleasedDate(result);
                                        
@@ -541,16 +531,6 @@ void MediacontentManager::readMusicFromMediaInfo( media_info_h info, Mediaconten
                                }
                        }
 
-                       if ( MEDIA_CONTENT_ERROR_NONE == audio_meta_get_title(audio, &tmpStr) )
-                       {
-                               if (tmpStr)
-                               {
-                                       newAudio->setTitle(tmpStr);
-                                       free(tmpStr);
-                                       tmpStr = NULL;
-                               }
-                       }
-
                        if ( MEDIA_CONTENT_ERROR_NONE == audio_meta_get_album(audio, &tmpStr) )
                        {
                                if (tmpStr)
@@ -746,7 +726,7 @@ void MediacontentManager::OnRequestReceived(const IEventFindFolderPtr &eFolder)
        if ( MEDIA_CONTENT_ERROR_NONE != 
                media_folder_foreach_folder_from_db (NULL, mediaFolderCallback, eFolder.Get()))
        {       
-               LogError("error ( media_folder_foreach_folder_from_db ) : ");
+               LoggerE("error ( media_folder_foreach_folder_from_db ) : ");
                eFolder->setResult(false);
        }
        else
@@ -846,7 +826,7 @@ void MediacontentManager::OnRequestReceived(const IEventBrowseFolderPtr &eBrowse
                        else
                        {
                                
-                               LogError("error ( media filter create ) : ");
+                               LoggerE("error ( media filter create ) : ");
                                eBrowse->setResult(false);
                        }
                }
@@ -858,7 +838,7 @@ void MediacontentManager::OnRequestReceived(const IEventBrowseFolderPtr &eBrowse
                        if ( MEDIA_CONTENT_ERROR_NONE !=  
                                media_folder_foreach_media_from_db (folderID.c_str(), filter, mediaItemCallback, eBrowse.Get()))
                        {       
-                               LogError("error ( media_folder_foreach_folder_from_db ) : " << ret);
+                               LoggerE("error ( media_folder_foreach_folder_from_db ) : " << ret);
                                eBrowse->setResult(false);
                        }
                        else
@@ -871,7 +851,7 @@ void MediacontentManager::OnRequestReceived(const IEventBrowseFolderPtr &eBrowse
                        if ( MEDIA_CONTENT_ERROR_NONE !=  
                                media_info_foreach_media_from_db (filter, mediaItemCallback, eBrowse.Get()))
                        {
-                               LogError("error ( media_folder_foreach_folder_from_db ) : " << ret);
+                               LoggerE("error ( media_folder_foreach_folder_from_db ) : " << ret);
                                eBrowse->setResult(false);
                        }
                        else
@@ -885,13 +865,13 @@ void MediacontentManager::OnRequestReceived(const IEventBrowseFolderPtr &eBrowse
                {
                        if ( MEDIA_CONTENT_ERROR_NONE != media_filter_destroy(filter))
                        {
-                               LogError("media_filter_create Error: " << ret);
+                               LoggerE("media_filter_create Error: " << ret);
                        }
                }
 
        }
        catch(const Exception &ex){
-                       LogError("Exception: " << ex.DumpToString());
+                       LoggerE("Exception: " << ex.DumpToString());
                        eBrowse->setResult(false);
                        return;
        }
@@ -1111,7 +1091,7 @@ void MediacontentManager::OnRequestReceived(const IEventUpdateMediaPtr &eMedia)
        }
     catch (const Exception &ex)
     {
-        LogError("Exception: " << ex.DumpToString());
+        LoggerE("Exception: " << ex.DumpToString());
         eMedia->setResult(false);
     }
 }
@@ -1148,7 +1128,7 @@ void MediacontentManager::OnRequestReceived(const IEventUpdateMediaItemsPtr &eIt
        }
        catch (const Exception &ex)
        {
-                LogError("Exception: " << ex.DumpToString());
+                LoggerE("Exception: " << ex.DumpToString());
                 eItems->setResult(false);
        }       
 }