[content] Change codes according to remove ini file

Change-Id: If078450c095aa5dd2291ee21050418974081ca69
Signed-off-by: Seokpil Park <seokpil.park@samsung.com>

diff --git a/src/FCnt_ContentDirectoryImpl.cpp b/src/FCnt_ContentDirectoryImpl.cpp
index fc1225f..dc1a499 100644 (file)
--- a/src/FCnt_ContentDirectoryImpl.cpp
+++ b/src/FCnt_ContentDirectoryImpl.cpp
@@ -66,6 +66,8 @@ _ContentDirectoryImpl::~_ContentDirectoryImpl(void)
        ret = media_content_disconnect();
        r = MapCoreErrorToNativeResult(ret);
        SysTryLog(NID_CNT, r == E_SUCCESS, "[%s] Propagating for media_content_disconnect.", GetErrorMessage(r));
+
+       SysLog(NID_CNT, "media_content_disconnect result[%d].", ret);
 }
 
  _ContentDirectoryImpl*
@@ -91,6 +93,8 @@ _ContentDirectoryImpl::Construct(ContentType type)
        r = MapCoreErrorToNativeResult(ret);
        SysTryReturnResult(NID_CNT, r == E_SUCCESS, r, "Propagating for media_content_connect.");
 
+       SysLog(NID_CNT, "media_content_connect result[%d].", ret);
+
        __contentType = type;
        __isMultiContentType = false;
        __multiContentTypeExpr.Clear();
