[Tizen-submit] 3359: Changes to Tizen:2.1:Main/apps.Camera

noreply at tizen.org noreply at tizen.org
Fri Apr 26 14:12:00 GMT 2013


Hi,
Jinkun Jang have made the following changes to apps.Camera in project Tizen:2.1:Main. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #3359

  submit:       Tizen:2.1:Main:build/apps.Camera(cleanup) -> Tizen:2.1:Main


Message:
Submitter: Jinkun Jang <jinkun.jang at samsung.com>
Comments: upload latest
Git project: apps/osp/Camera
Tag: submit/tizen_2.1/20130426.141153
Commit: afdda7f Fix N_SE-36311 issue

State:   new        2013-04-26T06:42:38 tizenrobot
Comment: <no comment>
spec files:
-----------
--- apps.Camera.spec
+++ apps.Camera.spec
@@ -2,7 +2,7 @@
 Summary:    Camera application
 Version:    1.0.0
 Release:    1
-VCS:        apps/osp/Camera#2.1_release-0-g5bcb1fb
+VCS:        apps/osp/Camera#submit/tizen_2.1/20130426.141153-0-gafdda7f
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN
 Source0:    %{name}-%{version}.tar.gz

other changes:
--------------

++++++ apps.Camera-1.0.0.tar.gz
--- /src/CmCamcorderForm.cpp
+++ /src/CmCamcorderForm.cpp
@@ -2210,28 +2210,23 @@
 	case CAMERA_ACTION_EVENT_VIDEO_RECORDER_ERROR_OCCURRED:
 		{
 			AppLogDebug("VIDEO_RECORDER_ERROR_OCCURRED_LISTENER.");
-			int requestType = 0;
 			result r = E_SUCCESS;	
+			BufferInfo bufferinfo;
 
-			HideUiPanel(false);
-
-			__pCamcorderPresentationModel->SetOnVideoRecorderStopped(false);
-
-			requestType = __pCamcorderPresentationModel->GetAppControlRequestType();
+			AppLogDebug("Camera State = %d ", __pCamcorderPresentationModel->GetCameraState());
 
-			if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED)
+			if (__pBatteryState != null)
 			{
-				AppLogDebug("RECORDER_ERROR_OCCURRED after TerminateApp");
+				__pBatteryState->SetShowState(true);
+				__pBatteryState->Draw();
+				__pBatteryState->Show();
+			}
 
-				__pCamcorderPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
+			r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
+			TryReturnVoid(r == E_SUCCESS, "__pOverlayPanel->GetBackgroundBufferInfo() fail(%s)", GetErrorMessage(r));
 
-				r = TerminateApp();
-				AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
-			}
-			else
-			{
-				SetRecordErrorOccurred();
-			}
+			__pCamcorderPresentationModel->StartPreview(&bufferinfo);
+			__pCamcorderPresentationModel->SetContinuousAutoFocus();
 		}
 		break;
 
@@ -8410,64 +8405,28 @@
 			case ORIENTATION_STATUS_PORTRAIT:
 				{
 					AppLogDebug("PORTRAIT");
-					if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
-					{
-						AppLogDebug("PRIMARY");
-						__pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_90);
-					}
-					else
-					{
-						AppLogDebug("SECONDARY");
-						__pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_180);
-					}
+					__pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_90);
 				}
 				break;
 
 			case ORIENTATION_STATUS_PORTRAIT_REVERSE:
 				{
 					AppLogDebug("PORTRAIT REVERSE");
-					if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
-					{
-						AppLogDebug("PRIMARY");
-						__pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_270);
-					}

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list