From: Amit Kumar <a.kumar35@samsung.com>
Date: Thu, 9 May 2013 06:37:13 +0000 (+0530)
Subject: changes array size & used snprintf instead of sprintf
X-Git-Tag: 2.2_release~65
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afe9d82b91eae0cb6eb5d5fbbcff5be609d428fd;p=samples%2Fnative%2FMediaApp.git

changes array size & used snprintf instead of sprintf

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

diff --git a/project/src/Audio/TonePlayerForm.cpp b/project/src/Audio/TonePlayerForm.cpp
index 10664da..2464392 100644
--- a/project/src/Audio/TonePlayerForm.cpp
+++ b/project/src/Audio/TonePlayerForm.cpp
@@ -45,8 +45,6 @@ const static int VOLUME_STEP = 10;
 
 static TonePlayerForm* _pTonePlayerForm = null;
 
-bool TonePlayerForm::__isToneEndLater = false;
-
 TonePlayerForm*
 TonePlayerForm::CreateFormN(const Tizen::Ui::Scenes::SceneId &sceneId)
 {
@@ -124,14 +122,7 @@ void
 TonePlayerForm::OnTonePlayerEndOfTone(Tizen::Media::TonePlayer& src)
 {
 	result r = E_SUCCESS;
-	if(__isToneEndLater == true)
-	{
-		EnableButton(__pButtonPlay);
-		DisableButton(__pButtonPause);
-		EnableButton(__pButtonStop);
-		__isToneEndLater = false;
-		return;
-	}
+	AppLog("Enter");
 	if (__pTonePlayerSeq == &src && __pTonePlayerSeq->GetState() == TONE_PLAYER_STATE_END_OF_TONE)
 	{
 		r = __pTonePlayerSeq->Close();
@@ -140,7 +131,7 @@ TonePlayerForm::OnTonePlayerEndOfTone(Tizen::Media::TonePlayer& src)
 			AppLog("Failed with %s", GetErrorMessage(r));
 			return;
 		}
-		r = PlaySequenceTones();
+		r = PlaySequenceTones(true);
 		if (IsFailed(r))
 		{
 			AppLog("Failed with %s", GetErrorMessage(r));
@@ -584,7 +575,9 @@ TonePlayerForm::PlayDTMF(Tizen::Media::DtmfPreset preset, long duration)
 		r = __pTonePlayerDTMF->Play();
 		if (IsFailed(r))
 		{
-			ShowMessageBox("Error", "Play failed\n(%s)", GetErrorMessage(r));
+			char pMessage[100];
+			snprintf(pMessage, 100, " Play Failed \n (%s)", GetErrorMessage(r));
+			ShowMessagePopup(pMessage, ID_POPUP_CLEAR);
 			return;
 		}
 	}
@@ -602,7 +595,7 @@ TonePlayerForm::PlayDTMF(Tizen::Media::DtmfPreset preset, long duration)
 
 //Play tones in a Sequence
 result
-TonePlayerForm::PlaySequenceTones()
+TonePlayerForm::PlaySequenceTones(bool isCalledByEndOfTone)
 {
 	result r = E_SUCCESS;
 
@@ -641,10 +634,12 @@ TonePlayerForm::PlaySequenceTones()
 		r = __pTonePlayerSeq->Play();
 		if (IsFailed(r))
 		{
-			String errorSt("Error\n: Play Failed \n");
-			char pMessage[1000];
-			sprintf(pMessage, "Error\n: Play Failed \n (%s)", GetErrorMessage(r));
-			ShowMessagePopup(pMessage, ID_POPUP_CLEAR);
+			if(isCalledByEndOfTone != true)
+			{
+				char pMessage[100];
+				snprintf(pMessage, 100, " Play Failed \n (%s)", GetErrorMessage(r));
+				ShowMessagePopup(pMessage, ID_POPUP_CLEAR);
+			}
 			return r;
 		}
 	}
@@ -1102,12 +1097,10 @@ TonePlayerForm::OnTonePlayerAudioFocusChanged(Tizen::Media::TonePlayer& src)
 		}
 		if(__pTonePlayerSeq->GetState() == TONE_PLAYER_STATE_PAUSED)
 		{
-			__isToneEndLater = true;
 			AppLog("TonePlayer ::OnTonePlayerAudioFocusChanged Paused");
 			EnableButton(__pButtonPlay);
 			DisableButton(__pButtonPause);
 			EnableButton(__pButtonStop);
-			__isToneEndLater = false;
 		}
 	}
 
diff --git a/project/src/Audio/TonePlayerForm.h b/project/src/Audio/TonePlayerForm.h
index 9571651..054ca76 100644
--- a/project/src/Audio/TonePlayerForm.h
+++ b/project/src/Audio/TonePlayerForm.h
@@ -105,7 +105,7 @@ public:
 
 private:
 	void PlayDTMF(Tizen::Media::DtmfPreset preset, long duration);
-	result PlaySequenceTones(void);
+	result PlaySequenceTones(bool isCalledByEndOfTone = false);
 	void DisableButton(Tizen::Ui::Controls::Button* pButton);
 	void EnableButton(Tizen::Ui::Controls::Button* pButton);
 	result SetHeaderText(const Tizen::Base::String& title);
@@ -158,9 +158,6 @@ private:
 	bool __isTimerRunning;
 	bool __isButtonInPressedState;
 	int __tonePlayerVolume;
-
-public:
-	static bool __isToneEndLater;
 };
 
 #endif  //_TONE_PLAYER_FORM_H_