@@ -110,6 +114,8 @@ _ContentDirectoryImpl::Construct(const Tizen::Base::Collection::IListT<ContentTy
        r = MapCoreErrorToNativeResult(ret);
        SysTryReturnResult(NID_CNT, r == E_SUCCESS, r, "Propagating for media_content_connect.");
 
+       SysLog(NID_CNT, "media_content_connect result[%d].", ret);
+
        __multiContentTypeExpr.Clear();
 
        std::unique_ptr<IEnumeratorT<ContentType> > pEnum(contentTypeList.GetEnumeratorN());

diff --git a/src/FCnt_ContentManagerImpl.cpp b/src/FCnt_ContentManagerImpl.cpp
index 88112b6..e04fd20 100644 (file)
--- a/src/FCnt_ContentManagerImpl.cpp
+++ b/src/FCnt_ContentManagerImpl.cpp
@@ -279,6 +279,8 @@ _ContentManagerImpl::Construct(void)
        SysTryReturnResult(NID_CNT, val == MEDIA_CONTENT_ERROR_NONE, E_SYSTEM,
                        "The connection failed[%d].", val);
 
+       SysLog(NID_CNT, "media_content_connect result[%d].", val);
+
        __isConnected = true;
 
        return E_SUCCESS;

diff --git a/src/FCnt_ContentTransferImpl.cpp b/src/FCnt_ContentTransferImpl.cpp
index 31cc5b2..62470d9 100644 (file)
--- a/src/FCnt_ContentTransferImpl.cpp
+++ b/src/FCnt_ContentTransferImpl.cpp
@@ -52,7 +52,7 @@ using namespace Tizen::System;
 
 static RequestId downloadRequestId = 0;
 static bool initSlot = false;
-static const wchar_t CONTENT_DOWNLOAD[] = L"/usr/etc/content-download.ini";
+static const int MAX_DOWNLOAD_COUNT = 5;
 
 namespace Tizen { namespace Content
 {
@@ -70,7 +70,6 @@ static const int CONTENT_DOWNLOAD_CHECKING_PERIOD = 1000;
 _ContentTransferImpl::_ContentTransferImpl(void)
        : __requestId(INVALID_REQUEST_ID)
        , __restRequestId(INVALID_REQUEST_ID)
-       , __maxDownloadCount(0)
        , __timeout(0)
        , __percent(CONTENT_TRANSFER_DEFAULT_PROGRESS_INTERVAL)
        , __timerStarted(false)
@@ -112,9 +111,6 @@ _ContentTransferImpl::Construct(IContentTransferListener& listener)
        ClearLastResult();
        result r = E_SUCCESS;
 
-       __maxDownloadCount = GetMaxDownloadCount();
-       SysAssertf(__maxDownloadCount > 0, "The maximum download count is 0 or less than 0.");
-
        std::unique_ptr<_ContentDownloadHandler> pContentDownloadHandler(new (std::nothrow) _ContentDownloadHandler);
        SysTryReturn(NID_CNT, pContentDownloadHandler != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
                        "[E_OUT_OF_MEMORY] Failed to construct ContentDownloadHandler.");
@@ -123,11 +119,11 @@ _ContentTransferImpl::Construct(IContentTransferListener& listener)
        SysTryReturn(NID_CNT, !IsFailed(r), r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
                        "[E_OUT_OF_MEMORY] Failed to construct ContentDownloadHandler.");
 
-       std::unique_ptr<_ContentDownloadHandler[]> pContentDownloadHandlerSequence(new (std::nothrow) _ContentDownloadHandler[__maxDownloadCount]);
+       std::unique_ptr<_ContentDownloadHandler[]> pContentDownloadHandlerSequence(new (std::nothrow) _ContentDownloadHandler[MAX_DOWNLOAD_COUNT]);
        SysTryReturn(NID_CNT, pContentDownloadHandlerSequence != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
                        "[E_OUT_OF_MEMORY] Failed to construct ContentDownloadHandler array.");
 
-       for (int i = 0; i < __maxDownloadCount; i++)
+       for (int i = 0; i < MAX_DOWNLOAD_COUNT; i++)
        {
                r = (pContentDownloadHandlerSequence.get())[i].Construct();
                SysTryReturn(NID_CNT, !IsFailed(r), r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
@@ -138,7 +134,7 @@ _ContentTransferImpl::Construct(IContentTransferListener& listener)
        SysTryReturn(NID_CNT, pContentDownloadUserData != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
                        "[E_OUT_OF_MEMORY] Failed to construct ContentDownloadUserData.");
 
-       std::unique_ptr<_ContentDownloadUserData[]> pContentDownloadUserDataSequence(new (std::nothrow) _ContentDownloadUserData[__maxDownloadCount]);
+       std::unique_ptr<_ContentDownloadUserData[]> pContentDownloadUserDataSequence(new (std::nothrow) _ContentDownloadUserData[MAX_DOWNLOAD_COUNT]);
        SysTryReturn(NID_CNT, pContentDownloadUserDataSequence != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
                        "[E_OUT_OF_MEMORY] Failed to construct ContentDownloadUserData.");
 
@@ -194,11 +190,11 @@ _ContentTransferImpl::InitializeEmptySlotInternal(_ContentDownloadUserData* pUse
        SysTryReturnVoidResult(NID_CNT, pUserData != null, r = E_SYSTEM,
                        "[E_SYSTEM] ContentDownloadUserData instance must not be null.");
 
-       pUserData->SetMaxCount(__maxDownloadCount);
+       pUserData->SetMaxCount(MAX_DOWNLOAD_COUNT);
 
        if (!initSlot)
        {
-               for (i = 0; i < __maxDownloadCount; i++)
+               for (i = 0; i < MAX_DOWNLOAD_COUNT; i++)
                {
                        pUserData->SetCheckDownloading(i, false);
                }
@@ -222,32 +218,10 @@ _ContentTransferImpl::InitializeEmptySlotInternal(_ContentDownloadUserData* pUse
 }
 
 int
-_ContentTransferImpl::GetMaxDownloadCount(void) const
-{
-       ClearLastResult();
-       result r = E_SUCCESS;
-       Registry reg;
-       String regPathName(CONTENT_DOWNLOAD);
-       String sect(L"DownloadCount");
-       String entry(L"Max");
-       int value = 0;
-
-       r = reg.Construct(regPathName, REG_OPEN_READ_ONLY, 0);
-       SysTryReturn(NID_CNT, !IsFailed(r), -1, r, "[%s] Failed to construct Registry.", GetErrorMessage(r));
-
-       r = reg.GetValue(sect, entry, value);
-       SysTryReturn(NID_CNT, !IsFailed(r), -1, r, "[%s] Failed to perform GetValue operation from ini file.", GetErrorMessage(r));
-
-       SysLog(NID_CNT, "Max download count is [%d].", value);
-
-       return value;
-}
-
-int
 _ContentTransferImpl::GetEmptySlotInternal(void) const
 {
        int i = 0;
-       for (i = 0; i < __maxDownloadCount; i++)
+       for (i = 0; i < MAX_DOWNLOAD_COUNT; i++)
        {
                if (!(__pContentDownloadUserData->GetCheckDownloading(i)))
                {
@@ -260,7 +234,7 @@ _ContentTransferImpl::GetEmptySlotInternal(void) const
 void
 _ContentTransferImpl::SetEmptySlotInternal(void)
 {
-       for (int i = 0; i < __maxDownloadCount; i++)
+       for (int i = 0; i < MAX_DOWNLOAD_COUNT; i++)
        {
                if (!((__pContentDownloadUserDataSequence.get())[i].GetSlotFlag()))
                {
@@ -273,7 +247,7 @@ void
 _ContentTransferImpl::SetUsedSlotInternal(int slot)
 {
        // TODO : If the error is occured in this command, set the mutex.
-       if (slot >= 0 && slot < __maxDownloadCount)
+       if (slot >= 0 && slot < MAX_DOWNLOAD_COUNT)
        {
                __pContentDownloadUserData->SetCheckDownloading(slot, true);
                (__pContentDownloadUserDataSequence.get())[slot].SetSlotFlag(true);
@@ -985,7 +959,7 @@ _ContentTransferImpl::GetEmptySlot(int& slot) const
 
        slot = GetEmptySlotInternal();
 
-       if (slot < 0 || slot > __maxDownloadCount)
+       if (slot < 0 || slot > MAX_DOWNLOAD_COUNT)
        {
                r = E_OBJ_NOT_FOUND;
                SysLog(NID_CNT, "Failed to get empty slot for download.");
@@ -1440,7 +1414,7 @@ _ContentTransferImpl::ContentTransferHandler(void)
                if (status == CONTENT_TRANSFER_STATUS_DOWNLOADING)
                {
                        downloadCount++;
-                       if (downloadCount == __maxDownloadCount)
+                       if (downloadCount == MAX_DOWNLOAD_COUNT)
                        {
                                full = true;
                                continue;
@@ -1507,7 +1481,7 @@ _ContentTransferImpl::ContentTransferHandler(void)
                        pTransferInfo->SetDownloadStatus(CONTENT_TRANSFER_STATUS_DOWNLOADING);
                        downloadCount++;
 
-                       if (downloadCount == __maxDownloadCount)
+                       if (downloadCount == MAX_DOWNLOAD_COUNT)
                        {
                                full = true;
                        }

diff --git a/src/FCnt_PlayListImpl.cpp b/src/FCnt_PlayListImpl.cpp
index cde274d..846cf9f 100644 (file)
--- a/src/FCnt_PlayListImpl.cpp
+++ b/src/FCnt_PlayListImpl.cpp
@@ -61,6 +61,8 @@ _PlayListImpl::~_PlayListImpl(void)
        ret = media_content_disconnect();
        r = MapCoreErrorToNativeResult(ret);
        SysTryLog(r == E_SUCCESS, "[%s] Propagating for media_content_disconnect", GetErrorMessage(r));
+
+       SysLog(NID_CNT, "media_content_disconnect result[%d].", ret);
 }
 
  _PlayListImpl*
@@ -82,6 +84,8 @@ _PlayListImpl::Construct(const Tizen::Base::String& playListName, bool isAdd)
        result r = MapCoreErrorToNativeResult(ret);
        SysTryReturnResult(NID_CNT, r == E_SUCCESS , r, "Propagating for media_content_connect");
 
+       SysLog(NID_CNT, "media_content_connect result[%d].", ret);
+
        if (isAdd == true)
        {
                std::unique_ptr<media_playlist_s, PlayListHandleDeleter> pPlaylistHandle;

diff --git a/src/FCnt_PlayListManagerImpl.cpp b/src/FCnt_PlayListManagerImpl.cpp
index b271c79..e505d4f 100644 (file)
--- a/src/FCnt_PlayListManagerImpl.cpp
+++ b/src/FCnt_PlayListManagerImpl.cpp
@@ -58,6 +58,8 @@ _PlayListManagerImpl::~_PlayListManagerImpl(void)
        ret = media_content_disconnect();
        r = MapCoreErrorToNativeResult(ret);
        SysTryLog(r == E_SUCCESS, "[%s] Propagating for media_content_disconnect.", GetErrorMessage(r));
+
+       SysLog(NID_CNT, "media_content_disconnect result[%d].", ret);
 }
 
  _PlayListManagerImpl*
@@ -82,6 +84,8 @@ _PlayListManagerImpl::Construct(void)
        r = MapCoreErrorToNativeResult(ret);
        SysTryReturnResult(NID_CNT, r == E_SUCCESS , r, "Propagating for media_content_disconnect.");
 
+       SysLog(NID_CNT, "media_content_connect result[%d].", ret);
+
        return r;
 }
 

diff --git a/src/inc/FCnt_ContentTransferImpl.h b/src/inc/FCnt_ContentTransferImpl.h
index 19d2d9c..2e6da28 100644 (file)
--- a/src/inc/FCnt_ContentTransferImpl.h
+++ b/src/inc/FCnt_ContentTransferImpl.h
@@ -182,7 +182,6 @@ private:
 private:
        RequestId __requestId;
        RequestId __restRequestId;
-       int __maxDownloadCount;
        int __timeout;
        int __percent;
        bool __timerStarted;