1.NABI issue 42524 2.Code Refactoring

Change-Id: I072c0119fa0d6f7800487bcc9318bcd859862b0c

diff --git a/inc/CmCameraPresentationModel.h b/inc/CmCameraPresentationModel.h
index 263e31b..e98b41f 100644 (file)
--- a/inc/CmCameraPresentationModel.h
+++ b/inc/CmCameraPresentationModel.h
@@ -255,7 +255,7 @@ private:
        Tizen::Content::VideoContentInfo* __pVideoContentInfo;
        CameraSettingsPresentationModel* __pCameraSettingsPresentationModel;
        Tizen::Graphics::Bitmap* __pBitmap;
-       Tizen::Base::String __lastestContentName;
+       Tizen::Base::String __latestContentName;
        Tizen::Base::String __errorResult;
        Tizen::Base::String __CurrentVideoFileName;
        int __appControlRequestType;

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index fc5e56a..4a952bf 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -1102,6 +1102,7 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        case IDA_BUTTON_CAMCORDER_SHUTTER:
        {
+               MakeSettingPopupTab(false);
                if (_isRecording == false)
                {
                        if (_pCameraPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW

diff --git a/src/CmCameraForm.cpp b/src/CmCameraForm.cpp
index 190d00f..6520f3d 100644 (file)
--- a/src/CmCameraForm.cpp
+++ b/src/CmCameraForm.cpp
@@ -3782,6 +3782,7 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
        case IDA_BUTTON_CAMERA_SHUTTER:
        {               
+               MakeSettingPopupTab(false);
                if (_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW)
                {
                        DoCapture();

diff --git a/src/CmCameraPresentationModel.cpp b/src/CmCameraPresentationModel.cpp
index 78944de..99849a4 100644 (file)
--- a/src/CmCameraPresentationModel.cpp
+++ b/src/CmCameraPresentationModel.cpp
@@ -392,7 +392,7 @@ CameraPresentationModel::CameraPresentationModel(void)
        , __pVideoContentInfo(null)
        , __pCameraSettingsPresentationModel(null)
        , __pBitmap(null)
-       , __lastestContentName(L"")
+       , __latestContentName(L"")
        , __errorResult(L"")
        , __appControlRequestType(APP_CONTROL_REQUEST_TYPE_CANCELED)
        , __dir(ORIENTATION_STATUS_NONE)
@@ -1879,7 +1879,7 @@ CameraPresentationModel::GetLatestContentName(int currentCameraMode, Tizen::Base
        DateTime temporaryEntryDateTime = DateTime::GetMinValue();
        int storageType = STORAGE_TYPE_PHONE;
 
-       AppLogDebug("__lastestContentName content name is %ls",__lastestContentName.GetPointer());
+       AppLogDebug("__lastestContentName content name is %ls",__latestContentName.GetPointer());
 
        r = GetValue(STORAGE_TYPE, storageType);
        TryCatch(r == E_SUCCESS, , "Err catch [%s]", GetErrorMessage(r));
@@ -2473,8 +2473,8 @@ CameraPresentationModel::StartRecord(void)
        r = CreateFileName(*pFullFileName);
        TryCatch(r == E_SUCCESS, , "pFullFileName is null");
 
-       __lastestContentName.Clear();
-       r = __lastestContentName.Append(pFullFileName->GetPointer());
+       __latestContentName.Clear();
+       r = __latestContentName.Append(pFullFileName->GetPointer());
        TryCatch(r == E_SUCCESS, , "String::Append() fail[%s]", GetErrorMessage(r));
 
        AppLogDebug("Record pFullFileName = %ls", pFullFileName->GetPointer());
@@ -2501,8 +2501,8 @@ CameraPresentationModel::StartRecord(void)
        r = __pVideoRecorder->SetRecordingRotation(rotate);
        TryCatch(r == E_SUCCESS, , "VideoRecorder::SetRecordingRotation() fail[%s]", GetErrorMessage(r));
 
-       AppLogDebug("latest file name is %ls",__lastestContentName.GetPointer());
-       r = __pVideoRecorder->CreateVideoFile(__lastestContentName, true);
+       AppLogDebug("latest file name is %ls",__latestContentName.GetPointer());
+       r = __pVideoRecorder->CreateVideoFile(__latestContentName, true);
        AppLogDebug("create video file result is %s",GetErrorMessage(r));
        TryCatch(r == E_SUCCESS, , "VideoRecorder::CreateVideoFile() fail[%s]", GetErrorMessage(r));
 
@@ -3482,8 +3482,8 @@ CameraPresentationModel::OnCameraCaptured(Tizen::Base::ByteBuffer& capturedData,
                                ret = CreateFileName(*pFullFileName);
                                TryCatch(ret == E_SUCCESS, , "pFullFileName is null");
 
-                               __lastestContentName.Clear();
-                               ret = __lastestContentName.Append(pFullFileName->GetPointer());
+                               __latestContentName.Clear();
+                               ret = __latestContentName.Append(pFullFileName->GetPointer());
                                TryCatch(ret == E_SUCCESS, , "String::Append() fail[%s]", GetErrorMessage(ret));
 
                                AppLogDebug("OnCameraCaptured pFullFileName = %ls", pFullFileName->GetPointer());
@@ -3720,9 +3720,9 @@ CameraPresentationModel::OnVideoRecorderClosed(result r)
                ret = pContentManager->Construct();
                TryCatch(ret == E_SUCCESS, , "ContentManager->Construct() failed(%s)", GetErrorMessage(r));
 
-               AppLogDebug("latest content name is %ls",__lastestContentName.GetPointer());
-               r = ContentManager::ScanFile(__lastestContentName);
-               __CurrentVideoFileName = __lastestContentName;
+               AppLogDebug("latest content name is %ls",__latestContentName.GetPointer());
+               r = ContentManager::ScanFile(__latestContentName);
+               __CurrentVideoFileName = __latestContentName;
 
                if (storageType == STORAGE_TYPE_PHONE)
                {
@@ -3811,7 +3811,7 @@ CameraPresentationModel::OnVideoRecorderEndReached(RecordingEndCondition endCond
        ret = pContentManager->Construct();
        TryCatch(ret == E_SUCCESS, , "ContentManager->Construct() failed(%s)", GetErrorMessage(ret));
 
-       contentId = pContentManager->CreateContent(camcorderTemporaryFilePath, __lastestContentName, true);
+       contentId = pContentManager->CreateContent(camcorderTemporaryFilePath, __latestContentName, true);
        TryCatch(Tizen::Base::UuId::GetInvalidUuId() != contentId, GetLastResult(), "CreateContent failed.");
 
        videoContentInfo = static_cast<VideoContentInfo*>(pContentManager->GetContentInfoN(contentId));
@@ -4148,7 +4148,7 @@ CameraPresentationModel::RemoveVideoFile(void)
                storageType = STORAGE_TYPE_PHONE;
        }
 
-       removeFileName = __lastestContentName;
+       removeFileName = __latestContentName;
 
        AppLogDebug("removeFileName is %ls",removeFileName.GetPointer());
        AppLogDebug("RemoveVideoFile::GetRecorderState() = %d", __pVideoRecorder->GetState());
@@ -4229,8 +4229,8 @@ CameraPresentationModel::SetStartPreviewException(bool status)
 void
 CameraPresentationModel::UpdateContentFile(void)
 {
-       AppLogDebug("latest content name is %ls",__lastestContentName.GetPointer());
-       ContentManager::ScanFile(__lastestContentName);
+       AppLogDebug("latest content name is %ls",__latestContentName.GetPointer());
+       ContentManager::ScanFile(__latestContentName);
        SetAppControlRequestType(APP_CONTROL_REQUEST_TYPE_SUCCEEDED);
 }
 
@@ -4249,5 +4249,5 @@ CameraPresentationModel::GetRecorderErrorStatus(void)
 void
 CameraPresentationModel::GetUpdatedContentName(Tizen::Base::String& latestContentName)
 {
-       latestContentName = __lastestContentName;
+       latestContentName = __latestContentName;
 }