From 3960e13122252d09dd887567dbdfe67e20eb5613 Mon Sep 17 00:00:00 2001 From: Seokpil Park Date: Wed, 2 Oct 2013 11:56:11 +0900 Subject: [PATCH] Fix : Temporarily remove AlbumArtist information because of the build error Change-Id: I107bcb293209de5960a94db5bbecd49e63d36fcf Signed-off-by: Seokpil Park --- src/FCnt_ContentManagerImpl.cpp | 27 ++++++++++++++------------- src/FCnt_ContentUtility.cpp | 31 ++++++++++++++++--------------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/FCnt_ContentManagerImpl.cpp b/src/FCnt_ContentManagerImpl.cpp index fbede74..83abde8 100644 --- a/src/FCnt_ContentManagerImpl.cpp +++ b/src/FCnt_ContentManagerImpl.cpp @@ -1875,19 +1875,20 @@ _ContentManagerImpl::MakeAudioContentInfo(const media_info_h pMediaInfo, void* p SysLog(NID_CNT, "META: artist[%ls]", (String(pStrValue.get())).GetPointer()); } - // album artist - val = audio_meta_get_album_artist(*(pAudioMeta.get()), &pTempValue); - SysTryReturnResult(NID_CNT, val == MEDIA_CONTENT_ERROR_NONE, ConvertError(val), - "audio_meta_get_album_artist failed[%d].", val); - - if (pTempValue != null) - { - pStrValue.reset(pTempValue); - - pAudioContentInfoImpl->SetAlbumArtist(String(pStrValue.get())); - - SysLog(NID_CNT, "META: album artist[%ls]", (String(pStrValue.get())).GetPointer()); - } + // Add to private for extension api +// // album artist +// val = audio_meta_get_album_artist(*(pAudioMeta.get()), &pTempValue); +// SysTryReturnResult(NID_CNT, val == MEDIA_CONTENT_ERROR_NONE, ConvertError(val), +// "audio_meta_get_album_artist failed[%d].", val); +// +// if (pTempValue != null) +// { +// pStrValue.reset(pTempValue); +// +// pAudioContentInfoImpl->SetAlbumArtist(String(pStrValue.get())); +// +// SysLog(NID_CNT, "META: album artist[%ls]", (String(pStrValue.get())).GetPointer()); +// } // composer val = audio_meta_get_composer(*(pAudioMeta.get()), &pTempValue); diff --git a/src/FCnt_ContentUtility.cpp b/src/FCnt_ContentUtility.cpp index 3355556..3350de7 100644 --- a/src/FCnt_ContentUtility.cpp +++ b/src/FCnt_ContentUtility.cpp @@ -666,15 +666,16 @@ _ContentUtility::FillAudioContentData(media_info_h mediaHandle, _AudioContentInf SysTryReturnResult(NID_CNT, ret == MEDIA_CONTENT_ERROR_NONE, MapCoreErrorToNativeResult(ret), "Failed to perform audio_meta_get_artist operation."); } - ret = audio_meta_get_album_artist(pAudioHandle.get(), &pAudioMetaValue); - if (pAudioMetaValue != null) - { - pAlbumArtistName.reset(pAudioMetaValue); - } - else - { - SysTryReturnResult(NID_CNT, ret == MEDIA_CONTENT_ERROR_NONE, MapCoreErrorToNativeResult(ret), "Failed to perform audio_meta_get_album_artist operation."); - } + // Add to private for extension api +// ret = audio_meta_get_album_artist(pAudioHandle.get(), &pAudioMetaValue); +// if (pAudioMetaValue != null) +// { +// pAlbumArtistName.reset(pAudioMetaValue); +// } +// else +// { +// SysTryReturnResult(NID_CNT, ret == MEDIA_CONTENT_ERROR_NONE, MapCoreErrorToNativeResult(ret), "Failed to perform audio_meta_get_album_artist operation."); +// } ret = audio_meta_get_genre(pAudioHandle.get(), &pAudioMetaValue); if (pAudioMetaValue != null) @@ -765,12 +766,12 @@ _ContentUtility::FillAudioContentData(media_info_h mediaHandle, _AudioContentInf SysLog(NID_CNT, "pAudioContentInfoImpl->pArtist = %ls", (pAudioContentInfoImpl->GetArtist()).GetPointer()); } - if (pAlbumArtistName.get() != NULL) - { - pAudioContentInfoImpl->SetAlbumArtist(String(pAlbumArtistName.get())); - SysLog(NID_CNT, "pAudioContentInfoImpl->pAlbumArtist = %ls", (pAudioContentInfoImpl->GetAlbumArtist()).GetPointer()); - } - + // Add to private for extension api +// if (pAlbumArtistName.get() != NULL) +// { +// pAudioContentInfoImpl->SetAlbumArtist(String(pAlbumArtistName.get())); +// SysLog(NID_CNT, "pAudioContentInfoImpl->pAlbumArtist = %ls", (pAudioContentInfoImpl->GetAlbumArtist()).GetPointer()); +// } if (pGenreName.get() != NULL) { -- 2.7.4