diff options
| author | David King <amigadave@amigadave.com> | 2012-01-23 19:56:45 +0000 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2012-01-23 20:01:19 +0000 |
| commit | 2b16b8012e488cfa56d9dd353b5384ad0844680e (patch) | |
| tree | 68224184fbdee729d3723d5bce9442bbf1651ca9 /src/thumbview | |
| parent | 3ad1061d6646ec8296848d5166846841ace5b6a9 (diff) | |
| download | cheese-2b16b8012e488cfa56d9dd353b5384ad0844680e.tar.gz | |
Keep generating thumbnails for Theora videos
Diffstat (limited to 'src/thumbview')
| -rw-r--r-- | src/thumbview/cheese-thumb-view.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c index 0d99aa13..5c06ff3d 100644 --- a/src/thumbview/cheese-thumb-view.c +++ b/src/thumbview/cheese-thumb-view.c @@ -33,8 +33,10 @@ #include "cheese-thumb-view.h" -#define THUMB_VIEW_MINIMUM_WIDTH 140 -#define THUMB_VIEW_MINIMUM_HEIGHT 100 +const guint THUMB_VIEW_MINIMUM_WIDTH = 140; +const guint THUMB_VIEW_MINIMUM_HEIGHT = 100; + +const gchar CHEESE_OLD_VIDEO_NAME_SUFFIX[] = ".ogv"; #define CHEESE_THUMB_VIEW_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), CHEESE_TYPE_THUMB_VIEW, CheeseThumbViewPrivate)) @@ -200,7 +202,9 @@ cheese_thumb_view_append_item (CheeseThumbView *thumb_view, GFile *file) filename = g_file_get_path (file); - if (!(g_str_has_suffix (filename, CHEESE_PHOTO_NAME_SUFFIX)) && !(g_str_has_suffix (filename, CHEESE_VIDEO_NAME_SUFFIX))) + if (!(g_str_has_suffix (filename, CHEESE_PHOTO_NAME_SUFFIX)) + && !(g_str_has_suffix (filename, CHEESE_VIDEO_NAME_SUFFIX)) + && !(g_str_has_suffix (filename, CHEESE_OLD_VIDEO_NAME_SUFFIX))) { g_free (filename); return; @@ -518,7 +522,8 @@ cheese_thumb_view_fill (CheeseThumbView *thumb_view) /* read videos from the vid directory */ while ((name = g_dir_read_name (dir_videos))) { - if (!(g_str_has_suffix (name, CHEESE_VIDEO_NAME_SUFFIX))) + if (!(g_str_has_suffix (name, CHEESE_VIDEO_NAME_SUFFIX)) + && !(g_str_has_suffix (name, CHEESE_OLD_VIDEO_NAME_SUFFIX))) continue; filename = g_build_filename (path_videos, name, NULL); |