NABI issue 38901

Change-Id: I0def355f96a306c0f2aa403d98554c117f812830

diff --git a/inc/CmTypes.h b/inc/CmTypes.h
index 4fce038..7bd9e4f 100644 (file)
--- a/inc/CmTypes.h
+++ b/inc/CmTypes.h
@@ -163,7 +163,8 @@ extern const wchar_t* APPCONTROL_DATA_CAMERA;
 extern const wchar_t* APPCONTROL_DATA_CAMCORDER;
 
 extern const wchar_t* CURRENT_MODE;
-extern const wchar_t* FLASH_MODE;
+extern const wchar_t* FLASH_MODE_PRIMARY;
+extern const wchar_t* FLASH_MODE_SECONDARY;
 extern const wchar_t* SELF_PORTRAIT_ENABLE;
 extern const wchar_t* SHOOTING_MODE;
 extern const wchar_t* EXPOSURE_VALUE;

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index 471a673..b75bf7e 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -2913,7 +2913,7 @@ CamcorderForm::UpdateUiPanelIcon(void)
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
        {
-               r = __pCamcorderPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
+               r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
                TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
 
                pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
@@ -2950,7 +2950,7 @@ CamcorderForm::UpdateUiPanelIcon(void)
 
                if (value == true && r == E_SUCCESS)
                {
-                       r = __pCamcorderPresentationModel->GetValue(FLASH_MODE, flashMode);
+                       r = __pCamcorderPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
                        TryCatch(r == E_SUCCESS, , "Read Reg Fail[%s]", GetErrorMessage(r));
 
                        switch (flashMode)
@@ -3057,7 +3057,7 @@ CamcorderForm::UpdateUiPanelIcon(void)
                }
                else
                {
-                       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
+                       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
                        TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
@@ -6417,7 +6417,7 @@ CamcorderForm::ProcessFlashListPopup(int index)
                }
        }
 
-       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE, regVal);
+       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_PRIMARY, regVal);
        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
 
        TryCatch(__pSettingPanel != null, r = E_SYSTEM, "__pSettingPanel is null");
@@ -7538,7 +7538,7 @@ CamcorderForm::SetSelfModeButton(void)
                {
                        AppLogDebug("PRIMARY -> SECONDARY");
 
-                       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
+                       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
                        TryReturnVoid(r == E_SUCCESS, "Reg setValue fail[%s]", GetErrorMessage(r));
 
                        r = __pCamcorderPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY);
@@ -7561,7 +7561,7 @@ CamcorderForm::SetSelfModeButton(void)
 
                        if (value == true && r == E_SUCCESS)
                        {
-                               r = __pCamcorderPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_ON);
+                               r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_ON);
                                TryReturnVoid(r == E_SUCCESS, "Reg setValue fail[%s]", GetErrorMessage(r));
                        }
                        else
@@ -10895,7 +10895,7 @@ CamcorderForm::SendCameraToBackground(void)
        {
                __pCamcorderPresentationModel->StopRecord();
 
-               r = __pCamcorderPresentationModel->GetValue(FLASH_MODE, flashMode);
+               r = __pCamcorderPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
                TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
 
                if (flashMode == FLASH_MODE_ON)
@@ -12816,12 +12816,12 @@ CamcorderForm::CreateFlashMainMenuItem(int index, int itemWidth)
        {
                AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is not support");
 
-               r = __pCamcorderPresentationModel->GetValue(FLASH_MODE, flashMode);
+               r = __pCamcorderPresentationModel->GetValue(FLASH_MODE_SECONDARY, flashMode);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                if (flashMode != FLASH_MODE_OFF)
                {
-                       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
+                       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
                        TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
                }
        }
@@ -12837,18 +12837,18 @@ CamcorderForm::CreateFlashMainMenuItem(int index, int itemWidth)
                {
                        AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is not support");
 
-                       r = __pCamcorderPresentationModel->GetValue(FLASH_MODE, flashMode);
+                       r = __pCamcorderPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (flashMode != FLASH_MODE_OFF)
                        {
-                               r = __pCamcorderPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
+                               r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
                                TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
                        }
                }
        }
 
-       r = __pCamcorderPresentationModel->GetValue(FLASH_MODE, regVal);
+       r = __pCamcorderPresentationModel->GetValue(FLASH_MODE_PRIMARY, regVal);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        switch (index)

