fix for N_SE-32000 & N_SE-31996: after reject MT call stop button doesn't work

Change-Id: I58a981e6f08730ce80f1a67ca74d64de76f6b755
Signed-off-by: Amit Kumar <a.kumar35@samsung.com>

diff --git a/project/src/Audio/AudioEqualizerForm.cpp b/project/src/Audio/AudioEqualizerForm.cpp
index b74ac66..7ef0db4 100644 (file)
--- a/project/src/Audio/AudioEqualizerForm.cpp
+++ b/project/src/Audio/AudioEqualizerForm.cpp
@@ -320,10 +320,7 @@ AudioEqualizerForm::OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLev
        bool isCharging = false;\r
        Battery::IsCharging(isCharging);\r
        AppLog("Battery Level Obtained is %d and isCharging status is %d", batteryLevel, isCharging);\r
-       if (isCharging)\r
-       {\r
-               return;\r
-       }\r
+       TryReturn(isCharging == true, , "device is not charged!");
        if ((batteryLevel == BATTERY_CRITICAL) || (batteryLevel == BATTERY_EMPTY) || (batteryLevel == BATTERY_LOW))\r
        {\r
                this->OnFormBackRequested(*this);\r
@@ -544,10 +541,7 @@ AudioEqualizerForm::OnAdjustmentValueChanged(const Tizen::Ui::Control& source, i
        __sliderList.IndexOf(pSlider, index);\r
        AppLog("Index - %d", index);\r
        r = __pAudioEqualizer->SetBandLevel(index, adjustment);\r
-       TryCatch(r == E_SUCCESS, , "AudiEqualizer  SetBandLevel() failed!");\r
-\r
-CATCH:\r
-       return;\r
+       TryReturn(r == E_SUCCESS, , "AudiEqualizer  SetBandLevel() failed! %s", GetErrorMessage(GetLastResult()));
 }\r
 \r
 void
@@ -567,7 +561,7 @@ AudioEqualizerForm::SetBandsBeforePlay()
                TryReturn(r == E_SUCCESS, ,"__sliderList.GetAt failed! %s", GetErrorMessage(GetLastResult()));
                value = pSlider->GetValue();
                r = __pAudioEqualizer->SetBandLevel(i, value);
-               TryReturn(r == E_SUCCESS, , "AudiEqualizer  SetBandLevel() failed!");
+               TryReturn(r == E_SUCCESS, , "AudiEqualizer  SetBandLevel() failed! %s", GetErrorMessage(GetLastResult()));
        }
 }
 
@@ -576,13 +570,10 @@ result
 AudioEqualizerForm::GetFileFromConfig(String &filePath)\r
 {\r
        result r = E_SUCCESS;\r
-       if(_pConfig)\r
-       {\r
-               filePath = _pConfig->GetContentPath(L"AudioEqualizer", L"srcfile");\r
-               AppLog("AudioEqualizerForm::GetFileFromConfig source file %ls", filePath.GetPointer());\r
-               return r;\r
-       }\r
-       return E_FAILURE;\r
+       TryReturn(_pConfig != null, E_FAILURE, "_pConfig is null");
+       filePath = _pConfig->GetContentPath(L"AudioEqualizer", L"srcfile");
+       AppLog("AudioEqualizerForm::GetFileFromConfig source file %ls", filePath.GetPointer());
+       return r;
 }\r
 \r
 void\r
@@ -594,7 +585,7 @@ AudioEqualizerForm::StartPlay()
 \r
        //get file to play\r
        r = GetFileFromConfig(filePath);\r
-       TryCatch(r == E_SUCCESS, , "Read Config.ini failed");\r
+       TryReturn(r == E_SUCCESS, , "Read Config.ini failed");
 \r
        //get volume to set for player\r
        if(_pConfig != null)\r
