Fixed NABI_SE issue N_SE-34439

Change-Id: Id2ffb103935c4114d675b594351a5fa7d9ca616f

diff --git a/src/MfSubBaseSelectionForm.cpp b/src/MfSubBaseSelectionForm.cpp
index 2e8d9aa..bd924ac 100644 (file)
--- a/src/MfSubBaseSelectionForm.cpp
+++ b/src/MfSubBaseSelectionForm.cpp
@@ -521,6 +521,11 @@ SubBaseSelection::LoadMusicPlayer(const Tizen::Base::String& mediaFilepath, Tize
        result r = E_SUCCESS;\r
        if (_pAudioPlayer != null && mediaFilepath.IsEmpty() == false)\r
        {\r
+               if (_pAudioPlayer->GetState() != PLAYER_STATE_PAUSED)\r
+               {\r
+                       _pAudioPlayer->Construct(*this);\r
+               }\r
+\r
                r = _pAudioPlayer->OpenFile(mediaFilepath, false);\r
                r = _pAudioPlayer->Play();\r
                r = _pAudioPlayer->SetLooping(false);\r
@@ -729,6 +734,7 @@ SubBaseSelection::ResetFooter(void)
 void\r
 SubBaseSelection::OnPlayerAudioFocusChanged (void)\r
 {\r
+       //Empty Implementation.\r
 }\r
 \r
 void\r

diff --git a/src/MfSubFolderSelection.cpp b/src/MfSubFolderSelection.cpp
index bfb5ac0..153f395 100644 (file)
--- a/src/MfSubFolderSelection.cpp
+++ b/src/MfSubFolderSelection.cpp
@@ -213,9 +213,6 @@ SubFolderSelection::OnInitializing(void)
                r = _pExport->Construct(IDA_BTN_EXPORT);\r
                _pExport->SetText(buttonExportHere);\r
 \r
-/*             _pCreateFolder = new (std::nothrow) FooterItem();\r
-               r = _pCreateFolder->Construct(IDA_BTN_CREATE_FOLDER);\r
-               _pCreateFolder->SetText(buttonCreate);*/\r
        }\r
        else\r
        {\r
@@ -224,10 +221,6 @@ SubFolderSelection::OnInitializing(void)
                _pAttach->SetText(buttonAttach);\r
        }\r
 \r
-/*     _pCancel = new (std::nothrow) FooterItem();\r
-       r = _pCancel->Construct(IDA_BTN_CANCEL);\r
-       _pCancel->SetText(buttonCancel);*/\r
-\r
        TryCatch(_pFooter != null, , "Footer is Null");\r
 \r
        if (_pFooter != null)\r
@@ -438,8 +431,6 @@ SubFolderSelection::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& li
                        }\r
                        else\r
                        {\r
-                               //                              _pAudioPlayer->Play();\r
-                               AppLogDebug("music player started");\r
                                LoadMusicPlayer(pDirStr->GetFullFilePath(), PLAYER_STATE_INITIALIZED);\r
                        }\r
                }\r
@@ -449,6 +440,7 @@ SubFolderSelection::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& li
                        _pAudioPlayer->Close();\r
                        _pListView->RefreshList(_previousAudioSelected, LIST_REFRESH_TYPE_ITEM_MODIFY);\r
                        _previousAudioSelected = index;\r
+\r
                        LoadMusicPlayer(pDirStr->GetFullFilePath(), PLAYER_STATE_STOPPED);\r
                }\r
                _currentAudioPlayIndex = index;\r
@@ -844,17 +836,38 @@ SubFolderSelection::SetHeaderTitleText(Tizen::Base::String& filePath)
        String delimiter(L"/");\r
        StringTokenizer tokenizer(filePath, delimiter);\r
 \r
-       while (tokenizer.HasMoreTokens())\r
-       {\r
-               int tokenCount = tokenizer.GetTokenCount();\r
+       AppResource* pAppResource = null;\r
 \r
-               if (tokenCount == 1)\r
+       pAppResource = UiApp::App::GetInstance()->GetAppResource();\r
+\r
+       if (filePath == BasePresentationModel::GetMediaPath())\r
+       {\r
+               if (pAppResource != null)\r
                {\r
-                       tokenizer.GetNextToken(parentFileName);\r
+                       pAppResource->GetString(L"IDS_MF_TAB_PHONE", parentFileName);\r
                }\r
-               else\r
+       }\r
+       else if (filePath == BasePresentationModel::GetSdCardPath())\r
+       {\r
+               if (pAppResource != null)\r
                {\r
-                       tokenizer.GetNextToken(token);\r
+                       pAppResource->GetString(L"IDS_MF_TAB_MEMORY_CARD", parentFileName);\r
+               }\r
+       }\r
+       else\r
+       {\r
+               while (tokenizer.HasMoreTokens())\r
+               {\r
+                       int tokenCount = tokenizer.GetTokenCount();\r
+\r
+                       if (tokenCount == 1)\r
+                       {\r
+                               tokenizer.GetNextToken(parentFileName);\r
+                       }\r
+                       else\r
+                       {\r
+                               tokenizer.GetNextToken(token);\r
+                       }\r
                }\r
        }\r
 \r