Follow Issue has been fixed in the changes

1. Usb video content now visible in app
2. Default thumbnail is used if video thumbnail is not available
3. fit and crop thumbnail keeping the aspect ratio
4. Implemented sort by option based on the new guideline

Change-Id: I22b94eab94462194a42f71ef069bd9e631a608d6
Signed-off-by: aman.jeph <aman.jeph@samsung.com>

diff --git a/include/mp-video-value-define.h b/include/mp-video-value-define.h
index 7435fab8440c9d4c7adf2eb6a6eb72df252bd763..0ffe02eea27a47f1dc50c1cbb1a4c21ed166976c 100755 (executable)
--- a/include/mp-video-value-define.h
+++ b/include/mp-video-value-define.h
@@ -18,6 +18,9 @@
 #ifndef _VIDEO_VALUE_DEFINE_
 #define  _VIDEO_VALUE_DEFINE_
 
+//BASE_SCALE
+#define CURRENT_BASE_SCALE 1.8
+
 //PLAY_TIME_FORMAT
 #define PLAY_TIME_FORMAT "02u:%02u:%02u"
 

diff --git a/playview/src/core/vp-media-contents.c b/playview/src/core/vp-media-contents.c
index 3f9932e0763bf920e31f7447615dc488a6b3329b..a67d45f4ba570be6c84ff7c24cc92cd28ef3ae5f 100755 (executable)
--- a/playview/src/core/vp-media-contents.c
+++ b/playview/src/core/vp-media-contents.c
@@ -349,7 +349,7 @@ bool vp_media_contents_get_video_id(const char *szFilePath,
 
        char szTmpStr[4096] = { 0, };
        snprintf(szTmpStr, 4096,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
                         szFilePath);
 
        nRet = media_filter_create(&pFilterHandle);
@@ -450,7 +450,7 @@ bool vp_media_contents_get_video_thumbnail_path(const char *szFilePath,
 
        char szTmpStr[4096] = { 0, };
        snprintf(szTmpStr, 4096,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
                         szFilePath);
 
        nRet = media_filter_create(&pFilterHandle);
@@ -667,7 +667,7 @@ bool vp_media_contents_get_content_info(const char *szFilePath,
 
        char szTmpStr[4096] = { 0, };
        snprintf(szTmpStr, 4096,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
                         szFilePath);
 
        nRet = media_filter_create(&pFilterHandle);
@@ -1963,7 +1963,7 @@ bool vp_media_contents_get_cloud_attribute(const char *szFilePath,
 
        char szTmpStr[4096] = { 0, };
        snprintf(szTmpStr, 4096,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
                         szFilePath);
 
        nRet = media_filter_create(&pFilterHandle);
@@ -2051,7 +2051,7 @@ bool vp_media_contents_set_location_tag(const char *szFilePath,
 
        char szTmpStr[4096] = { 0, };
        snprintf(szTmpStr, 4096,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
                         szFilePath);
 
        nRet = media_filter_create(&pFilterHandle);
@@ -2152,7 +2152,7 @@ bool vp_media_contents_get_location_tag(const char *szFilePath,
 
        char szTmpStr[4096] = { 0, };
        snprintf(szTmpStr, 4096,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
                         szFilePath);
 
        nRet = media_filter_create(&pFilterHandle);
@@ -2252,7 +2252,7 @@ bool vp_media_contents_set_weahter_tag(const char *szFilePath,
 
        char szTmpStr[4096] = { 0, };
        snprintf(szTmpStr, 4096,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
                         szFilePath);
 
        nRet = media_filter_create(&pFilterHandle);
@@ -2353,7 +2353,7 @@ bool vp_media_contents_get_weahter_tag(const char *szFilePath,
 
        char szTmpStr[4096] = { 0, };
        snprintf(szTmpStr, 4096,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
                         szFilePath);
 
        nRet = media_filter_create(&pFilterHandle);
@@ -2563,7 +2563,7 @@ bool vp_media_contents_file_is_exist(const char *szFilePath)
 
        char szTmpStr[4096] = { 0, };
        snprintf(szTmpStr, 4096,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) AND MEDIA_PATH = \"%s\"",
                         szFilePath);
 
        nRet = media_filter_create(&pFilterHandle);

diff --git a/res/edje/vp-videolist-custom-gengrid.edc b/res/edje/vp-videolist-custom-gengrid.edc
index a75d9d804d98cdb9343412aeed557f1c290a51fb..49d5bb4e42d86c0a73c3378d094b098ab5d71074 100755 (executable)
--- a/res/edje/vp-videolist-custom-gengrid.edc
+++ b/res/edje/vp-videolist-custom-gengrid.edc
@@ -225,6 +225,13 @@ group { "videolist/progressbar"
                                //color: 255 0 0 255;
                        }
                }
+               rect { "base_bg" nomouse; scale;
+                       desc { "default";
+                               rel.to: "base";
+                               color: 238 239 241 255;
+                               //color: 0 0 0 0;
+                       }
+               }
                spacer { "drag_bg";
                        desc { "default";
                                rel.to: "base";
@@ -376,7 +383,7 @@ group { "elm/gengrid/item/videolist/default";
                                }
                        }
                }
-               spacer { "icon_area"; nomouse; scale;
+               rect { "icon_area"; mouse; scale;
                        desc { "default";
                                rel1 {
                                        to: "left_padding";
@@ -386,14 +393,15 @@ group { "elm/gengrid/item/videolist/default";
                                        to: "text_area";
                                        relative: 1.0 0.0;
                                }
+                               color: 0 0 0 0;
                        }
                }
                swallow { "elm.icon"; mouse; scale;
                        desc { "default";
                                rel1.to: "icon_area";
                                rel1.relative: 0.0 0.0;
-                               rel2.to: "progress_area";
-                               rel2.relative: 1.0 0.0;
+                               rel2.to: "icon_area";
+                               rel2.relative: 1.0 1.0;
                                color_class: "gengrid_item/default/icon";
                        }
                        desc { "disabled";
@@ -412,6 +420,10 @@ group { "elm/gengrid/item/videolist/default";
                                rel2.relative: 1.0 0.0;
                                //rel2.offset: 0 -6;
                                align: 1.0 0.0;
+                               hid;
+                       }
+                       desc { "show";
+                               inherit: "default";
                                vis;
                        }
                }
@@ -420,7 +432,6 @@ group { "elm/gengrid/item/videolist/default";
                                min: 0 4;
                                max: -1 4;
                                align: 0.0 1.0;
-                               //fixed: 0 1;
                                rel1 {
                                        to: "icon_area";
                                        relative: 0.0 1.0;
@@ -430,15 +441,15 @@ group { "elm/gengrid/item/videolist/default";
                                        relative: 1.0 1.0;
                                }
                        }
-                       desc { "show";
-                               inherit: "default";
-                               min: 0 4;
-                               max: -1 4;
-                       }
                }
                swallow { "elm.progress"; nomouse; scale;
                        desc { "default";
                                rel.to: "progress_area";
+                               hid;
+                       }
+                       desc { "show";
+                               inherit: "default";
+                               vis;
                        }
                }
                rect { "effect_cover"; nomouse; scale;
@@ -498,37 +509,37 @@ group { "elm/gengrid/item/videolist/default";
                        transition: GLIDE_EASE_OUT(0.25);
                }
                program { "show_progress";
-                       signal: "elm,state,progess,show";
-                       signal: "elm";
+                       signal: "elm,state,elm.progress,visible";
+                       source: "elm";
                        action: STATE_SET "show";
-                       target: "progress_area";
+                       target: "elm.progress";
                }
                program { "hide_progress";
-                       signal: "elm,state,progess,hide";
-                       signal: "elm";
+                       signal: "elm,state,elm.progress,hidden";
+                       source: "elm";
                        action: STATE_SET "default";
-                       target: "progress_area";
+                       target: "elm.progress";
                }
                program { "show_check";
-                       signal: "videolist,checkbox,show";
-                       signal: "elm";
+                       signal: "elm,state,elm.check,visible";
+                       source: "elm";
                        action: STATE_SET "show";
                        target: "elm.check";
                }
                program { "hide_check";
-                       signal: "videolist,checkbox,hide";
-                       signal: "elm";
+                       signal: "elm,state,,elm.check,hidden";
+                       source: "elm";
                        action: STATE_SET "default";
                        target: "elm.check";
                }
                GENGRID_PROGRAM_DEFAULT(
                        target: "elm.icon";
-                       target: "elm.progress";
                        target: "effect_cover";
                        target: "elm.text";
                        target: "elm.sub.text";
                        target: "event";
                        target: "elm.check";
+                       target: "elm.progress";
                )
        }
 }

diff --git a/res/images/default_thumbnail.png b/res/images/default_thumbnail.png
new file mode 100755 (executable)
index 0000000..5b4044f
Binary files /dev/null and b/res/images/default_thumbnail.png differ

diff --git a/res/po/en_US.po b/res/po/en_US.po
index 0c28bad180e4955e27dfedc15fa34639088b3f58..bcb806449b6f9a4cb1cea9f42b57d07fbd5d347d 100755 (executable)
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -254,7 +254,7 @@ msgid "IDS_VIDEO_OPT_EMAIL_ABB"
 msgstr "Email"
 
 msgid "IDS_VIDEO_OPT_DATE_HMOST_RECENT_ABB"
-msgstr "Date (most recent)"
+msgstr "Date (recently added first)"
 
 msgid "IDS_VIDEO_HEADER_PD_SELECTED"
 msgstr "%d selected"

diff --git a/src/common/mp-util-media-service.c b/src/common/mp-util-media-service.c
index 6373557f3c02d52c89a4e44be7a0f33ffec9ce8a..3b69dcbd79ea6f620abeeb4fe8a79ed15b1f9785 100755 (executable)
--- a/src/common/mp-util-media-service.c
+++ b/src/common/mp-util-media-service.c
@@ -474,11 +474,11 @@ bool mp_util_svc_extract_video_list_from_folder(char *szFolderPath,
        case MP_LIST_VIEW_ALL:
                if (!mp_util_get_personal_status()) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) and FOLDER_PATH = \"%s\" and FOLDER_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) and FOLDER_PATH = \"%s\" and FOLDER_PATH NOT LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\"",
                                         szFolderPath);
                }
                break;
@@ -486,11 +486,11 @@ bool mp_util_svc_extract_video_list_from_folder(char *szFolderPath,
        case MP_LIST_VIEW_PHONE:
                if (!mp_util_get_personal_status()) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\" and FOLDER_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\" and FOLDER_PATH NOT LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\"",
                                         szFolderPath);
                }
                break;
@@ -498,11 +498,11 @@ bool mp_util_svc_extract_video_list_from_folder(char *szFolderPath,
        case MP_LIST_VIEW_CLOUD:
                if (!mp_util_get_personal_status()) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) and MEDIA_STORAGE_TYPE = 101 and FOLDER_PATH = \"%s\" and FOLDER_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) and MEDIA_STORAGE_TYPE = 101 and FOLDER_PATH = \"%s\" and FOLDER_PATH NOT LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_STORAGE_TYPE = 101 and FOLDER_PATH = \"%s\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_STORAGE_TYPE = 101 and FOLDER_PATH = \"%s\"",
                                         szFolderPath);
                }
                break;
@@ -510,11 +510,11 @@ bool mp_util_svc_extract_video_list_from_folder(char *szFolderPath,
        default:
                if (!mp_util_get_personal_status()) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) and FOLDER_PATH = \"%s\" and FOLDER_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) and FOLDER_PATH = \"%s\" and FOLDER_PATH NOT LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\"",
                                         szFolderPath);
                }
                break;
@@ -549,7 +549,7 @@ bool mp_util_svc_extract_video_list_from_folder(char *szFolderPath,
 
        memset(szTmpStr, 0, STR_LEN_MAX);
        snprintf(szTmpStr, STR_LEN_MAX,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101)");
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101)");
        if (media_filter_set_condition
                (m_FilterHandle, szTmpStr,
                 MEDIA_CONTENT_COLLATE_DEFAULT) != MEDIA_CONTENT_ERROR_NONE) {
@@ -663,7 +663,7 @@ char *mp_util_get_folder_thumbnail(int nVideoFolderIndex, int nSortType)
 
        memset(szTmpStr, 0, STR_LEN_MAX);
        snprintf(szTmpStr, STR_LEN_MAX,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121)");
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121)");
        if (media_filter_set_condition
                (m_FilterHandle, szTmpStr,
                 MEDIA_CONTENT_COLLATE_DEFAULT) != MEDIA_CONTENT_ERROR_NONE) {
@@ -776,22 +776,22 @@ bool mp_util_svc_extract_video_list_by_item_type(int nSortType,
        case MP_LIST_VIEW_ALL:
                if (!mp_util_get_personal_status()) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) and MEDIA_PATH not like \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) and MEDIA_PATH not like \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121)");
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121)");
                }
                break;
 
        case MP_LIST_VIEW_PHONE:
                if (!mp_util_get_personal_status()) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_PATH not like \"%s%%\"",
