From d5d7c553021026dc870aa6ad79179b351674e7e0 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 1 Sep 2020 12:25:01 +0100 Subject: [PATCH] elm icon/thumb - fix handling of a wider range of video extns the xetension list for video files was far too small. it menas it missed many kinds of video files. this fixes that to have a much wider range/list. @fix --- src/lib/elementary/elm_icon.c | 13 ++++++++++--- src/lib/elementary/elm_thumb.c | 13 ++++++++++--- src/lib/elementary/elm_thumb_legacy.h | 6 +++--- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c index c6b626a410..b6aeff0135 100644 --- a/src/lib/elementary/elm_icon.c +++ b/src/lib/elementary/elm_icon.c @@ -85,9 +85,16 @@ _icon_thumb_display(Elm_Icon_Data *sd) int prefix_size; const char **ext, *ptr; static const char *extensions[] = - { - ".avi", ".mp4", ".ogv", ".mov", ".mpg", ".wmv", NULL - }; + { + ".asf", ".avi", ".bdm", ".bdmv", ".clpi", ".cpi", ".dv", ".fla", + ".flv", ".m1v", ".m2t", ".m2v", ".m4v", ".mkv", ".mov", ".mp2", + ".mp2ts", ".mp4", ".mpe", ".mpeg", ".mpg", ".mpl", ".mpls", ".mts", + ".mxf", ".nut", ".nuv", ".ogg", ".ogm", ".ogv", ".qt", ".rm", ".rmj", + ".rmm", ".rms", ".rmvb", ".rmx", ".rv", ".swf", ".ts", ".weba", + ".webm", ".wmv", ".3g2", ".3gp", ".3gp2", ".3gpp", ".3gpp2", ".3p2", + ".264", + NULL + }; prefix_size = eina_stringshare_strlen(sd->thumb.file.path) - 4; if (prefix_size >= 0) diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c index 555ff01635..f883e183ed 100644 --- a/src/lib/elementary/elm_thumb.c +++ b/src/lib/elementary/elm_thumb.c @@ -670,9 +670,16 @@ _elm_thumb_efl_file_load(Eo *obj, Elm_Thumb_Data *sd) int prefix_size; const char **ext, *ptr; static const char *extensions[] = - { - ".avi", ".mp4", ".ogv", ".mov", ".mpg", ".wmv", NULL - }; + { + ".asf", ".avi", ".bdm", ".bdmv", ".clpi", ".cpi", ".dv", ".fla", + ".flv", ".m1v", ".m2t", ".m2v", ".m4v", ".mkv", ".mov", ".mp2", + ".mp2ts", ".mp4", ".mpe", ".mpeg", ".mpg", ".mpl", ".mpls", ".mts", + ".mxf", ".nut", ".nuv", ".ogg", ".ogm", ".ogv", ".qt", ".rm", ".rmj", + ".rmm", ".rms", ".rmvb", ".rmx", ".rv", ".swf", ".ts", ".weba", + ".webm", ".wmv", ".3g2", ".3gp", ".3gp2", ".3gpp", ".3gpp2", ".3p2", + ".264", + NULL + }; if (efl_file_loaded_get(obj)) return 0; prefix_size = eina_stringshare_strlen(sd->file) - 4; diff --git a/src/lib/elementary/elm_thumb_legacy.h b/src/lib/elementary/elm_thumb_legacy.h index 48fcc1a262..4a8965732e 100644 --- a/src/lib/elementary/elm_thumb_legacy.h +++ b/src/lib/elementary/elm_thumb_legacy.h @@ -28,9 +28,9 @@ EAPI Evas_Object *elm_thumb_add(Evas_Object *parent); * * Set the file that will be used as thumbnail @b source. * - * The file can be an image or a video (in that case, acceptable - * extensions are: avi, mp4, ogv, mov, mpg and wmv). To start the - * video animation, use the function elm_thumb_animate(). + * The file can be an image or a video (in that case extension will e used + * to guess if it is a video or not). To start the video animation, use the + * function elm_thumb_animate(). * * @see elm_thumb_file_get() * @see elm_thumb_reload()