@@ -608,38 +599,41 @@ AudioEqualizerForm::StartPlay()
        {\r
                //player instance\r
                __pPlayer.reset(new (std::nothrow) Player());\r
-               TryCatch(__pPlayer.get() != null, r = E_OUT_OF_MEMORY, "Could not create Player");\r
+               TryReturn(__pPlayer.get() != null, , "Could not create Player %s", GetErrorMessage(GetLastResult()));
 \r
                r = __pPlayer->Construct(*this, 0);\r
-               TryCatch(r == E_SUCCESS, , "player construct failed!");\r
+               TryReturn(r == E_SUCCESS, , "player construct failed! %s", GetErrorMessage(GetLastResult()));
 \r
                if(__pAudioEqualizer.get() == null)\r
                {\r
                        __pAudioEqualizer.reset(new (std::nothrow) AudioEqualizer());\r
-                       TryCatch(__pAudioEqualizer.get() != null, r = E_OUT_OF_MEMORY, "Could not create Audio Equalizer");\r
+                       TryReturn(__pAudioEqualizer.get() != null, , "Could not create Audio Equalizer! %s", GetErrorMessage(GetLastResult()));
                }\r
 \r
                r = __pAudioEqualizer->Construct(*__pPlayer);\r
-               TryCatch(r == E_SUCCESS, , "AudioEqualizer construct failed!");\r
+               TryReturn(r == E_SUCCESS, , "AudioEqualizer construct failed!%s", GetErrorMessage(GetLastResult()));
        }\r
 \r
-       if ((__pPlayer->GetState() == PLAYER_STATE_INITIALIZED) || (__pPlayer->GetState() == PLAYER_STATE_CLOSED))\r
+       if (__pPlayer->GetState() == PLAYER_STATE_INITIALIZED || __pPlayer->GetState() == PLAYER_STATE_CLOSED)
        {\r
                r = __pPlayer->OpenFile(filePath);\r
-               TryCatch(r == E_SUCCESS, , "player OpenFile failed!");\r
+               TryReturn(r == E_SUCCESS, , "player OpenFile failed! %s", GetErrorMessage(GetLastResult()));
        }\r
-       if ((__pPlayer->GetState() == PLAYER_STATE_OPENED) || (__pPlayer->GetState() == PLAYER_STATE_STOPPED))\r
+       if (__pPlayer->GetState() == PLAYER_STATE_OPENED || __pPlayer->GetState() == PLAYER_STATE_STOPPED || __pPlayer->GetState() == PLAYER_STATE_PAUSED)
        {\r
                r = __pPlayer->SetVolume(volume);\r
-               TryCatch(r == E_SUCCESS, , "SetVolume failed!");\r
+               TryReturn(r == E_SUCCESS, , "SetVolume failed! %s", GetErrorMessage(GetLastResult()));
 \r
                __pPlayer->SetLooping(true);\r
-               TryCatch(r == E_SUCCESS, , "SetLooping failed!");\r
+               TryReturn(r == E_SUCCESS, , "SetLooping failed! %s", GetErrorMessage(GetLastResult()));
 \r
                SetBandsBeforePlay();
                r = __pPlayer->Play();\r
-               TryCatch(r == E_SUCCESS, , "Play failed!");\r
-\r
+               if(IsFailed(r))
+               {
+                       ShowMessageBox("Error", "Play failed\n(%s)", GetErrorMessage(r));
+                       return;
+               }
                ShowFooterItem(0, false); //ShowFooterItem(int index, bool show). index = 0 for Play and 1 for Stop button.\r
                ShowFooterItem(1, true);\r
        }\r
@@ -649,8 +643,6 @@ AudioEqualizerForm::StartPlay()
        }\r
        Draw();\r
        Show();\r
-CATCH:\r
-               return;\r
 }\r
 \r
 void\r
@@ -661,17 +653,14 @@ AudioEqualizerForm::StopPlay()
        {\r
                r = __pPlayer->Stop();\r
                __pCheckButtons[4]->Show();\r
-               TryCatch(r == E_SUCCESS, , "player Stop failed!");\r
+               TryReturn(r == E_SUCCESS, , "player Stop failed!");
 \r
                r = __pPlayer->Close();\r
-               TryCatch(r == E_SUCCESS, , "player Close failed!");\r
-\r
-               ShowFooterItem(0, true); //ShowFooterItem(int index, bool show). index = 0 for Play and 1 for Stop button.\r
-               ShowFooterItem(1, false);\r
+               TryReturn(r == E_SUCCESS, , "player Close failed!");
        }\r
-\r
-CATCH:\r
-       return;\r
+       AppLog("PlayerState: %d", __pPlayer->GetState());
+       ShowFooterItem(0, true); //ShowFooterItem(int index, bool show). index = 0 for Play and 1 for Stop button.
+       ShowFooterItem(1, false);
 }\r
 \r
 void\r