From 1f54cc5bf924da8dca803a8f94841a7fd0d179b1 Mon Sep 17 00:00:00 2001 From: rahul varna Date: Wed, 17 Apr 2013 14:58:37 +0900 Subject: [PATCH] Checking the battery level before sending OnDeviceStateChanged:N_SE-34793 Signed-off-by: rahul varna --- project/src/MediaApp.cpp | 15 +++++++-------- project/src/Player/CameraPlayerForm.cpp | 3 +-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/project/src/MediaApp.cpp b/project/src/MediaApp.cpp index 73c1f0b..9b41175 100644 --- a/project/src/MediaApp.cpp +++ b/project/src/MediaApp.cpp @@ -80,15 +80,14 @@ MediaApp::IsBatteryLevelLow(void) void MediaApp::OnDeviceStateChanged(DeviceType deviceType, const Tizen::Base::String &state) { - if(deviceType == DEVICE_TYPE_CHARGER || - deviceType == DEVICE_TYPE_WIRED_HEADSET || - deviceType == DEVICE_TYPE_WIRED_HEADPHONE) - { - AppLog("OnDeviceStateChanged"); - bool batteryLow = false; - batteryLow = IsBatteryLevelLow(); - TryReturnVoid(batteryLow == false, "Battery Low"); + AppLog("OnDeviceStateChanged"); + bool batteryLow = false; + batteryLow = IsBatteryLevelLow(); + if ((batteryLow == true && deviceType == DEVICE_TYPE_CHARGER) || + (batteryLow == false && deviceType == DEVICE_TYPE_WIRED_HEADSET) || + (batteryLow == false && deviceType == DEVICE_TYPE_WIRED_HEADPHONE)) + { MultiForm* pForm = (MultiForm*)(SceneManager::GetInstance()->GetCurrentScene()->GetForm()); if (pForm != null) { diff --git a/project/src/Player/CameraPlayerForm.cpp b/project/src/Player/CameraPlayerForm.cpp index 0f17359..8fac6c4 100644 --- a/project/src/Player/CameraPlayerForm.cpp +++ b/project/src/Player/CameraPlayerForm.cpp @@ -877,11 +877,10 @@ CameraPlayerForm::OnPlayerSeekCompleted(result r) void CameraPlayerForm::OnPlayerAudioFocusChanged(void) { - AppLog("[rr]OnPlayerAudioFocusChanged"); + AppLog("OnPlayerAudioFocusChanged"); TryReturnVoid(__pPlayer != null, "Player handle is null"); if ( __isHeadSetRemoved == true && (__pPlayer->GetState() == PLAYER_STATE_PAUSED)) { - AppLog("[rr]__isHeadSetRemoved is true"); result r = E_SUCCESS; r = __pPlayer->Play(); TryReturnVoid(r == E_SUCCESS, "[%s] Player Play has failed", GetErrorMessage(r)); -- 2.7.4