1.MIME type Changes 2.Back Key Changes

Change-Id: I59ed1c19fb9369aa60013ca9f873009af7bdaf70

diff --git a/inc/CmTypes.h b/inc/CmTypes.h
index ad4b5e4..31fa769 100644 (file)
--- a/inc/CmTypes.h
+++ b/inc/CmTypes.h
@@ -214,10 +214,12 @@ extern const wchar_t* ALLOW_SWITCH_TRUE;
 extern const wchar_t* ALLOW_SWITCH_FALSE;
 
 extern const wchar_t* MIME_TYPE_IMAGE_JPG;
+extern const wchar_t* MIME_TYPE_IMAGE_JPEG;
 extern const wchar_t* MIME_TYPE_IMAGE_3GP;
 extern const wchar_t* MIME_TYPE_VIDEO_JPG;
 extern const wchar_t* MIME_TYPE_VIDEO_3GP;
 extern const wchar_t* MIME_TYPE_VIDEO_3GPP;
+extern const wchar_t* MIME_TYPE_VIDEO_MP4;
 
 extern const wchar_t* PARAM_LANGUAGE;
 extern const wchar_t* PARAM_COUNTRY;

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index f64d62e..5916f63 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -13167,7 +13167,7 @@ CamcorderForm::OnKeyReleased(const Tizen::Ui::Control &source, Tizen::Ui::KeyCod
 
        r = _pCameraPresentationModel->GetValue(TIMER_INTERVAL, timerIntervalVale);
        AppLogDebug("Getvalue result is %s",GetErrorMessage(r));
-       if (keyCode == KEY_CLEAR)
+       if (keyCode == KEY_BACK)
        {
                AppLogDebug("timerIntervalVale is %d",timerIntervalVale);
                if (_timeCount == INDEX_UNIT_ZERO)

diff --git a/src/CmCameraApp.cpp b/src/CmCameraApp.cpp
index 8af600e..644e939 100644 (file)
--- a/src/CmCameraApp.cpp
+++ b/src/CmCameraApp.cpp
@@ -490,14 +490,15 @@ CameraApp::OnRequestAppControlTest(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       if (GetMimeType() == MIME_TYPE_IMAGE_JPG || GetMimeType() == MIME_TYPE_IMAGE_3GP)
+       if (GetMimeType() == MIME_TYPE_IMAGE_JPG || GetMimeType() == MIME_TYPE_IMAGE_3GP || GetMimeType() == MIME_TYPE_IMAGE_JPEG)
        {
                __appLaunchType = APP_LAUNCH_TYPE_REQUESET;
 
                r = CameraPresentationModel::GetInstance()->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
                AppLogDebug("SetValue Reg Fail[%s]", GetErrorMessage(r));
        }
-       else if (GetMimeType() == MIME_TYPE_VIDEO_JPG || GetMimeType() == MIME_TYPE_VIDEO_3GP || GetMimeType() == MIME_TYPE_VIDEO_3GPP)
+       else if (GetMimeType() == MIME_TYPE_VIDEO_JPG || GetMimeType() == MIME_TYPE_VIDEO_3GP || GetMimeType() == MIME_TYPE_VIDEO_3GPP
+                       || GetMimeType() == MIME_TYPE_VIDEO_MP4)
        {
                __appLaunchType = APP_LAUNCH_TYPE_REQUESET;
 
@@ -520,37 +521,38 @@ CameraApp::OnRequestAppControl(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       if (GetMimeType() == MIME_TYPE_IMAGE_JPG || GetMimeType() == MIME_TYPE_IMAGE_3GP)
+       if (GetMimeType() == MIME_TYPE_IMAGE_JPG || GetMimeType() == MIME_TYPE_IMAGE_3GP || GetMimeType() == MIME_TYPE_IMAGE_JPEG)
        {
                __appLaunchType = APP_LAUNCH_TYPE_REQUESET;
 
-                       r = CameraPresentationModel::GetInstance()->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
-                       AppLogDebug("SetValue Reg Fail[%s]", GetErrorMessage(r));
+               r = CameraPresentationModel::GetInstance()->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+               AppLogDebug("SetValue Reg Fail[%s]", GetErrorMessage(r));
 
-                       AppLogDebug("EXIT");
-                       return E_SUCCESS;
-               }
-               else if (GetMimeType() == MIME_TYPE_VIDEO_JPG || GetMimeType() == MIME_TYPE_VIDEO_3GP || GetMimeType() == MIME_TYPE_VIDEO_3GPP)
-               {
-                       __appLaunchType = APP_LAUNCH_TYPE_REQUESET;
+               AppLogDebug("EXIT");
+               return E_SUCCESS;
+       }
+       else if (GetMimeType() == MIME_TYPE_VIDEO_JPG || GetMimeType() == MIME_TYPE_VIDEO_3GP || GetMimeType() == MIME_TYPE_VIDEO_3GPP
+                       || GetMimeType() == MIME_TYPE_VIDEO_MP4)
+       {
+               __appLaunchType = APP_LAUNCH_TYPE_REQUESET;
 
-                       r = CameraPresentationModel::GetInstance()->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_RECORD);
-                       AppLogDebug("SetValue Reg Fail[%s]", GetErrorMessage(r));
+               r = CameraPresentationModel::GetInstance()->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_RECORD);
+               AppLogDebug("SetValue Reg Fail[%s]", GetErrorMessage(r));
 
-                       AppLogDebug("EXIT");
-                       return E_SUCCESS;
-               }
-               else
-               {
-                       __appLaunchType = APP_LAUNCH_TYPE_REQUESET;
+               AppLogDebug("EXIT");
+               return E_SUCCESS;
+       }
+       else
+       {
+               __appLaunchType = APP_LAUNCH_TYPE_REQUESET;
 
-                       r = CameraPresentationModel::GetInstance()->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
-                       AppLogDebug("SetValue Reg Fail[%s]", GetErrorMessage(r));
+               r = CameraPresentationModel::GetInstance()->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+               AppLogDebug("SetValue Reg Fail[%s]", GetErrorMessage(r));
 
-                       AppLogDebug("EXIT");
-                       return E_SUCCESS;
-               }
+               AppLogDebug("EXIT");
+               return E_SUCCESS;
        }
+}
 
 void
 CameraApp::OnLowMemory (void)

diff --git a/src/CmCameraForm.cpp b/src/CmCameraForm.cpp
index f51cbc4..48c94bd 100644 (file)
--- a/src/CmCameraForm.cpp
+++ b/src/CmCameraForm.cpp
@@ -12229,7 +12229,7 @@ CameraForm::OnKeyReleased (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode
        AppLogDebug("source name is %ls",source.GetName().GetPointer());
        AppLogDebug("keyCode is %d",keyCode);
 
-       if (keyCode == KEY_CLEAR)
+       if (keyCode == KEY_BACK)
        {
                if (!__isTimerRunning)
                {

diff --git a/src/CmTypes.cpp b/src/CmTypes.cpp
index 5c33f94..ec7709e 100644 (file)
--- a/src/CmTypes.cpp
+++ b/src/CmTypes.cpp
@@ -110,10 +110,12 @@ const wchar_t* ALLOW_SWITCH = L"http://tizen.org/appcontrol/data/camera/allow_sw
 const wchar_t* ALLOW_SWITCH_TRUE = L"true";
 const wchar_t* ALLOW_SWITCH_FALSE = L"false";
 const wchar_t* MIME_TYPE_IMAGE_JPG = L"image/jpg";
+const wchar_t* MIME_TYPE_IMAGE_JPEG = L"image/jpeg";
 const wchar_t* MIME_TYPE_IMAGE_3GP = L"image/3gp";
 const wchar_t* MIME_TYPE_VIDEO_JPG = L"video/jpg";
 const wchar_t* MIME_TYPE_VIDEO_3GP = L"video/3gp";
 const wchar_t* MIME_TYPE_VIDEO_3GPP = L"video/3gpp";
+const wchar_t* MIME_TYPE_VIDEO_MP4 = L"video/mp4";
 const wchar_t* INPUT_KEY_TYPE = L"type";
 const wchar_t* INPUT_TYPE_IMAGE = L"image";
 const wchar_t* INPUT_TYPE_VIDEO = L"video";