summaryrefslogtreecommitdiff
path: root/src/data/folderdata.c
diff options
context:
space:
mode:
authorJehun Lim <jehun.lim@samsung.com>2015-12-08 21:37:29 +0900
committerJehun Lim <jehun.lim@samsung.com>2015-12-08 21:37:57 +0900
commit1a5a0f308ea0bf0946c1c9c5085dc4905f55646d (patch)
treebac19e7b62651c93ee0fe8569970af0df59e90a6 /src/data/folderdata.c
parente1c60d3dc757368e5d34cd66857e1366520f69bb (diff)
downloadair_mediahub-1a5a0f308ea0bf0946c1c9c5085dc4905f55646d.tar.gz
air_mediahub-1a5a0f308ea0bf0946c1c9c5085dc4905f55646d.tar.bz2
air_mediahub-1a5a0f308ea0bf0946c1c9c5085dc4905f55646d.zip
datamgr: add source type for all devices
Change-Id: I5fc03e1239373dd7eca05d7d5b4ab2a73c6b8fb2 Signed-off-by: Jehun Lim <jehun.lim@samsung.com>
Diffstat (limited to 'src/data/folderdata.c')
-rw-r--r--src/data/folderdata.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/data/folderdata.c b/src/data/folderdata.c
index 2335653..d956e59 100644
--- a/src/data/folderdata.c
+++ b/src/data/folderdata.c
@@ -88,16 +88,24 @@ static bool _create_filter(struct folderdata *fd, filter_h *filter,
media_filter_set_order(tmp_filter, MEDIA_CONTENT_ORDER_ASC,
FOLDER_NAME, MEDIA_CONTENT_COLLATE_DEFAULT);
} else {
- snprintf(buf, sizeof(buf), "%s AND MEDIA_STORAGE_TYPE=%d",
- fd->media_type, fd->source_type);
+ snprintf(buf, sizeof(buf), "%s", fd->media_type);
- if (cond) {
+ if (fd->source_type != E_SOURCE_ALL) {
char s1[256];
- snprintf(s1, sizeof(s1), " AND %s", cond);
+ snprintf(s1, sizeof(s1), " AND MEDIA_STORAGE_TYPE=%d",
+ fd->source_type);
+
strncat(buf, s1, strlen(s1));
}
+ if (cond) {
+ char s2[256];
+
+ snprintf(s2, sizeof(s2), " AND %s", cond);
+ strncat(buf, s2, strlen(s2));
+ }
+
media_filter_set_order(tmp_filter, MEDIA_CONTENT_ORDER_ASC,
MEDIA_TITLE,
MEDIA_CONTENT_COLLATE_DEFAULT);