From 3c73695aafe1dfc9a5291701c593b667d324b775 Mon Sep 17 00:00:00 2001 From: Hyunbin Lee Date: Mon, 9 Dec 2013 10:38:18 +0900 Subject: [PATCH] Change Camera to DCIM/Camera Change-Id: I63312eb0e807d777944769e3d45e911b56524fc7 Signed-off-by: Hyunbin Lee --- inc/FAppApp.h | 8 ++++++++ inc/FAppAppManager.h | 6 ++++-- inc/FSysEnvironment.h | 13 +++++++++++-- packaging/osp-appfw.spec | 2 +- src/system/FSys_EnvironmentImpl.cpp | 4 ++-- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/inc/FAppApp.h b/inc/FAppApp.h index b79916f..733d704 100644 --- a/inc/FAppApp.h +++ b/inc/FAppApp.h @@ -175,6 +175,8 @@ public: * @since 2.0 * * @return The application's root directory path + * @remarks If the platform policy is changed or the device is different, the returned file path can be different. @n + * Rather than changing the returned file path as hard coding, use as it is. */ Tizen::Base::String GetAppRootPath(void) const; @@ -184,6 +186,8 @@ public: * @since 2.0 * * @return The application's data directory path + * @remarks If the platform policy is changed or the device is different, the returned file path can be different. @n + * Rather than changing the returned file path as hard coding, use as it is. */ Tizen::Base::String GetAppDataPath(void) const; @@ -193,6 +197,8 @@ public: * @since 2.0 * * @return The application's resource directory path + * @remarks If the platform policy is changed or the device is different, the returned file path can be different. @n + * Rather than changing the returned file path as hard coding, use as it is. */ Tizen::Base::String GetAppResourcePath(void) const; @@ -202,6 +208,8 @@ public: * @since 2.1 * * @return The application's shared directory path + * @remarks If the platform policy is changed or the device is different, the returned file path can be different. @n + * Rather than changing the returned file path as hard coding, use as it is. */ Tizen::Base::String GetAppSharedPath(void) const; diff --git a/inc/FAppAppManager.h b/inc/FAppAppManager.h index 4a32bce..8f99c43 100644 --- a/inc/FAppAppManager.h +++ b/inc/FAppAppManager.h @@ -260,9 +260,11 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_APP_NOT_INSTALLED The expected shared directory has not been found * because the application specified by @c appId cannot be installed. - * @remarks + * @remarks * - The returned path can be invalid when the application specified by @c appId is uninstalled. * - The specific error code can be accessed using the GetLastResult() method. + * - If the platform policy is changed or the device is different, the returned file path can be different. @n + * Rather than changing the returned file path as hard coding, use as it is. */ static Tizen::Base::String GetAppSharedPath(const AppId& appId); @@ -738,7 +740,7 @@ public: * - The specific error code can be accessed using the GetLastResult() method. * - For more information on AppControl resolution, see Application Controls. */ - bool IsUserPreferredAppForAppControlResolution(const AppId& appId) const; + bool IsUserPreferredAppForAppControlResolution(const AppId& appId) const; /** * Clears the user preference for all the AppControl resolutions of the specified application. diff --git a/inc/FSysEnvironment.h b/inc/FSysEnvironment.h index 5874d4f..f124bb2 100644 --- a/inc/FSysEnvironment.h +++ b/inc/FSysEnvironment.h @@ -77,6 +77,8 @@ public: * @since 2.0 * * @return The media directory path + * @remarks If the platform policy is changed or the device is different, the returned file path can be different. @n + * Rather than changing the returned file path as hard coding, use as it is. */ static Tizen::Base::String GetMediaPath(void); @@ -86,6 +88,8 @@ public: * @since 2.0 * * @return The default download directory path + * @remarks If the platform policy is changed or the device is different, the returned file path can be different. @n + * Rather than changing the returned file path as hard coding, use as it is. */ static Tizen::Base::String GetDefaultDownloadPath(void); @@ -95,6 +99,8 @@ public: * @since 2.0 * * @return The external storage directory path + * @remarks If the platform policy is changed or the device is different, the returned file path can be different. @n + * Rather than changing the returned file path as hard coding, use as it is. */ static Tizen::Base::String GetExternalStoragePath(void); @@ -106,8 +112,11 @@ public: * @return The pre-defined directory path according to the specified @c dirType, @n * else an empty string if the specified @c dirType is invalid * @param[in] dirType The pre-defined directory type - * @remarks The directory path for some directory types such as IMAGES, SOUNDS, VIDEOS, CAMERA, DOWNLOADS, and OTHERS may not yet exist, - * so you must make sure that it exists before using it. + * @remarks + * - The directory path for some directory types such as IMAGES, SOUNDS, VIDEOS, CAMERA, DOWNLOADS, and OTHERS may not yet exist, + * so you must make sure that it exists before using it. + * - If the platform policy is changed or the device is different, the returned file path can be different. @n + * Rather than changing the returned file path as hard coding, use as it is. * @see Tizen::Io::Directory::Create() */ static Tizen::Base::String GetPredefinedPath(PredefinedDirectoryType dirType); diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec index 255266f..69254f4 100644 --- a/packaging/osp-appfw.spec +++ b/packaging/osp-appfw.spec @@ -168,7 +168,7 @@ mkdir -p /opt/usr/media/Images mkdir -p /opt/usr/media/Others mkdir -p /opt/usr/media/Sounds mkdir -p /opt/usr/media/Videos -mkdir -p /opt/usr/media/Camera +mkdir -p /opt/usr/media/DCIM/Camera mkdir -p /tmp/osp diff --git a/src/system/FSys_EnvironmentImpl.cpp b/src/system/FSys_EnvironmentImpl.cpp index b964525..6e5cccb 100644 --- a/src/system/FSys_EnvironmentImpl.cpp +++ b/src/system/FSys_EnvironmentImpl.cpp @@ -32,7 +32,7 @@ static const wchar_t _MEDIA_PATH[] = L"/opt/usr/media/"; static const wchar_t _MEDIA_IMAGES_PATH[] = L"/opt/usr/media/Images/"; static const wchar_t _MEDIA_SOUNDS_PATH[] = L"/opt/usr/media/Sounds/"; static const wchar_t _MEDIA_VIDEOS_PATH[] = L"/opt/usr/media/Videos/"; -static const wchar_t _MEDIA_CAMERA_PATH[] = L"/opt/usr/media/Camera/"; +static const wchar_t _MEDIA_CAMERA_PATH[] = L"/opt/usr/media/DCIM/Camera/"; static const wchar_t _MEDIA_DOWNLOADS_PATH[] = L"/opt/usr/media/Downloads/"; static const wchar_t _MEDIA_OTHERS_PATH[] = L"/opt/usr/media/Others/"; @@ -40,7 +40,7 @@ static const wchar_t _EXTERNAL_MMC_PATH[] = L"/opt/storage/sdcard/"; static const wchar_t _EXTERNAL_MMC_IMAGES_PATH[] = L"/opt/storage/sdcard/Images/"; static const wchar_t _EXTERNAL_MMC_SOUNDS_PATH[] = L"/opt/storage/sdcard/Sounds/"; static const wchar_t _EXTERNAL_MMC_VIDEOS_PATH[] = L"/opt/storage/sdcard/Videos/"; -static const wchar_t _EXTERNAL_MMC_CAMERA_PATH[] = L"/opt/storage/sdcard/Camera/"; +static const wchar_t _EXTERNAL_MMC_CAMERA_PATH[] = L"/opt/storage/sdcard/DCIM/Camera/"; static const wchar_t _EXTERNAL_MMC_DOWNLOADS_PATH[] = L"/opt/storage/sdcard/Downloads/"; static const wchar_t _EXTERNAL_MMC_OTHERS_PATH[] = L"/opt/storage/sdcard/Others/"; static const wchar_t _RINGTONE_PATH[] = L"/opt/share/settings/Ringtones/"; -- 2.7.4