+                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_PATH not like \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1)");
+                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2)");
                }
 
                break;
@@ -799,11 +799,11 @@ bool mp_util_svc_extract_video_list_by_item_type(int nSortType,
        case MP_LIST_VIEW_CLOUD:
                if (!mp_util_get_personal_status()) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) and MEDIA_STORAGE_TYPE = 101 and MEDIA_PATH not like \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) and MEDIA_STORAGE_TYPE = 101 and MEDIA_PATH not like \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) and MEDIA_STORAGE_TYPE = 101");
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) and MEDIA_STORAGE_TYPE = 101");
                }
 
                break;
@@ -811,11 +811,11 @@ bool mp_util_svc_extract_video_list_by_item_type(int nSortType,
        default:
                if (!mp_util_get_personal_status()) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) and MEDIA_PATH not like \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) and MEDIA_PATH not like \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121)");
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121)");
                }
                break;
        }
@@ -1100,7 +1100,7 @@ char *mp_util_svc_get_video_Thumbnail_by_video_url(const char *szMediaUri)
 
        memset(szTmpStr, 0, STR_LEN_MAX);
        snprintf(szTmpStr, STR_LEN_MAX,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) AND MEDIA_PATH = \"%s\"",
                         szMediaUri);
        if (media_filter_set_condition
                (m_FilterHandle, szTmpStr,
@@ -1162,7 +1162,7 @@ void mp_util_svc_set_video_last_played_time_by_url(char *szMediaUri,
        }
 
        snprintf(szTmpStr, STR_LEN_MAX,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) AND MEDIA_PATH = \"%s\"",
                         szMediaUri);
        if (media_filter_set_condition
                (m_FilterHandle, szTmpStr,
@@ -1512,24 +1512,24 @@ bool mp_util_svc_extract_video_folder_list_by_type(int nSortType,
        switch (nItemType) {
        case MP_LIST_VIEW_ALL:
                snprintf(szTmpStr, STR_LEN_MAX,
-                                "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121)");
+                                "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121)");
                break;
 
        case MP_LIST_VIEW_PHONE:
                snprintf(szTmpStr, STR_LEN_MAX,
-                                "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1)");
+                                "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=2)");
 
                break;
 
        case MP_LIST_VIEW_CLOUD:
                snprintf(szTmpStr, STR_LEN_MAX,
-                                "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101) and MEDIA_STORAGE_TYPE = 101");
+                                "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101) and MEDIA_STORAGE_TYPE = 101");
 
                break;
 
        default:
                snprintf(szTmpStr, STR_LEN_MAX,
-                                "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121)");
+                                "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121)");
 
                break;
        }