diff --git a/src/CmCameraForm.cpp b/src/CmCameraForm.cpp
index 3d72183..95bd152 100644 (file)
--- a/src/CmCameraForm.cpp
+++ b/src/CmCameraForm.cpp
@@ -2877,7 +2877,7 @@ CameraForm::UpdateUiPanelIcon(void)
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
        {
-               r = __pCameraPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
+               r = __pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
                TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
 
                pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
@@ -2914,7 +2914,7 @@ CameraForm::UpdateUiPanelIcon(void)
 
                if (value == true && r == E_SUCCESS)
                {
-                       r = __pCameraPresentationModel->GetValue(FLASH_MODE, flashMode);
+                       r = __pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
                        TryCatch(r == E_SUCCESS, , "Read Reg Fail[%s]", GetErrorMessage(r));
 
                        switch (flashMode)
@@ -3021,7 +3021,7 @@ CameraForm::UpdateUiPanelIcon(void)
                }
                else
                {
-                       r = __pCameraPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
+                       r = __pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
                        TryCatch(r == E_SUCCESS, , "Read Reg Fail[%s]", GetErrorMessage(r));
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
@@ -3741,19 +3741,20 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                                __isToggleCameraDirection = true;
 
+                               r = ToggleCameraDirection(CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY);
+                               TryReturnVoid(r == E_SUCCESS, "ToggleCameraDirection() fail[%s]", GetErrorMessage(r));
                                r = __pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY);
                                TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
-                               r = __pCameraPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
+                               r = __pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
                                TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
-                               r = ToggleCameraDirection(CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY);
-                               TryReturnVoid(r == E_SUCCESS, "ToggleCameraDirection() fail[%s]", GetErrorMessage(r));
+
                        }
                        else if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
                        {
                                AppLogDebug("SECONDARY -> PRIMARY");
-
+                               int primaryFlashValue = FLASH_MODE_OFF;
                                __isToggleCameraDirection = true;
 
                                r = ToggleCameraDirection(CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
@@ -3763,10 +3764,11 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
                                r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+                               __pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, primaryFlashValue);
 
                                if (value == true && r == E_SUCCESS)
                                {
-                                       r = __pCameraPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_ON);
+                                       r = __pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, primaryFlashValue);
                                        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
                                }
                        }
@@ -3796,6 +3798,8 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
                        TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
 
+                       UpdateUiPanelIcon();
+               
                        ShowUiQuickMenu();
                }
                break;
@@ -6253,9 +6257,10 @@ CameraForm::ProcessFlashListPopup(int index)
                        resIdPress = RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS;
                        cameraFlashMode = CAMERA_FLASH_MODE_OFF;
                }
-       }
-
-       __pCameraPresentationModel->SetValue(FLASH_MODE, regVal);
+       }       
+       
+               __pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, regVal);
+       
 
        TryCatch(__pSettingPanel != null, r = E_SYSTEM, "__pSettingPanel is null");
 
@@ -12702,12 +12707,12 @@ CameraForm::CreateFlashMainMenuItem(int index, int itemWidth)
        {
                AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is not support");
 
-               r = __pCameraPresentationModel->GetValue(FLASH_MODE, flashMode);
+               r = __pCameraPresentationModel->GetValue(FLASH_MODE_SECONDARY, flashMode);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                if (flashMode != FLASH_MODE_OFF)
                {
-                       r = __pCameraPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
+                       r = __pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
                        TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
                }
        }
@@ -12723,18 +12728,18 @@ CameraForm::CreateFlashMainMenuItem(int index, int itemWidth)
                {
                        AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is not support");
 
-                       r = __pCameraPresentationModel->GetValue(FLASH_MODE, flashMode);
+                       r = __pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (flashMode != FLASH_MODE_OFF)
                        {
-                               r = __pCameraPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
+                               r = __pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
                                TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
                        }
                }
        }
 
-       r = __pCameraPresentationModel->GetValue(FLASH_MODE, regVal);
+       r = __pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, regVal);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        switch (index)

