diff options
| author | Minje Ahn <minje.ahn@samsung.com> | 2016-11-17 11:16:07 +0900 |
|---|---|---|
| committer | Minje Ahn <minje.ahn@samsung.com> | 2016-11-17 11:16:07 +0900 |
| commit | 33399e5cc7be4cc9d85a9082181203725be05d8e (patch) | |
| tree | df4d02f095592754e1b2b558af2bf59a9fd51af8 | |
| parent | ab45e6e0c98f4a9808209aa8ee4b62b492bec0cf (diff) | |
| download | libmedia-service-accepted/tizen/mobile/20161122.235706.tar.gz libmedia-service-accepted/tizen/mobile/20161122.235706.tar.bz2 libmedia-service-accepted/tizen/mobile/20161122.235706.zip | |
apply new path for the discsubmit/tizen/20161122.044017accepted/tizen/wearable/20161122.235829accepted/tizen/tv/20161122.235749accepted/tizen/mobile/20161122.235706accepted/tizen/ivi/20161122.235912accepted/tizen/common/20161122.192755
Change-Id: Ia49f4f6a0b21dfbaa9cf806c671fed8efefa1da7
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
| -rw-r--r-- | packaging/libmedia-service.spec | 2 | ||||
| -rwxr-xr-x | src/common/media-svc-media-folder.c | 9 | ||||
| -rwxr-xr-x | src/common/media-svc-util.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec index 3c2bfd7..d5010a8 100644 --- a/packaging/libmedia-service.spec +++ b/packaging/libmedia-service.spec @@ -1,6 +1,6 @@ Name: libmedia-service Summary: Media information service library for multimedia applications -Version: 0.2.85 +Version: 0.2.86 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 and public domain diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c index c5eefa2..b6f924d 100755 --- a/src/common/media-svc-media-folder.c +++ b/src/common/media-svc-media-folder.c @@ -52,8 +52,7 @@ static int __media_svc_is_root_path(const char *folder_path, bool *is_root, uid_ } SAFE_FREE(internal_path); - if ((STRING_VALID(MEDIA_ROOT_PATH_SDCARD) && strncmp(folder_path, MEDIA_ROOT_PATH_SDCARD, strlen(MEDIA_ROOT_PATH_SDCARD)) == 0) || - (STRING_VALID(MEDIA_ROOT_PATH_CLOUD) && strncmp(folder_path, MEDIA_ROOT_PATH_CLOUD, strlen(MEDIA_ROOT_PATH_CLOUD)) == 0)) { + if ((STRING_VALID(MEDIA_ROOT_PATH_SDCARD) && strncmp(folder_path, MEDIA_ROOT_PATH_SDCARD, strlen(MEDIA_ROOT_PATH_SDCARD)) == 0)) { start_len = strlen(MEDIA_ROOT_PATH_SDCARD); path_len = strlen(folder_path); @@ -65,6 +64,10 @@ static int __media_svc_is_root_path(const char *folder_path, bool *is_root, uid_ media_svc_debug("ROOT PATH [%s]", folder_path); *is_root = TRUE; + } else if ((STRING_VALID(MEDIA_ROOT_PATH_CLOUD) && strcmp(folder_path, MEDIA_ROOT_PATH_CLOUD) == 0) || + (STRING_VALID(MEDIA_ROOT_PATH_DISC) && strcmp(folder_path, MEDIA_ROOT_PATH_DISC) == 0)) { + media_svc_debug("ROOT PATH [%s]", folder_path); + *is_root = TRUE; } return MS_MEDIA_ERR_NONE; @@ -257,6 +260,8 @@ static int __media_svc_get_and_append_parent_folder(sqlite3 *handle, const char next_pos = strlen(MEDIA_ROOT_PATH_CLOUD); else if (STRING_VALID(MEDIA_ROOT_PATH_EXTERNAL) && strncmp(path, MEDIA_ROOT_PATH_EXTERNAL, strlen(MEDIA_ROOT_PATH_EXTERNAL)) == 0) next_pos = strlen(MEDIA_ROOT_PATH_EXTERNAL); + else if (STRING_VALID(MEDIA_ROOT_PATH_DISC) && strncmp(path, MEDIA_ROOT_PATH_DISC, strlen(MEDIA_ROOT_PATH_DISC)) == 0) + next_pos = strlen(MEDIA_ROOT_PATH_DISC); else { media_svc_error("Invalid Path"); SAFE_FREE(internal_path); diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c index b448539..b5b57e9 100755 --- a/src/common/media-svc-util.c +++ b/src/common/media-svc-util.c @@ -2386,6 +2386,8 @@ int _media_svc_get_storage_type_by_path(const char *path, media_svc_storage_type *storage_type = MEDIA_SVC_STORAGE_EXTERNAL; } else if (STRING_VALID(MEDIA_ROOT_PATH_USB) && (strncmp(path, MEDIA_ROOT_PATH_USB, strlen(MEDIA_ROOT_PATH_USB)) == 0)) { *storage_type = MEDIA_SVC_STORAGE_EXTERNAL_USB; + } else if (STRING_VALID(MEDIA_ROOT_PATH_DISC) && (strncmp(path, MEDIA_ROOT_PATH_DISC, strlen(MEDIA_ROOT_PATH_DISC)) == 0)) { + *storage_type = MEDIA_SVC_STORAGE_EXTERNAL; } else { media_svc_error("Invalid Path"); SAFE_FREE(internal_path); |