Code clean up according to the type of device

Change-Id: I0f9cb7060706bc4b34c46909bc22f183671b3245
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>

diff --git a/inc/CmCameraPresentationModel.h b/inc/CmCameraPresentationModel.h
index 856f5b3..f125142 100644 (file)
--- a/inc/CmCameraPresentationModel.h
+++ b/inc/CmCameraPresentationModel.h
@@ -89,6 +89,7 @@ public:
        static CameraPresentationModel* GetInstance(void);
        result Construct(void);
        void Terminate(int mode);
+       result InitializeFlashMode(void);
        result InitializeCamcorder(void);
        result InitializeCamera(void);
        void ToggleCameraCamcorder(int mode);

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index c2e94ba..382b43f 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -3660,7 +3660,11 @@ CamcorderForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Gr
                && __pCamcorderPresentationModel->GetRecorderState() != RECORDER_STATE_RECORDING
        )
        {
-               OnTouchLaunchImageview();
+               if (source.Equals(*__pThumbnailPanel) == true)
+               {
+                       AppLogDebug("Touch Thumbnail button");
+                       OnTouchLaunchImageview();
+               }
        }
        AppLogDebug("EXIT");
 }

diff --git a/src/CmCameraForm.cpp b/src/CmCameraForm.cpp
index 323d931..003fb0e 100644 (file)
--- a/src/CmCameraForm.cpp
+++ b/src/CmCameraForm.cpp
@@ -2000,7 +2000,11 @@ CameraForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graph
                && __pCameraPresentationModel->GetCameraState()!= CAMERA_STATE_CAPTURED
        )
        {
-               OnTouchLaunchImageview();
+               if (source.Equals(*__pThumbnailPanel) == true)
+               {
+                       AppLogDebug("Touch Thumbnail button");
+                       OnTouchLaunchImageview();
+               }
        }
        AppLogDebug("EXIT");
 }

diff --git a/src/CmCameraPresentationModel.cpp b/src/CmCameraPresentationModel.cpp
index 6d4f686..3658fe8 100644 (file)
--- a/src/CmCameraPresentationModel.cpp
+++ b/src/CmCameraPresentationModel.cpp
@@ -872,13 +872,46 @@ CameraPresentationModel::Terminate(int mode)
 }
 
 result