@@ -1581,11 +1581,11 @@ bool mp_util_svc_extract_personal_video_folder_list(int nSortType,
 
        if (bPersonal == FALSE) {
                snprintf(szTmpStr, STR_LEN_MAX,
-                                "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_PATH NOT LIKE \"%s%%\"",
+                                "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_PATH NOT LIKE \"%s%%\"",
                                 VIDEO_UTIL_PERSONAL_HEAD_STR);
        } else {
                snprintf(szTmpStr, STR_LEN_MAX,
-                                "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_PATH LIKE \"%s%%\"",
+                                "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_PATH LIKE \"%s%%\"",
                                 VIDEO_UTIL_PERSONAL_HEAD_STR);
        }
        if (media_filter_set_condition
@@ -1845,7 +1845,7 @@ void mp_util_svc_update_thumbnail_info(const int nVideoItemIndex)
 
        memset(szTmpStr, 0, STR_LEN_MAX);
        snprintf(szTmpStr, STR_LEN_MAX,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) AND MEDIA_PATH = \"%s\"",
                         szMediaUri);
        if (media_filter_set_condition
                (m_FilterHandle, szTmpStr,
@@ -2238,7 +2238,7 @@ bool mp_util_svc_get_video_detail_by_video_url(const char *szPath,
        }
 
        snprintf(szTmpStr, STR_LEN_MAX,
-                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) AND MEDIA_PATH = \"%s\"",
+                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2 OR MEDIA_STORAGE_TYPE=101 OR MEDIA_STORAGE_TYPE=121) AND MEDIA_PATH = \"%s\"",
                         szPath);
        if (media_filter_set_condition
                (m_FilterHandle, szTmpStr,
@@ -2369,11 +2369,11 @@ bool mp_util_svc_extract_video_list_from_folder_by_personal(char
        case MP_LIST_VIEW_ALL:
                if (nViewType == 0) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\" and MEDIA_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\" and MEDIA_PATH NOT LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\" and MEDIA_PATH LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\" and MEDIA_PATH LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                }
                break;
@@ -2381,11 +2381,11 @@ bool mp_util_svc_extract_video_list_from_folder_by_personal(char
        case MP_LIST_VIEW_PHONE:
                if (nViewType == 0) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\" and MEDIA_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\" and MEDIA_PATH NOT LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\" and MEDIA_PATH LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\" and MEDIA_PATH LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                }
                break;
@@ -2393,11 +2393,11 @@ bool mp_util_svc_extract_video_list_from_folder_by_personal(char
        case MP_LIST_VIEW_CLOUD:
                if (nViewType == 0) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\" and MEDIA_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\" and MEDIA_PATH NOT LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\" and MEDIA_PATH LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\" and MEDIA_PATH LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                }
                break;
@@ -2405,11 +2405,11 @@ bool mp_util_svc_extract_video_list_from_folder_by_personal(char
        default:
                if (nViewType == 0) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\" and MEDIA_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\" and MEDIA_PATH NOT LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and FOLDER_PATH = \"%s\" and MEDIA_PATH LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and FOLDER_PATH = \"%s\" and MEDIA_PATH LIKE \"%s%%\"",
                                         szFolderPath, VIDEO_UTIL_PERSONAL_HEAD_STR);
                }
                break;
@@ -2553,11 +2553,11 @@ bool mp_util_svc_extract_video_list_by_personal(int nSortType,
        case MP_LIST_VIEW_ALL:
                if (nViewType == 0) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_PATH NOT LIKE \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_PATH LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_PATH LIKE \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                }
                break;
@@ -2565,11 +2565,11 @@ bool mp_util_svc_extract_video_list_by_personal(int nSortType,
        case MP_LIST_VIEW_PHONE:
                if (nViewType == 0) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_PATH NOT LIKE \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_PATH LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 and (MEDIA_STORAGE_TYPE = 0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_PATH LIKE \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                }
 
@@ -2578,11 +2578,11 @@ bool mp_util_svc_extract_video_list_by_personal(int nSortType,
        case MP_LIST_VIEW_CLOUD:
                if (nViewType == 0) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_PATH NOT LIKE \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_PATH LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_PATH LIKE \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                }
 
@@ -2591,11 +2591,11 @@ bool mp_util_svc_extract_video_list_by_personal(int nSortType,
        default:
                if (nViewType == 0) {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_PATH NOT LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_PATH NOT LIKE \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                } else {
                        snprintf(szTmpStr, STR_LEN_MAX,
-                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1) and MEDIA_PATH LIKE \"%s%%\"",
+                                        "MEDIA_TYPE = 1 AND (MEDIA_STORAGE_TYPE=0 OR MEDIA_STORAGE_TYPE=1 OR MEDIA_STORAGE_TYPE=2) and MEDIA_PATH LIKE \"%s%%\"",
                                         VIDEO_UTIL_PERSONAL_HEAD_STR);
                }
                break;

diff --git a/src/video-player.c b/src/video-player.c
index 72a5e901c07ab18b0254e78a4966fa02d3db5e39..0af492df6e26569051ad7b2b7485307046ecf2e1 100755 (executable)
--- a/src/video-player.c
+++ b/src/video-player.c
@@ -56,7 +56,7 @@ static void __app_color_theme_changed(void *pUserData)
 static void appCreateInternal()
 {
        VideoLogWarning("== APP CREATE INTERNAL ==");
-       elm_app_base_scale_set(1.8);
+       elm_app_base_scale_set(CURRENT_BASE_SCALE);
        mp_util_create_main_theme();
        mp_util_set_color_theme_changed_cb(__app_color_theme_changed);
 

diff --git a/src/view/mp-video-list-remove-view.c b/src/view/mp-video-list-remove-view.c
index e77e2825e4a5c2b7218552e841162dc2a1ccf94e..c62a1c983998b47af217d86232f001f320c607fc 100755 (executable)
--- a/src/view/mp-video-list-remove-view.c
+++ b/src/view/mp-video-list-remove-view.c
@@ -363,27 +363,6 @@ static void __mp_remove_view_run_delete_items_cb(void *data, Evas_Object *obj, c
                }
 }
 
-/**
- *
- * @param pUserData
- * @param obj
- * @param event_info
- */
-static void __mp_remove_view_trans_finished_cb(void *pUserData,
-                                                                                          Evas_Object * obj,
-                                                                                          void *event_info)
-{
-       if (!g_pListRemoveViewHandle) {
-               VideoLogError("[ERR] g_pListRemoveViewHandle is NULL.");
-               return;
-       }
-       VideoLogInfo("");
-       mp_widget_ctrl_enable_navi_handle_focus(obj);
-
-       evas_object_smart_callback_del(obj, "transition,finished",
-                                                                  __mp_remove_view_trans_finished_cb);
-}
-
 /**
  *
  * @param pUserData
@@ -805,7 +784,7 @@ static int mp_remove_view_get_respective_video_no(int nFolderItemIndex)
  * @param pPart
  * @return
  */
-static char *__mp_remove_view_get_label_of_folder_cb(const void *pUserData,
+static char *__mp_remove_view_get_label_of_folder_cb(void *pUserData,
                                                                                                         Evas_Object * pObject,
                                                                                                         const char *pPart)
 {
@@ -860,14 +839,24 @@ static Evas_Object *__mp_remove_folder_view_get_grid_icon_cb(void *pUserData, Ev
 
        if (!strcmp(pPart, "elm.icon")) {
                char *pThumbIconUri = mp_util_get_folder_thumbnail(nFolderItemIndex, mp_sort_ctrl_get_sort_state());
+
+               Evas_Object *img = elm_image_add(pObject);
+
                if(pThumbIconUri == NULL)
                {
-                       VideoLogError("thumbnail url is invalid");
-                       return NULL;
+                       char edj_path[1024] = {0, };
+                       char *path = app_get_resource_path();
+                       snprintf(edj_path, 1024, "%s%s/%s", path, "images", "player_library_list_thumbnail_default.png");
+                       free(path);
+                       elm_image_aspect_fixed_set(img, EINA_TRUE);
+                       elm_image_file_set(img, edj_path, NULL);
+               } else {
+                       elm_image_fill_outside_set(img, EINA_TRUE);
+                       elm_image_file_set(img, pThumbIconUri, NULL);
+                       free(pThumbIconUri);
                }
-               Evas_Object *img = elm_image_add(pObject);
-               elm_image_file_set(img, pThumbIconUri, NULL);
-               elm_image_aspect_fixed_set(img, EINA_FALSE);
+
+               elm_image_aspect_fixed_set(img, EINA_TRUE);
                elm_image_preload_disabled_set(img, EINA_FALSE);
                evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -908,31 +897,40 @@ static Evas_Object *__mp_remove_view_get_grid_icon_cb(void *pUserData, Evas_Obje
        int nVideoItemIndex = item_data->itemIndex;
 
        char edj_path[1024] = { 0 };
-       char *path = app_get_resource_path();
-       snprintf(edj_path, 1024, "%s%s/%s", path, "edje", VIDEO_CUSTOM_THEME);
-       free(path);
 
        if (!strcmp(pPart, "elm.icon")) {
                char *pThumbIconUri = mp_util_svc_get_video_thumbnail(nVideoItemIndex);
+
+               Evas_Object *img = elm_image_add(pObject);
+
                if(pThumbIconUri == NULL)
                {
-                       VideoLogError("thumbnail url is invalid");
-                       return NULL;
+                       char *path = app_get_resource_path();
+                       snprintf(edj_path, 1024, "%s%s/%s", path, "images", "default_thumbnail.png");
+                       free(path);
+                       elm_image_aspect_fixed_set(img, EINA_TRUE);
+                       elm_image_file_set(img, edj_path, NULL);
+               } else {
+                       elm_image_fill_outside_set(img, EINA_TRUE);
+                       elm_image_file_set(img, pThumbIconUri, NULL);
+                       free(pThumbIconUri);
                }
-               Evas_Object *img = elm_image_add(pObject);
-               elm_image_file_set(img, pThumbIconUri, NULL);
-               elm_image_aspect_fixed_set(img, EINA_FALSE);
+
+               elm_image_aspect_fixed_set(img, EINA_TRUE);
                elm_image_preload_disabled_set(img, EINA_FALSE);
                evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
                item_data->icon = img;
-               free(pThumbIconUri);
-
                return img;
        }
        else if(!strcmp(pPart, "elm.progress"))
        {
+
+               // get layout edc
+               char *path = app_get_resource_path();
+               snprintf(edj_path, 1024, "%s%s/%s", path, "edje", VIDEO_CUSTOM_THEME);
+               free(path);
                //enable progess for video items
                elm_object_item_signal_emit(item_data->item, "elm,state,progess,show", "elm");
                // Add progess bar

diff --git a/src/view/mp-video-list-share-via-view.c b/src/view/mp-video-list-share-via-view.c
index aea84f5f81cc67c22530413c24b1c93893c3021f..301095dd6be9731288e3d4205376e7631e743e38 100755 (executable)
--- a/src/view/mp-video-list-share-via-view.c
+++ b/src/view/mp-video-list-share-via-view.c
@@ -914,31 +914,39 @@ static Evas_Object *__mp_share_view_get_grid_icon_cb(void *pUserData,
        int nVideoItemIndex = item_data->itemIndex;
 
        char edj_path[1024] = { 0 };
-       char *path = app_get_resource_path();
-       snprintf(edj_path, 1024, "%s%s/%s", path, "edje", VIDEO_CUSTOM_THEME);
-       free(path);
 
        if (!strcmp(pPart, "elm.icon")) {
                char *pThumbIconUri = mp_util_svc_get_video_thumbnail(nVideoItemIndex);
+
+               Evas_Object *img = elm_image_add(pObject);
+
                if(pThumbIconUri == NULL)
                {
-                       VideoLogError("thumbnail url is invalid");
-                       return NULL;
+                       char *path = app_get_resource_path();
+                       snprintf(edj_path, 1024, "%s%s/%s", path, "images", "default_thumbnail.png");
+                       free(path);
+                       elm_image_aspect_fixed_set(img, EINA_TRUE);
+                       elm_image_file_set(img, edj_path, NULL);
+               } else {
+                       elm_image_fill_outside_set(img, EINA_TRUE);
+                       elm_image_file_set(img, pThumbIconUri, NULL);
+                       free(pThumbIconUri);
                }
-               Evas_Object *img = elm_image_add(pObject);
-               elm_image_file_set(img, pThumbIconUri, NULL);
-               elm_image_aspect_fixed_set(img, EINA_FALSE);
+
                elm_image_preload_disabled_set(img, EINA_FALSE);
                evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
                item_data->icon = img;
-               free(pThumbIconUri);
 
                return img;
        }
        else if(!strcmp(pPart, "elm.progress"))
        {
+               // get layout edc
+               char *path = app_get_resource_path();
+               snprintf(edj_path, 1024, "%s%s/%s", path, "edje", VIDEO_CUSTOM_THEME);
+               free(path);
                //enable progess for video items
                elm_object_item_signal_emit(item_data->item, "elm,state,progess,show", "elm");
                // Add progess bar

diff --git a/src/view/mp-video-list-view-folder.c b/src/view/mp-video-list-view-folder.c
index 2b5268f25f0de26142f802b344c2060e00e06d52..402ee0ab6a57aa2c6d50bd2cdf6cb64906c00e0e 100755 (executable)
--- a/src/view/mp-video-list-view-folder.c
+++ b/src/view/mp-video-list-view-folder.c
@@ -261,23 +261,30 @@ static char *mp_folder_view_get_label_of_folder_cb(void *pUserData,
  * @param pPart
  * @return
  */
-static Evas_Object *mp_folder_view_get_icon_of_folder_cb(void *pUserData,
-                                                               Evas_Object *pObject,
-                                                               const char *pPart)
+static Evas_Object *mp_folder_view_get_icon_of_folder_cb(void *pUserData,Evas_Object *pObject, const char *pPart)
 {
        stGengridItemData *item_data = pUserData;
        int nFolderItemIndex = item_data->folderIndex;
 
        if (!strcmp(pPart, "elm.icon")) {
                char *pThumbIconUri = mp_util_get_folder_thumbnail(nFolderItemIndex, mp_sort_ctrl_get_sort_state());
+
+               Evas_Object *img = elm_image_add(pObject);
+
                if(pThumbIconUri == NULL)
                {
-                       VideoLogError("thumbnail url is invalid");
-                       return NULL;
+                       char edj_path[1024] = {0, };
+                       char *path = app_get_resource_path();
+                       snprintf(edj_path, 1024, "%s%s/%s", path, "images", "default_thumbnail.png");
+                       free(path);
+                       elm_image_aspect_fixed_set(img, EINA_TRUE);
+                       elm_image_file_set(img, edj_path, NULL);
+               } else {
+                       elm_image_fill_outside_set(img, EINA_TRUE);
+                       elm_image_file_set(img, pThumbIconUri, NULL);
+                       free(pThumbIconUri);
                }
-               Evas_Object *img = elm_image_add(pObject);
-               elm_image_file_set(img, pThumbIconUri, NULL);
-               elm_image_aspect_fixed_set(img, EINA_FALSE);
+
                elm_image_preload_disabled_set(img, EINA_FALSE);
                evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL);

diff --git a/src/view/mp-video-list-view-item-of-folder.c b/src/view/mp-video-list-view-item-of-folder.c
index 5f08ac56746baf809c13d760ced9b5db9235698f..401f77001e2b1b41ea6aca719145c4791227827c 100755 (executable)
--- a/src/view/mp-video-list-view-item-of-folder.c
+++ b/src/view/mp-video-list-view-item-of-folder.c
@@ -282,20 +282,28 @@ Evas_Object *__mp_folder_item_view_get_icon_of_video_item_cb(void
 
        if (!strcmp(pPart, "elm.icon")) {
                char *pThumbIconUri = mp_util_svc_get_video_thumbnail(nVideoItemIndex);
+
+               Evas_Object *img = elm_image_add(pObject);
+
                if(pThumbIconUri == NULL)
                {
-                       VideoLogError("thumbnail url is invalid");
-                       return NULL;
+                       char *path = app_get_resource_path();
+                       snprintf(edj_path, 1024, "%s%s/%s", path, "images", "default_thumbnail.png");
+                       free(path);
+                       elm_image_aspect_fixed_set(img, EINA_TRUE);
+                       elm_image_file_set(img, edj_path, NULL);
+               } else {
+                       elm_image_fill_outside_set(img, EINA_TRUE);
+                       elm_image_file_set(img, pThumbIconUri, NULL);
+                       free(pThumbIconUri);
                }
-               Evas_Object *img = elm_image_add(pObject);
-               elm_image_file_set(img, pThumbIconUri, NULL);
-               elm_image_aspect_fixed_set(img, EINA_FALSE);
+
+               elm_image_aspect_fixed_set(img, EINA_TRUE);
                elm_image_preload_disabled_set(img, EINA_FALSE);
                evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
                item_data->icon = img;
-               free(pThumbIconUri);
 
                return img;
        }
@@ -744,23 +752,12 @@ static int __mp_folder_item_view_get_sort_type(void)
 static void __mp_folder_item_view_update_video_items(void *pVideosGenlist)
 {
        if (!pVideosGenlist) {
-               VideoLogInfo
-                       ("[ERR] pVideosGenlist or g_pMainViewWidget are NULL.");
+               VideoLogInfo("[ERR] pVideosGenlist or g_pMainViewWidget are NULL.");
                return;
        }
 
        VideoLogInfo("");
-
-       Elm_Object_Item *pNextGenlistItem = NULL;
-       Elm_Object_Item *pCurrGenlistItem =
-               elm_genlist_first_item_get(pVideosGenlist);
-
-       while (pCurrGenlistItem) {
-
-               pNextGenlistItem = elm_genlist_item_next_get(pCurrGenlistItem);
-               elm_genlist_item_update(pCurrGenlistItem);
-               pCurrGenlistItem = pNextGenlistItem;
-       }
+       elm_gengrid_realized_items_update((Evas_Object*)pVideosGenlist);
 }
 
 /**
@@ -769,15 +766,14 @@ static void __mp_folder_item_view_update_video_items(void *pVideosGenlist)
 static void __mp_folder_item_view_db_result_data_update_cb(void)
 {
        if (!g_pFolderViewHandle) {
-               VideoLogInfo
-                       ("g_pFolderViewHandle handles of list view are not existed.");
+               VideoLogInfo("g_pFolderViewHandle handles of list view are not existed.");
                return;
        }
 
        VideoLogInfo("");
 
-       if (!g_pFolderViewHandle->pVideosGenlist) {
-               VideoLogInfo("g_pMainViewHandle->pVideosGenlist is NULL.");
+       if (!g_pFolderViewHandle->pFolderItemGengrid) {
+               VideoLogInfo("g_pMainViewHandle->pFolderItemGengrid is NULL.");
                return;
        }
        if (g_pFolderViewHandle->pFolderUrl) {
@@ -790,8 +786,7 @@ static void __mp_folder_item_view_db_result_data_update_cb(void)
                VideoLogError("url is NULL.");
        }
 
-       __mp_folder_item_view_update_video_items(g_pFolderViewHandle->
-                                                                                        pVideosGenlist);
+       __mp_folder_item_view_update_video_items(g_pFolderViewHandle->pFolderItemGengrid);
 }
 
 /**
@@ -832,11 +827,9 @@ static void __mp_folder_item_view_result_user_cb(MpListUpdateType
 
        VideoLogInfo("");
        if (__mp_folder_item_view_update_video_list(eUpdateType)) {
-               Elm_Object_Item *pItem =
-                       elm_genlist_first_item_get(g_pFolderViewHandle->
-                                                                          pVideosGenlist);
+               Elm_Object_Item *pItem = elm_gengrid_first_item_get(g_pFolderViewHandle->pFolderItemGengrid);
                if (pItem) {
-                       elm_genlist_item_bring_in(pItem, ELM_GENLIST_ITEM_SCROLLTO_IN);
+                       elm_gengrid_item_bring_in(pItem, ELM_GENGRID_ITEM_SCROLLTO_IN);
                }
        }
 }
@@ -1719,8 +1712,7 @@ void mp_folder_item_view_change_language(void)
  */
 void mp_folder_item_view_update_video_list(MpListUpdateType eUpdateType)
 {
-       if (!g_pFolderViewHandle || !g_pFolderViewWidget
-               || !g_pFolderViewHandle->pVideosGenlist) {
+       if (!g_pFolderViewHandle || !g_pFolderViewWidget) {
                VideoLogError("handles of list view are not existed.");
                return;
        }

diff --git a/src/view/mp-video-list-view-main.c b/src/view/mp-video-list-view-main.c
index 85158493608f917d3cbdc44323d96b079d065935..6ceb22bc2bafbfa3369aa8173afbb85080285158 100755 (executable)
--- a/src/view/mp-video-list-view-main.c
+++ b/src/view/mp-video-list-view-main.c
@@ -230,7 +230,7 @@ void mp_list_view_sort_item_cb(void *pUserData, Evas_Object * pObject,
        MpFooterLibraryMainListTabType footerTabType =
                (MpFooterLibraryMainListTabType) pUserData;
        if (FOOTER_TAB_TYPE_PERSONAL == footerTabType) {
-               mp_sort_ctrl_show((void *) __mp_list_view_result_data_update_cb);
+               mp_sort_ctrl_show( __mp_list_view_result_data_update_cb);
        } else {
                VideoLogError("invalid footer type");
        }

diff --git a/src/view/mp-video-list-view-thumbnail.c b/src/view/mp-video-list-view-thumbnail.c
index 4727948a7539ca6129406467783ef620730d68ee..7d607893a0f87a895bc4b102476b6dfac1c959e2 100755 (executable)
--- a/src/view/mp-video-list-view-thumbnail.c
+++ b/src/view/mp-video-list-view-thumbnail.c
@@ -649,9 +649,7 @@ static bool __mp_thumbnail_view_normal_is_top_view(void)
                return FALSE;
        }
        if (mp_mgr_get_library_naviframe()) {
-               int count =
-                       eina_list_count(elm_naviframe_items_get
-                                                       (mp_mgr_get_library_naviframe()));
+               int count = eina_list_count(elm_naviframe_items_get(mp_mgr_get_library_naviframe()));
                return (count == 1);
        }
        return FALSE;
@@ -680,11 +678,8 @@ static void __mp_thumbnail_view_update_cb(int nError, const char *szPath,
                return;
        }
 
-       if (nVideoItemIndex < 0
-               || nVideoItemIndex >=
-               mp_util_svc_get_video_list_size_for_checking_index()) {
-               VideoSecureLogError("nVideoItemIndex is invalid = %d",
-                                                       nVideoItemIndex);
+       if (nVideoItemIndex < 0 || nVideoItemIndex >= mp_util_svc_get_video_list_size_for_checking_index()) {
+               VideoSecureLogError("nVideoItemIndex is invalid = %d", nVideoItemIndex);
                return;
        }
 
@@ -798,27 +793,21 @@ static void __mp_thumbnail_view_gengrid_realize_cb(void *pUserData,
        stGengridItemData *item_data = elm_object_item_data_get((Elm_Object_Item *) pEventInfo);
        int nVideoItemIndex = item_data->videoIndex;
        VideoLogInfo("Select nVideoItemIndex: %d", nVideoItemIndex);
-       if (nVideoItemIndex < 0
-               || nVideoItemIndex >=
-               mp_util_svc_get_video_list_size_for_checking_index()) {
-               VideoSecureLogError("nVideoItemIndex is invalid = %d",
-                                                       nVideoItemIndex);
+
+       if (nVideoItemIndex < 0 || nVideoItemIndex >= mp_util_svc_get_video_list_size_for_checking_index()) {
+               VideoSecureLogError("nVideoItemIndex is invalid = %d", nVideoItemIndex);
                return;
        }
 
        int nVideoListSize = mp_util_svc_get_number_of_video_item_by_type();
        char *pThumbIconUri = mp_util_svc_get_video_thumbnail(nVideoItemIndex);
-       VideoSecureLogInfo("pThumbIconUri = %s:%d", pThumbIconUri,
-                                          nVideoItemIndex);
+       VideoSecureLogInfo("pThumbIconUri = %s:%d", pThumbIconUri, nVideoItemIndex);
+
        if (!pThumbIconUri) {
                if (nVideoItemIndex < nVideoListSize - 1) {
-                       mp_util_svc_register_thumbnail_update_func(nVideoItemIndex,
-                                                                       __mp_thumbnail_view_update_empty_cb,
-                                                                       (void *)item_data);
+                       mp_util_svc_register_thumbnail_update_func(nVideoItemIndex, __mp_thumbnail_view_update_empty_cb, (void *)item_data);
                } else {
-                       mp_util_svc_register_thumbnail_update_func(nVideoItemIndex,
-                                                                       (void *)__mp_thumbnail_view_update_cb,
-                                                                       (void *)item_data);
+                       mp_util_svc_register_thumbnail_update_func(nVideoItemIndex, (void *)__mp_thumbnail_view_update_cb, (void *)item_data);
                }
        } else {
                free(pThumbIconUri);
@@ -885,35 +874,40 @@ static Evas_Object *__mp_thumbnail_view_get_grid_icon_cb(const void *pUserData,
 {
        stGengridItemData *item_data = (void*)pUserData;
        int nVideoItemIndex = item_data->videoIndex;
-
        char edj_path[1024] = { 0 };
-       char *path = app_get_resource_path();
-       snprintf(edj_path, 1024, "%s%s/%s", path, "edje", VIDEO_CUSTOM_THEME);
-       free(path);
 
        if (!strcmp(pPart, "elm.icon")) {
+
                char *pThumbIconUri = mp_util_svc_get_video_thumbnail(nVideoItemIndex);
+
+               Evas_Object *img = elm_image_add(pObject);
+
                if(pThumbIconUri == NULL)
                {
-                       VideoLogError("thumbnail url is invalid");
-                       return NULL;
+                       char *path = app_get_resource_path();
+                       snprintf(edj_path, 1024, "%s%s/%s", path, "images", "default_thumbnail.png");
+                       free(path);
+                       elm_image_aspect_fixed_set(img, EINA_TRUE);
+                       elm_image_file_set(img, edj_path, NULL);
+               } else {
+                       elm_image_fill_outside_set(img, EINA_TRUE);
+                       elm_image_file_set(img, pThumbIconUri, NULL);
+                       free(pThumbIconUri);
                }
-               Evas_Object *img = elm_image_add(pObject);
-               elm_image_file_set(img, pThumbIconUri, NULL);
-               elm_image_aspect_fixed_set(img, EINA_FALSE);
+
                elm_image_preload_disabled_set(img, EINA_FALSE);
                evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
                item_data->icon = img;
-               free(pThumbIconUri);
-
                return img;
        }
        else if(!strcmp(pPart, "elm.progress"))
        {
-               //enable progess for video items
-               elm_object_item_signal_emit(item_data->item, "elm,state,progess,show", "elm");
+               char *path = app_get_resource_path();
+               snprintf(edj_path, 1024, "%s%s/%s", path, "edje", VIDEO_CUSTOM_THEME);
+               free(path);
+
                // Add progess bar
                Evas_Object *progessbar = elm_layout_add(pObject);
                Eina_Bool ret = elm_layout_file_set(progessbar, edj_path, "videolist/progressbar");

diff --git a/src/view/mp-video-search-view.c b/src/view/mp-video-search-view.c
index e3335c21a3c80662d88a50bd3d9cba6911bca379..d11ab9a4f605c21c51d80a86ac704cca08c13f27 100755 (executable)
--- a/src/view/mp-video-search-view.c
+++ b/src/view/mp-video-search-view.c
@@ -464,21 +464,27 @@ Evas_Object *mp_search_view_get_icon_of_video_item_cb(void *pUserData, Evas_Obje
 
        if (!strcmp(pPart, "elm.icon")) {
                char *pThumbIconUri = mp_util_svc_get_video_thumbnail(nVideoItemIndex);
+               char edj_path[1024] = {0, };
+
+               Evas_Object *img = elm_image_add(pObject);
+
                if(pThumbIconUri == NULL)
                {
-                       VideoLogError("thumbnail url is invalid");
-                       return NULL;
+                       char *path = app_get_resource_path();
+                       snprintf(edj_path, 1024, "%s%s/%s", path, "images", "default_thumbnail.png");
+                       free(path);
+                       elm_image_aspect_fixed_set(img, EINA_TRUE);
+                       elm_image_file_set(img, edj_path, NULL);
+               } else {
+                       elm_image_fill_outside_set(img, EINA_TRUE);
+                       elm_image_file_set(img, pThumbIconUri, NULL);
+                       free(pThumbIconUri);
                }
-               Evas_Object *img = elm_image_add(pObject);
-               elm_image_file_set(img, pThumbIconUri, NULL);
-               elm_image_aspect_fixed_set(img, EINA_FALSE);
                elm_image_preload_disabled_set(img, EINA_FALSE);
                evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
                item_data->icon = img;
-               free(pThumbIconUri);
-
                return img;
        }
        return NULL;

diff --git a/src/widget/mp-video-list-sort-ctrl.c b/src/widget/mp-video-list-sort-ctrl.c
index a7e481fd390d4b1f3bb1d7b825026417afa6c23e..929f3dd18968bf1c95885623fab537da9eff81c0 100755 (executable)
--- a/src/widget/mp-video-list-sort-ctrl.c
+++ b/src/widget/mp-video-list-sort-ctrl.c
@@ -135,14 +135,14 @@ void mp_sort_ctrl_set_sort_state(MpListSortType nListSortType)
  * @param pPart
  * @return
  */
-static char *mp_sort_ctrl_get_label_of_genlist_cb(const void *pUserData,
+static char *mp_sort_ctrl_get_label_of_genlist_cb(void *pUserData,
                                                                                                  Evas_Object * pObject,
                                                                                                  const char *pPart)
 {
 
        int nIndex = (int) pUserData;
 
-       if (!strcmp(pPart, "elm.text") || !strcmp(pPart, "elm.text.main.left")) {
+       if (!strcmp(pPart, "elm.text")) {
                switch (nIndex) {
                case MP_LIST_SORT_BY_RECENTLY_ADDED:
                        return strdup(VIDEOS_SORTBYOPT_OPT_DATE_MOST_RECENT);
@@ -154,6 +154,24 @@ static char *mp_sort_ctrl_get_label_of_genlist_cb(const void *pUserData,
        return NULL;
 }
 
+static void __mp_sort_ctrl_popup_dismissed_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       mp_sort_ctrl_delete_handle();
+}
+
+
+static void __mp_sort_ctrl_radio_animation_finished(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+       if(g_pSortCtrlHandle) {
+               ListSortCtrlCbFunc fFunc = g_pSortCtrlHandle->ListSortCtrlUserCbFunc;
+               elm_popup_dismiss(g_pSortCtrlHandle->pPopUpHandle);
+
+               if (fFunc) {
+                       fFunc();
+               }
+       }
+}
+
 /**
  *
  * @param pUserData
@@ -161,8 +179,7 @@ static char *mp_sort_ctrl_get_label_of_genlist_cb(const void *pUserData,
  * @param pPart
  * @return
  */
-static Evas_Object *mp_sort_ctrl_get_icon_of_genlist_cb(const void
-                                                                                                               *pUserData,
+static Evas_Object *mp_sort_ctrl_get_icon_of_genlist_cb(void *pUserData,
                                                                                                                Evas_Object *
                                                                                                                pObject,
                                                                                                                const char *pPart)
@@ -175,7 +192,7 @@ static Evas_Object *mp_sort_ctrl_get_icon_of_genlist_cb(const void
                return NULL;
        }
 
-       if (!strcmp(pPart, "elm.swallow.end") || !strcmp(pPart, "elm.icon.2")) {
+       if (!strcmp(pPart, "elm.icon") ) {
                pTmpRadio = elm_radio_add(pObject);
 
                elm_radio_state_value_set(pTmpRadio, nIndex);
@@ -190,6 +207,8 @@ static Evas_Object *mp_sort_ctrl_get_icon_of_genlist_cb(const void
                evas_object_smart_callback_add(pTmpRadio, "changed",
                                                                           __mp_sort_ctrl_select_radio_cb,
                                                                           (void *) pUserData);
+               elm_object_signal_emit(pTmpRadio, "elm,activate,radio,on", "elm");
+               elm_object_signal_callback_add(pTmpRadio, "animation,finished", "", __mp_sort_ctrl_radio_animation_finished, (void*)pUserData);
 
                evas_object_show(pTmpRadio);
        }
@@ -252,14 +271,6 @@ static void mp_sort_ctrl_select_item_cb(void *pUserData,
                                                        g_pSortCtrlHandle->nCurrListSortType);
 
                mp_sort_ctrl_set_sort_state(g_pSortCtrlHandle->nCurrListSortType);
-
-               ListSortCtrlCbFunc fFunc =
-                       g_pSortCtrlHandle->ListSortCtrlUserCbFunc;
-               mp_sort_ctrl_hide();
-
-               if (fFunc) {
-                       fFunc();
-               }
        }
 }
 
@@ -326,8 +337,7 @@ static void __mp_sort_ctrl_realized(void *data, Evas_Object * obj,
        Elm_Object_Item *pItem = elm_genlist_last_item_get(obj);
 
        if (pItem) {
-               elm_object_item_signal_emit(pItem, "elm,state,bottomline,hide",
-                                                                       "");
+               elm_object_item_signal_emit(pItem, "elm,state,bottomline,hide", "elm");
        }
 }
 
@@ -375,7 +385,7 @@ bool mp_sort_ctrl_show(ListSortCtrlCbFunc pListSortCtrlCb)
 
        g_pSortCtrlHandle->pPopUpHandle =
                elm_popup_add(mp_util_get_main_window_handle());
-       elm_object_style_set(g_pSortCtrlHandle->pPopUpHandle, "theme_bg");
+       elm_popup_align_set(g_pSortCtrlHandle->pPopUpHandle, ELM_NOTIFY_ALIGN_FILL, 0.5);
 
        eext_object_event_callback_add(g_pSortCtrlHandle->pPopUpHandle,
                                                                   EEXT_CALLBACK_BACK,
@@ -387,37 +397,36 @@ bool mp_sort_ctrl_show(ListSortCtrlCbFunc pListSortCtrlCb)
                                                                   mp_util_get_main_window_handle(),
                                                                   "rotation,changed",
                                                                   __mp_sort_ctrl_rotate_cb, NULL);
+       evas_object_smart_callback_add(g_pSortCtrlHandle->pPopUpHandle, "dismissed", __mp_sort_ctrl_popup_dismissed_cb, NULL);
 
-       elm_object_domain_translatable_part_text_set(g_pSortCtrlHandle->
-                                                                                                pPopUpHandle,
+       elm_object_domain_translatable_part_text_set(g_pSortCtrlHandle->pPopUpHandle,
                                                                                                 "title,text",
                                                                                                 VIDEOS_STRING,
                                                                                                 VIDEOS_SORTBYPOP_HEADER_SORT_BY_IDS);
-       evas_object_size_hint_weight_set(g_pSortCtrlHandle->pPopUpHandle,
-                                                                        EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+       evas_object_size_hint_weight_set(g_pSortCtrlHandle->pPopUpHandle, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
        evas_object_event_callback_add(g_pSortCtrlHandle->pPopUpHandle,
                                                                   EVAS_CALLBACK_MOUSE_UP,
                                                                   __mp_sort_ctrl_mouse_up_cb, NULL);
 
+       g_pSortCtrlHandle->pBox = elm_box_add(g_pSortCtrlHandle->pPopUpHandle);
+       evas_object_size_hint_weight_set(g_pSortCtrlHandle->pBox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+
        MP_DEL_ITC(g_pSortCtrlHandle->stListSortItc);
        g_pSortCtrlHandle->stListSortItc = elm_genlist_item_class_new();
        //  Set item of Genlist.
-       g_pSortCtrlHandle->stListSortItc->item_style = "default";       //"1text.1icon.2/popup";
-       g_pSortCtrlHandle->stListSortItc->func.text_get =
-               (void *) mp_sort_ctrl_get_label_of_genlist_cb;
-       g_pSortCtrlHandle->stListSortItc->func.content_get =
-               (void *) mp_sort_ctrl_get_icon_of_genlist_cb;
+       g_pSortCtrlHandle->stListSortItc->item_style = "1line";
+       g_pSortCtrlHandle->stListSortItc->func.text_get = mp_sort_ctrl_get_label_of_genlist_cb;
+       g_pSortCtrlHandle->stListSortItc->func.content_get = mp_sort_ctrl_get_icon_of_genlist_cb;
        g_pSortCtrlHandle->stListSortItc->func.state_get = NULL;
        g_pSortCtrlHandle->stListSortItc->func.del = NULL;
 
        // Create genlist handle
-       g_pSortCtrlHandle->pGenList =
-               elm_genlist_add(g_pSortCtrlHandle->pPopUpHandle);
-       evas_object_size_hint_weight_set(g_pSortCtrlHandle->pGenList,
-                                                                        EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(g_pSortCtrlHandle->pGenList,
-                                                                       EVAS_HINT_FILL, EVAS_HINT_FILL);
+       g_pSortCtrlHandle->pGenList = elm_genlist_add(g_pSortCtrlHandle->pBox);
+       evas_object_size_hint_weight_set(g_pSortCtrlHandle->pGenList, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(g_pSortCtrlHandle->pGenList, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
        evas_object_smart_callback_add(g_pSortCtrlHandle->pGenList,
                                                                   "language,changed",
@@ -426,8 +435,7 @@ bool mp_sort_ctrl_show(ListSortCtrlCbFunc pListSortCtrlCb)
        evas_object_smart_callback_add(g_pSortCtrlHandle->pGenList, "realized",
                                                                   __mp_sort_ctrl_realized, NULL);
 
-       g_pSortCtrlHandle->pGroupRadio =
-               elm_radio_add(g_pSortCtrlHandle->pGenList);
+       g_pSortCtrlHandle->pGroupRadio = elm_radio_add(g_pSortCtrlHandle->pGenList);
 
        mp_sort_ctrl_get_sort_state();
 
@@ -446,22 +454,14 @@ bool mp_sort_ctrl_show(ListSortCtrlCbFunc pListSortCtrlCb)
        nListCount++;
        g_pSortCtrlHandle->nListCount = nListCount;
 
-       g_pSortCtrlHandle->pBox = elm_box_add(g_pSortCtrlHandle->pPopUpHandle);
+       evas_object_show(g_pSortCtrlHandle->pGenList);
+       elm_box_pack_end(g_pSortCtrlHandle->pBox, g_pSortCtrlHandle->pGenList);
 
-       mp_widget_ctrl_set_popup_min_size(g_pSortCtrlHandle->pBox,
-                                                                         g_pSortCtrlHandle->nListCount,
-                                                                         VIDEOS_POPUP_114);
-       evas_object_size_hint_weight_set(g_pSortCtrlHandle->pBox,
-                                                                        EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(g_pSortCtrlHandle->pBox,
-                                                                       EVAS_HINT_FILL, EVAS_HINT_FILL);
+       // Height of one genlist ITEM is 72unit
+       evas_object_size_hint_min_set(g_pSortCtrlHandle->pBox, -1, nListCount*72);
 
-       elm_box_pack_end(g_pSortCtrlHandle->pBox, g_pSortCtrlHandle->pGenList);
-       elm_object_content_set(g_pSortCtrlHandle->pPopUpHandle,
-                                                  g_pSortCtrlHandle->pBox);
+       elm_object_content_set(g_pSortCtrlHandle->pPopUpHandle, g_pSortCtrlHandle->pBox);
 
-       evas_object_show(g_pSortCtrlHandle->pBox);
-       evas_object_show(g_pSortCtrlHandle->pGenList);
        evas_object_show(g_pSortCtrlHandle->pPopUpHandle);
 
        return TRUE;