diff --git a/src/CmCameraInfoPanel.cpp b/src/CmCameraInfoPanel.cpp
index 5c86444..a3e48e2 100644 (file)
--- a/src/CmCameraInfoPanel.cpp
+++ b/src/CmCameraInfoPanel.cpp
@@ -1786,7 +1786,7 @@ CameraInfoPanel::UpdateFlashIcon(Tizen::Graphics::Canvas* pCanvas)
 
                if (value == true && r == E_SUCCESS)
                {
-                       r = CameraPresentationModel::GetInstance()->GetValue(FLASH_MODE, flashType);
+                       r = CameraPresentationModel::GetInstance()->GetValue(FLASH_MODE_PRIMARY, flashType);
 
                        if (r != E_SUCCESS)
                        {

diff --git a/src/CmCameraPresentationModel.cpp b/src/CmCameraPresentationModel.cpp
index bd6eaa7..1cf70d7 100644 (file)
--- a/src/CmCameraPresentationModel.cpp
+++ b/src/CmCameraPresentationModel.cpp
@@ -895,7 +895,14 @@ CameraPresentationModel::InitializeFlashMode(void)
 
        if (r == E_SUCCESS)
        {
-               r = GetValue(FLASH_MODE, flashMode);
+               if (selfPortraitEnable == CAM_SELF_PORTRAIT_MODE_PRIMARY)
+               {
+                       r = GetValue(FLASH_MODE_PRIMARY, flashMode);
+               }
+               else
+               {
+                       r = GetValue(FLASH_MODE_SECONDARY, flashMode);
+               }
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                AppLogDebug("flashMode = %d", flashMode);
@@ -2772,7 +2779,14 @@ CameraPresentationModel::SetFlashModeOnRecord(bool flashOn)
 
        if (ret == E_SUCCESS)
        {
-               ret = __pCameraSettingsPresentationModel->GetValue(SECTION_CAMCORDER, FLASH_MODE, flashMode);
+               if (selfPortraitEnable == CAM_SELF_PORTRAIT_MODE_PRIMARY)
+               {
+                       ret = __pCameraSettingsPresentationModel->GetValue(SECTION_CAMCORDER, FLASH_MODE_PRIMARY, flashMode);
+               }
+               else
+               {
+                       ret = __pCameraSettingsPresentationModel->GetValue(SECTION_CAMCORDER, FLASH_MODE_SECONDARY, flashMode);
+               }
                TryCatch(ret == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(ret));
 
                AppLogDebug("flashMode = %d", flashMode);
@@ -3186,7 +3200,7 @@ CameraPresentationModel::SetValue(const Tizen::Base::String& entryName, const in
 
        r = __pCameraSettingsPresentationModel->SetValue(strSectionName, entryName, value);
 
-       if (entryName.CompareTo(L"FLASH_MODE") == 0)
+       if ( entryName.CompareTo(L"PRIMARY_FLASH_MODE") == 0)
        {
                AppLogDebug("flash mode is set to value %d",value);
                SetFlashMode(CameraFlashMode(value));

diff --git a/src/CmCameraSettingsPresentationModel.cpp b/src/CmCameraSettingsPresentationModel.cpp
index 86135b9..abc7dbc 100644 (file)
--- a/src/CmCameraSettingsPresentationModel.cpp
+++ b/src/CmCameraSettingsPresentationModel.cpp
@@ -210,7 +210,10 @@ CameraSettingsPresentationModel::CreateDefaultRegistry(void)
                r = __pDefaultCameraRegistry->AddValue(SECTION_CAMERA, CURRENT_MODE, DEFAULT_VALUE_ZERO);
                TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
 
-               r = __pDefaultCameraRegistry->AddValue(SECTION_CAMERA, FLASH_MODE, DEFAULT_VALUE_ONE);
+               r = __pDefaultCameraRegistry->AddValue(SECTION_CAMERA, FLASH_MODE_PRIMARY, DEFAULT_VALUE_ONE);
+               TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
+
+               r = __pDefaultCameraRegistry->AddValue(SECTION_CAMERA, FLASH_MODE_SECONDARY, DEFAULT_VALUE_ZERO);
                TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
 
                r = __pDefaultCameraRegistry->AddValue(SECTION_CAMERA, SELF_PORTRAIT_ENABLE, DEFAULT_VALUE_ZERO);
@@ -261,7 +264,10 @@ CameraSettingsPresentationModel::CreateDefaultRegistry(void)
                r = __pDefaultCameraRegistry->AddSection(SECTION_CAMCORDER);
                TryCatch(r == E_SUCCESS, , "Registry::AddSection() failed[%s]", GetErrorMessage(r));
 
-               r = __pDefaultCameraRegistry->AddValue(SECTION_CAMCORDER, FLASH_MODE, DEFAULT_VALUE_ONE);
+               r = __pDefaultCameraRegistry->AddValue(SECTION_CAMCORDER, FLASH_MODE_PRIMARY, DEFAULT_VALUE_ONE);
+               TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
+
+               r = __pDefaultCameraRegistry->AddValue(SECTION_CAMCORDER, FLASH_MODE_SECONDARY, DEFAULT_VALUE_ZERO);
                TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
 
                r = __pDefaultCameraRegistry->AddValue(SECTION_CAMCORDER, SELF_PORTRAIT_ENABLE, DEFAULT_VALUE_ZERO);
@@ -364,10 +370,16 @@ CameraSettingsPresentationModel::Construct(void)
                r = __pAppCameraRegistry->AddValue(SECTION_CAMERA, CURRENT_MODE, valueRegistry);
                TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
 
-               r = __pDefaultCameraRegistry->GetValue(SECTION_CAMERA, FLASH_MODE, valueRegistry);
+               r = __pDefaultCameraRegistry->GetValue(SECTION_CAMERA, FLASH_MODE_PRIMARY, valueRegistry);
+               TryCatch(r == E_SUCCESS, , "Registry::GetValue() failed[%s]", GetErrorMessage(r));
+
+               r = __pAppCameraRegistry->AddValue(SECTION_CAMERA, FLASH_MODE_PRIMARY, valueRegistry);
+               TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
+
+               r = __pDefaultCameraRegistry->GetValue(SECTION_CAMERA, FLASH_MODE_SECONDARY, valueRegistry);
                TryCatch(r == E_SUCCESS, , "Registry::GetValue() failed[%s]", GetErrorMessage(r));
 
-               r = __pAppCameraRegistry->AddValue(SECTION_CAMERA, FLASH_MODE, valueRegistry);
+               r = __pAppCameraRegistry->AddValue(SECTION_CAMERA, FLASH_MODE_SECONDARY, valueRegistry);
                TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
 
                r = __pDefaultCameraRegistry->GetValue(SECTION_CAMERA, SELF_PORTRAIT_ENABLE, valueRegistry);
@@ -464,10 +476,16 @@ CameraSettingsPresentationModel::Construct(void)
                r = __pAppCameraRegistry->AddSection(SECTION_CAMCORDER);
                TryCatch(r == E_SUCCESS, , "Registry::AddSection() failed[%s]", GetErrorMessage(r));
 
-               r = __pDefaultCameraRegistry->GetValue(SECTION_CAMCORDER, FLASH_MODE, valueRegistry);
+               r = __pDefaultCameraRegistry->GetValue(SECTION_CAMCORDER, FLASH_MODE_PRIMARY, valueRegistry);
+               TryCatch(r == E_SUCCESS, , "Registry::GetValue() failed[%s]", GetErrorMessage(r));
+
+               r = __pAppCameraRegistry->AddValue(SECTION_CAMCORDER, FLASH_MODE_PRIMARY, valueRegistry);
+               TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
+
+               r = __pDefaultCameraRegistry->GetValue(SECTION_CAMCORDER, FLASH_MODE_SECONDARY, valueRegistry);
                TryCatch(r == E_SUCCESS, , "Registry::GetValue() failed[%s]", GetErrorMessage(r));
 
-               r = __pAppCameraRegistry->AddValue(SECTION_CAMCORDER, FLASH_MODE, valueRegistry);
+               r = __pAppCameraRegistry->AddValue(SECTION_CAMCORDER, FLASH_MODE_SECONDARY, valueRegistry);
                TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r));
 
                r = __pDefaultCameraRegistry->GetValue(SECTION_CAMCORDER, SELF_PORTRAIT_ENABLE, valueRegistry);

diff --git a/src/CmTypes.cpp b/src/CmTypes.cpp
index 00da422..2cb06d8 100644 (file)
--- a/src/CmTypes.cpp
+++ b/src/CmTypes.cpp
@@ -74,7 +74,8 @@ const wchar_t* SECTION_CAMERA = L"CAMERA_SETTING";
 const wchar_t* SECTION_CAMCORDER = L"CAMCORDER_SETTING";
 
 const wchar_t* CURRENT_MODE = L"CURRENT_MODE";
-const wchar_t* FLASH_MODE = L"FLASH_MODE";
+const wchar_t* FLASH_MODE_PRIMARY = L"PRIMARY_FLASH_MODE";
+const wchar_t* FLASH_MODE_SECONDARY = L"SECONDARY_FLASH_MODE";
 const wchar_t* SELF_PORTRAIT_ENABLE = L"SELF_PORTRAIT_ENABLE";
 const wchar_t* SHOOTING_MODE = L"SHOOTING_MODE";
 const wchar_t* EXPOSURE_VALUE = L"EXPOSURE_VALUE";
@@ -174,4 +175,4 @@ const wchar_t* IDS_HELP_CAPTURE_IMAGE = L"IDS_HELP_CAPTURE_IMAGE";
 const wchar_t* IDS_HELP_RECORD_VIDEO = L"IDS_HELP_RECORD_VIDEO";
 const wchar_t* IDS_HELP_RECORDER = L"IDS_HELP_RECORDER";
 const wchar_t* IDS_HELP_SHUTTER = L"IDS_HELP_SHUTTER";
-const wchar_t* IDS_HELP_GOTO_PREVIOUS_SCREEN = L"IDS_HELP_GOTO_PREVIOUS_SCREEN";
\ No newline at end of file
+const wchar_t* IDS_HELP_GOTO_PREVIOUS_SCREEN = L"IDS_HELP_GOTO_PREVIOUS_SCREEN";