+CameraPresentationModel::InitializeFlashMode(void)
+{
+       AppLogDebug("ENTER");
+       result r = E_SUCCESS;
+       int flashMode = 0;
+       int selfPortraitEnable = 0;
+
+       if (selfPortraitEnable == CAM_SELF_PORTRAIT_MODE_PRIMARY)
+       {
+               r = GetMediaCapability(CAMERA_PRIMARY_FLASH_MODE);
+       }
+       else
+       {
+               r = GetMediaCapability(CAMERA_SECONDARY_FLASH_MODE);
+       }
+
+       if (r == E_SUCCESS)
+       {
+               r = GetValue(FLASH_MODE, flashMode);
+               TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
+
+               AppLogDebug("flashMode = %d", flashMode);
+               SetFlashMode(CameraFlashMode(flashMode));
+       }
+
+       AppLogDebug("EXIT");
+       return r;
+
+CATCH:
+       AppLogDebug("EXIT - CATCH");
+       return r;
+}
+
+result
 CameraPresentationModel::InitializeCamera(void)
 {
        AppLogDebug("ENTER");
        Dimension* pCaptureResolution = null;
        int selfPortraitEnable = 0;
        int captureResolutionCount = 0;
-       int flashMode = 0;
        result r = E_SUCCESS;
 
        r = GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
@@ -920,24 +953,6 @@ CameraPresentationModel::InitializeCamera(void)
        r = __pCamera->SetCaptureResolution(*pCaptureResolution);
        TryCatch(r == E_SUCCESS, , "Camera::SetCaptureResolution fail[%s]", GetErrorMessage(r));
 
-       if (selfPortraitEnable == CAM_SELF_PORTRAIT_MODE_PRIMARY)
-       {
-               r = GetMediaCapability(CAMERA_PRIMARY_FLASH_MODE);
-       }
-       else
-       {
-               r = GetMediaCapability(CAMERA_SECONDARY_FLASH_MODE);
-       }
-
-       if (r == E_SUCCESS)
-       {
-               r = __pCameraSettingsPresentationModel->GetValue(SECTION_CAMERA, FLASH_MODE, flashMode);
-               TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
-               AppLogDebug("flashMode = %d" , flashMode);
-               SetFlashMode(CameraFlashMode(flashMode));
-       }
-
        AppLogDebug("EXIT");
        return r;
 
@@ -1136,7 +1151,6 @@ CameraPresentationModel::InitializeCamcorder(void)
        AppLogDebug("ENTER");
        int selfPortraitEnable = 0;
        result r = E_SUCCESS;
-       int flashMode = 0;
 
        r = GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
@@ -1174,24 +1188,6 @@ CameraPresentationModel::InitializeCamcorder(void)
        r = SetCamcorderRecordingResolution();
        TryCatch(r == E_SUCCESS, , "SetCamcorderRecordingResolution fail[%s]", GetErrorMessage(r));
 
-       if (selfPortraitEnable == CAM_SELF_PORTRAIT_MODE_PRIMARY)
-       {
-               r = GetMediaCapability(CAMERA_PRIMARY_FLASH_MODE);
-       }
-       else
-       {
-               r = GetMediaCapability(CAMERA_SECONDARY_FLASH_MODE);
-       }
-
-       if (r == E_SUCCESS)
-       {
-               r = __pCameraSettingsPresentationModel->GetValue(SECTION_CAMCORDER, FLASH_MODE, flashMode);
-               TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
-               AppLogDebug("flashMode = %d" , flashMode);
-               SetFlashMode(CameraFlashMode(flashMode));
-       }
-       
        AppLogDebug("EXIT");
        return r;
 
@@ -1402,6 +1398,9 @@ CameraPresentationModel::SetMode(int mode)
                        r = InitializeCamera();
                        TryReturnVoid(r == E_SUCCESS, "InitializeCamera() fail[%s]", GetErrorMessage(r));
 
+                       r = InitializeFlashMode();
+                       AppLogDebug("InitFlashMode fail [%s]", GetErrorMessage(r));
+
                        r = GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                        if (r != E_SUCCESS)
                        {
@@ -1446,6 +1445,9 @@ CameraPresentationModel::SetMode(int mode)
                        r = InitializeCamcorder();
                        TryReturnVoid(r == E_SUCCESS, "InitializeCamcorder() fail[%s]", GetErrorMessage(r));
 
+                       r = InitializeFlashMode();
+                       AppLogDebug("InitFlashMode fail [%s]", GetErrorMessage(r));
+
                        r = GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                        if (r != E_SUCCESS)
                        {
@@ -2682,7 +2684,7 @@ CameraPresentationModel::SetFlashModeOnRecord(bool flashOn)
        result ret = E_SUCCESS;
        int selfPortraitEnable = 0;
        int flashMode = 0;
-       
+
        ret = GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        if (ret != E_SUCCESS)
        {
@@ -2703,11 +2705,11 @@ CameraPresentationModel::SetFlashModeOnRecord(bool flashOn)
                ret = __pCameraSettingsPresentationModel->GetValue(SECTION_CAMCORDER, FLASH_MODE, flashMode);
                TryCatch(ret == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(ret));
 
-               AppLogDebug("flashMode = %d" , flashMode);
+               AppLogDebug("flashMode = %d", flashMode);
 
                if (__pCamera->IsPoweredOn() == true && flashMode == FLASH_TYPE_ON)
                {
-                       AppLogDebug("SetFlashModeOnRecord flashOn = %d" , flashOn);
+                       AppLogDebug("SetFlashModeOnRecord flashOn = %d", flashOn);
 
                        if (flashOn)
                        {
@@ -2715,7 +2717,7 @@ CameraPresentationModel::SetFlashModeOnRecord(bool flashOn)
                                TryCatch(ret == E_SUCCESS, , "SetFlashMode() fail[%s]", GetErrorMessage(ret));
                        }
                        else
-                       {                       
+                       {
                                ret = __pCamera->SetFlashMode(CAMERA_FLASH_MODE_ON); //CAMERA_FLASH_MODE_OFF >>is TAF don't flash on
                                TryCatch(ret == E_SUCCESS, , "SetFlashMode() fail[%s]", GetErrorMessage(ret));
                        }