NABI issue 39011

Change-Id: I523973c36ba55a2e1d9bfef0238c1c4bb2aca503

diff --git a/inc/CmCameraPresentationModel.h b/inc/CmCameraPresentationModel.h
index c38d4d6..d54f5bc 100644 (file)
--- a/inc/CmCameraPresentationModel.h
+++ b/inc/CmCameraPresentationModel.h
@@ -216,6 +216,7 @@ public:
        virtual void OnDeviceStateChanged(Tizen::System::DeviceType deviceType, const Tizen::Base::String& state);
        virtual void OnContentScanCompleted (RequestId reqId, const Tizen::Base::String &scanPath, result r);
 
+       void UpdateContentFile(void);
 
 private:
        CameraPresentationModel(void);

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index 5c6d231..291c203 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -2586,35 +2586,11 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                                || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSED
                                        )
                                        {
-                                               AppLogDebug("RECORDING");
+                                               AppLogDebug("StopRecord::GetRecorderState() = %d", __pCamcorderPresentationModel->GetRecorderState());
 
-                                               DrawThumbnail();
-
-                                               if (__setTimerInterval == false)
-                                               {
-                                                       InitElapsedTimeLable();
-                                                       __pCamcorderPresentationModel->StopRecord();
-                                               }
-                                               __pCameraInfoPanel->SetDrawPopupTimerUpdate(false);
-                                               __pCameraInfoPanel->SetDrawPopupTimerCount(0);
-                                               __pCameraInfoPanel->Invalidate(true);
-
-                                               if (__pCameraInfoPanel->GetDrawPopupTimer() == true)
-                                               {
-                                                       __pCameraInfoPanel->SetDrawPopupTimer(false);
-                                                       __pCameraInfoPanel->Invalidate(true);
-                                               }
-
-                                               __isRecording = false;
-                                               __setTimerInterval = false;
-                                               __pCamcorderPresentationModel->SetIntervalTimerRun(false);
-
-                                               __isRecordingPause = false;
-
-                                               r = SetRecordButton(false);
-                                               AppLogDebug("SetRecordButton() fail[%s]", GetErrorMessage(r));
-
-                                               __timeCount = 0;
+                                               __pCamcorderPresentationModel->StopRecord();
+                                               __pCamcorderPresentationModel->UpdateContentFile();
+                                               r = TerminateApp();
                                        }
                                        else
                                        {

diff --git a/src/CmCameraPresentationModel.cpp b/src/CmCameraPresentationModel.cpp
index 1590368..755a6f9 100644 (file)
--- a/src/CmCameraPresentationModel.cpp
+++ b/src/CmCameraPresentationModel.cpp
@@ -4124,3 +4124,10 @@ CameraPresentationModel::SetStartPreviewException(bool status)
        __startPreviewException = status;
 }
 
+void
+CameraPresentationModel::UpdateContentFile(void)
+{
+       AppLogDebug("Ravi: latest content name is %ls",__lastestContentName.GetPointer());
+       ContentManager::ScanFile(__lastestContentName);
+       SetAppControlRequestType(APP_CONTROL_REQUEST_TYPE_SUCCEEDED);
+}