enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

There is no more Ethumb_File. 

Now the file path and thumbnail path are stored in the Ethumb structure.



SVN revision: 40280
This commit is contained in:
Rafael Antognolli 2009-04-21 23:08:17 +00:00
parent e4035bc52f
commit 8511aa2bd9
7 changed files with 118 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
legacy/ethumb/src/bin/ethumb.c
View File

@ -129,7 +129,7 @@ const Ecore_Getopt optdesc = {
}; };
static void static void
_finished_thumb(Ethumb_File *ef, void *data) _finished_thumb(Ethumb *e, void *data)
{ {
ecore_main_loop_quit(); ecore_main_loop_quit();
} }
@ -138,7 +138,6 @@ int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
Ethumb *e; Ethumb *e;
Ethumb_File *ef;
Eina_Bool quit_option = 0; Eina_Bool quit_option = 0;
Eina_Rectangle geometry = {-1, -1, -1, -1}; Eina_Rectangle geometry = {-1, -1, -1, -1};
unsigned int format = 0, aspect = 0; unsigned int format = 0, aspect = 0;
@ -197,8 +196,6 @@ main(int argc, char *argv[])
break; break;
} }
ef = NULL;
e = ethumb_new(); e = ethumb_new();
ethumb_thumb_format_set(e, format); ethumb_thumb_format_set(e, format);
@ -220,22 +217,22 @@ main(int argc, char *argv[])
ethumb_document_page_set(e, page); ethumb_document_page_set(e, page);
if (r && arg_index < argc) if (r && arg_index < argc)
ef = ethumb_file_new(e, argv[arg_index++], src_key); r = ethumb_file_set(e, argv[arg_index++], src_key);
if (ef && arg_index < argc) if (r && arg_index < argc)
thumb_path = argv[arg_index++]; thumb_path = argv[arg_index++];
if (ef && arg_index < argc) if (r && arg_index < argc)
thumb_key = argv[arg_index]; thumb_key = argv[arg_index];
if (ef) if (r)
{ {
ethumb_file_thumb_path_set(ef, thumb_path, thumb_key); ethumb_file_thumb_path_set(e, thumb_path, thumb_key);
r = ethumb_file_generate(ef, _finished_thumb, NULL); r = ethumb_file_generate(e, _finished_thumb, NULL);
} }
if (r && !quit_option) if (r && !quit_option)
ecore_main_loop_begin(); ecore_main_loop_begin();
ethumb_file_free(ef); ethumb_file_free(e);
ethumb_free(e); ethumb_free(e);
ecore_shutdown(); ecore_shutdown();

182
legacy/ethumb/src/lib/Ethumb.c
View File

@ -509,29 +509,24 @@ ethumb_document_page_set(Ethumb *e, int page)
e->document.page = page; e->document.page = page;
} }
EAPI Ethumb_File * EAPI int
ethumb_file_new(Ethumb *e, const char *path, const char *key) ethumb_file_set(Ethumb *e, const char *path, const char *key)
{ {
Ethumb_File *ef;
EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
if (access(path, R_OK)) if (access(path, R_OK))
{ {
ERR("couldn't access file \"%s\"\n", path); ERR("couldn't access file \"%s\"\n", path);
return NULL; return 0;
} }
ef = calloc(1, sizeof(Ethumb_File)); e->src_path = eina_stringshare_add(path);
EINA_SAFETY_ON_NULL_RETURN_VAL(ef, NULL);
ef->ethumb = e;
ef->src_path = eina_stringshare_add(path);
if (key) if (key)
ef->src_key = eina_stringshare_add(key); e->src_key = eina_stringshare_add(key);
return ef; return 1;
} }
static const char * static const char *
@ -581,12 +576,11 @@ _ethumb_file_check_fdo(Ethumb *e)
} }
static const char * static const char *
_ethumb_file_generate_custom_category(Ethumb_File *ef) _ethumb_file_generate_custom_category(Ethumb *e)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
const char *aspect, *format; const char *aspect, *format;
const char *frame; const char *frame;
Ethumb *e = ef->ethumb;
if (e->aspect == ETHUMB_THUMB_KEEP_ASPECT) if (e->aspect == ETHUMB_THUMB_KEEP_ASPECT)
aspect = "keep_aspect"; aspect = "keep_aspect";
@ -612,18 +606,16 @@ _ethumb_file_generate_custom_category(Ethumb_File *ef)
} }
static void static void
_ethumb_file_generate_path(Ethumb_File *ef) _ethumb_file_generate_path(Ethumb *e)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
char *fullname; char *fullname;
const char *hash; const char *hash;
const char *thumb_dir, *category; const char *thumb_dir, *category;
const char *ext; const char *ext;
Ethumb *e;
int fdo_format; int fdo_format;
e = ef->ethumb;
fdo_format = _ethumb_file_check_fdo(e); fdo_format = _ethumb_file_check_fdo(e);
if (e->thumb_dir) if (e->thumb_dir)
@ -634,7 +626,7 @@ _ethumb_file_generate_path(Ethumb_File *ef)
if (e->category) if (e->category)
category = eina_stringshare_ref(e->category); category = eina_stringshare_ref(e->category);
else if (!fdo_format) else if (!fdo_format)
category = _ethumb_file_generate_custom_category(ef); category = _ethumb_file_generate_custom_category(e);
else else
{ {
if (e->tw == THUMB_SIZE_NORMAL) if (e->tw == THUMB_SIZE_NORMAL)
@ -648,11 +640,11 @@ _ethumb_file_generate_path(Ethumb_File *ef)
else else
ext = "jpg"; ext = "jpg";
fullname = ecore_file_realpath(ef->src_path); fullname = ecore_file_realpath(e->src_path);
hash = _ethumb_generate_hash(fullname); hash = _ethumb_generate_hash(fullname);
snprintf(buf, sizeof(buf), "%s/%s/%s.%s", thumb_dir, category, hash, ext); snprintf(buf, sizeof(buf), "%s/%s/%s.%s", thumb_dir, category, hash, ext);
free(fullname); free(fullname);
eina_stringshare_replace(&ef->thumb_path, buf); eina_stringshare_replace(&e->thumb_path, buf);
eina_stringshare_del(thumb_dir); eina_stringshare_del(thumb_dir);
eina_stringshare_del(category); eina_stringshare_del(category);
@ -660,49 +652,47 @@ _ethumb_file_generate_path(Ethumb_File *ef)
} }
EAPI void EAPI void
ethumb_file_free(Ethumb_File *ef) ethumb_file_free(Ethumb *e)
{ {
if (!ef) EINA_SAFETY_ON_NULL_RETURN(e);
return;
eina_stringshare_del(ef->src_path); eina_stringshare_replace(&e->src_path, NULL);
eina_stringshare_del(ef->src_key); eina_stringshare_replace(&e->src_key, NULL);
eina_stringshare_del(ef->thumb_path); eina_stringshare_replace(&e->thumb_path, NULL);
eina_stringshare_del(ef->thumb_key); eina_stringshare_replace(&e->thumb_key, NULL);
free(ef);
} }
EAPI void EAPI void
ethumb_file_thumb_path_set(Ethumb_File *ef, const char *path, const char *key) ethumb_file_thumb_path_set(Ethumb *e, const char *path, const char *key)
{ {
char *real_path; char *real_path;
char buf[PATH_MAX]; char buf[PATH_MAX];
EINA_SAFETY_ON_NULL_RETURN(ef); EINA_SAFETY_ON_NULL_RETURN(e);
real_path = realpath(path, buf); real_path = realpath(path, buf);
if (!path) if (!path)
{ {
eina_stringshare_replace(&ef->thumb_path, NULL); eina_stringshare_replace(&e->thumb_path, NULL);
eina_stringshare_replace(&ef->thumb_key, NULL); eina_stringshare_replace(&e->thumb_key, NULL);
} }
else if (errno == ENOENT || errno == ENOTDIR || real_path) else if (errno == ENOENT || errno == ENOTDIR || real_path)
{ {
eina_stringshare_replace(&ef->thumb_path, buf); eina_stringshare_replace(&e->thumb_path, buf);
eina_stringshare_replace(&ef->thumb_key, key); eina_stringshare_replace(&e->thumb_key, key);
} }
else else
ERR("could not set thumbnail path: %s\n", strerror(errno)); ERR("could not set thumbnail path: %s\n", strerror(errno));
} }
EAPI const char * EAPI const char *
ethumb_file_thumb_path_get(Ethumb_File *ef) ethumb_file_thumb_path_get(Ethumb *e)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(ef, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL);
if (!ef->thumb_path) if (!e->thumb_path)
_ethumb_file_generate_path(ef); _ethumb_file_generate_path(e);
return ef->thumb_path; return e->thumb_path;
} }
void void
@ -748,17 +738,16 @@ ethumb_calculate_fill(Ethumb *e, int iw, int ih, int *fx, int *fy, int *fw, int
} }
static int static int
_ethumb_plugin_generate(Ethumb_File *ef) _ethumb_plugin_generate(Ethumb *e)
{ {
const char *ext; const char *ext;
Ethumb_Plugin *plugin; Ethumb_Plugin *plugin;
Ethumb *e;
int r; int r;
ext = strrchr(ef->src_path, '.'); ext = strrchr(e->src_path, '.');
if (!ext) if (!ext)
{ {
ERR("could not get extension for file \"%s\"\n", ef->src_path); ERR("could not get extension for file \"%s\"\n", e->src_path);
return 0; return 0;
} }
@ -769,33 +758,30 @@ _ethumb_plugin_generate(Ethumb_File *ef)
return 0; return 0;
} }
e = ef->ethumb;
if (e->frame) if (e->frame)
evas_object_hide(e->frame->edje); evas_object_hide(e->frame->edje);
else else
evas_object_hide(e->img); evas_object_hide(e->img);
r = plugin->generate_thumb(ef); r = plugin->generate_thumb(e);
return r; return r;
} }
int int
ethumb_plugin_image_resize(Ethumb_File *ef, int w, int h) ethumb_plugin_image_resize(Ethumb *e, int w, int h)
{ {
Ethumb *eth;
Evas_Object *img; Evas_Object *img;
eth = ef->ethumb; img = e->img;
img = eth->img;
if (eth->frame) if (e->frame)
{ {
edje_extern_object_min_size_set(img, w, h); edje_extern_object_min_size_set(img, w, h);
edje_extern_object_max_size_set(img, w, h); edje_extern_object_max_size_set(img, w, h);
edje_object_calc_force(eth->frame->edje); edje_object_calc_force(e->frame->edje);
evas_object_move(eth->frame->edje, 0, 0); evas_object_move(e->frame->edje, 0, 0);
evas_object_resize(eth->frame->edje, w, h); evas_object_resize(e->frame->edje, w, h);
} }
else else
{ {
@ -803,35 +789,34 @@ ethumb_plugin_image_resize(Ethumb_File *ef, int w, int h)
evas_object_resize(img, w, h); evas_object_resize(img, w, h);
} }
evas_object_image_size_set(eth->o, w, h); evas_object_image_size_set(e->o, w, h);
ecore_evas_resize(eth->sub_ee, w, h); ecore_evas_resize(e->sub_ee, w, h);
ef->w = w; e->rw = w;
ef->h = h; e->rh = h;
return 1; return 1;
} }
int int
ethumb_image_save(Ethumb_File *ef) ethumb_image_save(Ethumb *e)
{ {
int r; int r;
char *dname; char *dname;
Ethumb *eth = ef->ethumb;
evas_damage_rectangle_add(eth->sub_e, 0, 0, ef->w, ef->h); evas_damage_rectangle_add(e->sub_e, 0, 0, e->rw, e->rh);
evas_render(eth->sub_e); evas_render(e->sub_e);
if (!ef->thumb_path) if (!e->thumb_path)
_ethumb_file_generate_path(ef); _ethumb_file_generate_path(e);
if (!ef->thumb_path) if (!e->thumb_path)
{ {
ERR("could not create file path...\n"); ERR("could not create file path...\n");
return 0; return 0;
} }
dname = ecore_file_dir_get(ef->thumb_path); dname = ecore_file_dir_get(e->thumb_path);
r = ecore_file_mkpath(dname); r = ecore_file_mkpath(dname);
free(dname); free(dname);
if (!r) if (!r)
@ -840,7 +825,7 @@ ethumb_image_save(Ethumb_File *ef)
return 0; return 0;
} }
r = evas_object_image_save(eth->o, ef->thumb_path, ef->thumb_key, r = evas_object_image_save(e->o, e->thumb_path, e->thumb_key,
"quality=85"); "quality=85");
if (!r) if (!r)
@ -853,33 +838,31 @@ ethumb_image_save(Ethumb_File *ef)
} }
static int static int
_ethumb_image_load(Ethumb_File *ef) _ethumb_image_load(Ethumb *e)
{ {
Ethumb *eth;
int error; int error;
Evas_Coord w, h, ww, hh, fx, fy, fw, fh; Evas_Coord w, h, ww, hh, fx, fy, fw, fh;
Evas_Object *img; Evas_Object *img;
eth = ef->ethumb; img = e->img;
img = eth->img;
if (eth->frame) if (e->frame)
evas_object_hide(eth->frame->edje); evas_object_hide(e->frame->edje);
else else
evas_object_hide(img); evas_object_hide(img);
evas_object_image_file_set(img, NULL, NULL); evas_object_image_file_set(img, NULL, NULL);
evas_object_image_load_size_set(img, eth->tw, eth->th); evas_object_image_load_size_set(img, e->tw, e->th);
evas_object_image_file_set(img, ef->src_path, ef->src_key); evas_object_image_file_set(img, e->src_path, e->src_key);
if (eth->frame) if (e->frame)
evas_object_show(eth->frame->edje); evas_object_show(e->frame->edje);
else else
evas_object_show(img); evas_object_show(img);
error = evas_object_image_load_error_get(img); error = evas_object_image_load_error_get(img);
if (error != EVAS_LOAD_ERROR_NONE) if (error != EVAS_LOAD_ERROR_NONE)
{ {
ERR("could not load image '%s': %d\n", ef->src_path, error); ERR("could not load image '%s': %d\n", e->src_path, error);
return 0; return 0;
} }
@ -887,15 +870,15 @@ _ethumb_image_load(Ethumb_File *ef)
if ((w <= 0) || (h <= 0)) if ((w <= 0) || (h <= 0))
return 0; return 0;
ethumb_calculate_aspect(eth, w, h, &ww, &hh); ethumb_calculate_aspect(e, w, h, &ww, &hh);
if (eth->frame) if (e->frame)
{ {
edje_extern_object_min_size_set(img, ww, hh); edje_extern_object_min_size_set(img, ww, hh);
edje_extern_object_max_size_set(img, ww, hh); edje_extern_object_max_size_set(img, ww, hh);
edje_object_calc_force(eth->frame->edje); edje_object_calc_force(e->frame->edje);
evas_object_move(eth->frame->edje, 0, 0); evas_object_move(e->frame->edje, 0, 0);
evas_object_resize(eth->frame->edje, ww, hh); evas_object_resize(e->frame->edje, ww, hh);
} }
else else
{ {
@ -903,14 +886,14 @@ _ethumb_image_load(Ethumb_File *ef)
evas_object_resize(img, ww, hh); evas_object_resize(img, ww, hh);
} }
ethumb_calculate_fill(eth, w, h, &fx, &fy, &fw, &fh); ethumb_calculate_fill(e, w, h, &fx, &fy, &fw, &fh);
evas_object_image_fill_set(img, fx, fy, fw, fh); evas_object_image_fill_set(img, fx, fy, fw, fh);
evas_object_image_size_set(eth->o, ww, hh); evas_object_image_size_set(e->o, ww, hh);
ecore_evas_resize(eth->sub_ee, ww, hh); ecore_evas_resize(e->sub_ee, ww, hh);
ef->w = ww; e->rw = ww;
ef->h = hh; e->rh = hh;
return 1; return 1;
} }
@ -918,10 +901,9 @@ _ethumb_image_load(Ethumb_File *ef)
static int static int
_ethumb_finished_idler_cb(void *data) _ethumb_finished_idler_cb(void *data)
{ {
Ethumb_File *ef = data; Ethumb *e = data;
Ethumb *e = ef->ethumb;
e->finished_cb(ef, e->cb_data); e->finished_cb(e, e->cb_data);
e->finished_idler = NULL; e->finished_idler = NULL;
e->finished_cb = NULL; e->finished_cb = NULL;
e->cb_data = NULL; e->cb_data = NULL;
@ -930,26 +912,24 @@ _ethumb_finished_idler_cb(void *data)
} }
void void
ethumb_finished_callback_call(Ethumb_File *ef) ethumb_finished_callback_call(Ethumb *e)
{ {
Ethumb *e = ef->ethumb; EINA_SAFETY_ON_NULL_RETURN(e);
if (e->finished_idler) if (e->finished_idler)
ecore_idler_del(e->finished_idler); ecore_idler_del(e->finished_idler);
e->finished_idler = ecore_idler_add(_ethumb_finished_idler_cb, ef); e->finished_idler = ecore_idler_add(_ethumb_finished_idler_cb, e);
} }
EAPI int EAPI int
ethumb_file_generate(Ethumb_File *ef, ethumb_generate_callback_t finished_cb, void *data) ethumb_file_generate(Ethumb *e, ethumb_generate_callback_t finished_cb, void *data)
{ {
int r; int r;
Ethumb *e;
EINA_SAFETY_ON_NULL_RETURN_VAL(ef, 0); EINA_SAFETY_ON_NULL_RETURN_VAL(e, 0);
EINA_SAFETY_ON_NULL_RETURN_VAL(e->src_path, 0);
EINA_SAFETY_ON_NULL_RETURN_VAL(finished_cb, 0); EINA_SAFETY_ON_NULL_RETURN_VAL(finished_cb, 0);
e = ef->ethumb;
if (e->finished_idler) if (e->finished_idler)
{ {
ERR("thumbnail generation already in progress.\n"); ERR("thumbnail generation already in progress.\n");
@ -958,19 +938,19 @@ ethumb_file_generate(Ethumb_File *ef, ethumb_generate_callback_t finished_cb, vo
e->finished_cb = finished_cb; e->finished_cb = finished_cb;
e->cb_data = data; e->cb_data = data;
r = _ethumb_plugin_generate(ef); r = _ethumb_plugin_generate(e);
if (r) if (r)
return r; return r;
if (!_ethumb_image_load(ef)) if (!_ethumb_image_load(e))
{ {
ERR("could not load input image.\n"); ERR("could not load input image.\n");
return 0; return 0;
} }
r = ethumb_image_save(ef); r = ethumb_image_save(e);
if (r && finished_cb) if (r && finished_cb)
ethumb_finished_callback_call(ef); ethumb_finished_callback_call(e);
return r; return r;
} }

13
legacy/ethumb/src/lib/Ethumb.h
View File

@ -66,8 +66,7 @@ typedef enum _Ethumb_Thumb_Aspect Ethumb_Thumb_Aspect;
typedef struct _Ethumb_Frame Ethumb_Frame; typedef struct _Ethumb_Frame Ethumb_Frame;
typedef struct _Ethumb Ethumb; typedef struct _Ethumb Ethumb;
typedef struct _Ethumb_File Ethumb_File; typedef void (*ethumb_generate_callback_t)(Ethumb *e, void *data);
typedef void (*ethumb_generate_callback_t)(Ethumb_File *ef, void *data);
EAPI int ethumb_init(void); EAPI int ethumb_init(void);
EAPI int ethumb_shutdown(void); EAPI int ethumb_shutdown(void);
@ -100,11 +99,11 @@ EAPI const char * ethumb_thumb_category_get(Ethumb *e) EINA_WARN_UNUSED_RESULT E
EAPI void ethumb_video_time_set(Ethumb *e, float time) EINA_ARG_NONNULL(1); EAPI void ethumb_video_time_set(Ethumb *e, float time) EINA_ARG_NONNULL(1);
EAPI void ethumb_document_page_set(Ethumb *e, int page) EINA_ARG_NONNULL(1); EAPI void ethumb_document_page_set(Ethumb *e, int page) EINA_ARG_NONNULL(1);
EAPI Ethumb_File * ethumb_file_new(Ethumb *e, const char *path, const char *key) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); EAPI int ethumb_file_set(Ethumb *e, const char *path, const char *key) EINA_ARG_NONNULL(1, 2);
EAPI void ethumb_file_free(Ethumb_File *ef); EAPI void ethumb_file_free(Ethumb *e) EINA_ARG_NONNULL(1);
EAPI void ethumb_file_thumb_path_set(Ethumb_File *ef, const char *path, const char *key) EINA_ARG_NONNULL(1); EAPI void ethumb_file_thumb_path_set(Ethumb *e, const char *path, const char *key) EINA_ARG_NONNULL(1);
EAPI const char * ethumb_file_thumb_path_get(Ethumb_File *ef) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; EAPI const char * ethumb_file_thumb_path_get(Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
EAPI int ethumb_file_generate(Ethumb_File *ef, ethumb_generate_callback_t finished_cb, void *data) EINA_ARG_NONNULL(1, 2); EAPI int ethumb_file_generate(Ethumb *e, ethumb_generate_callback_t finished_cb, void *data) EINA_ARG_NONNULL(1, 2);
#ifdef __cplusplus #ifdef __cplusplus
} }

8
legacy/ethumb/src/lib/Ethumb_Plugin.h
View File

@ -10,14 +10,14 @@ typedef struct _Ethumb_Plugin Ethumb_Plugin;
struct _Ethumb_Plugin struct _Ethumb_Plugin
{ {
const char **extensions; const char **extensions;
int (*generate_thumb)(Ethumb_File *); int (*generate_thumb)(Ethumb *);
void (*shutdown)(Ethumb_Plugin *); void (*shutdown)(Ethumb_Plugin *);
}; };
void ethumb_calculate_aspect(Ethumb *e, int iw, int ih, int *w, int *h); void ethumb_calculate_aspect(Ethumb *e, int iw, int ih, int *w, int *h);
void ethumb_calculate_fill(Ethumb *e, int iw, int ih, int *fx, int *fy, int *fw, int *fh); void ethumb_calculate_fill(Ethumb *e, int iw, int ih, int *fx, int *fy, int *fw, int *fh);
int ethumb_plugin_image_resize(Ethumb_File *ef, int w, int h); int ethumb_plugin_image_resize(Ethumb *e, int w, int h);
int ethumb_image_save(Ethumb_File *ef); int ethumb_image_save(Ethumb *e);
void ethumb_finished_callback_call(Ethumb_File *ef); void ethumb_finished_callback_call(Ethumb *e);
#endif /* _ETHUMB_PLUGIN_H_ */ #endif /* _ETHUMB_PLUGIN_H_ */

15
legacy/ethumb/src/lib/ethumb_private.h
View File

@ -19,6 +19,11 @@ struct _Ethumb
int format; int format;
int aspect; int aspect;
float crop_x, crop_y; float crop_x, crop_y;
const char *src_path;
const char *src_key;
const char *thumb_path;
const char *thumb_key;
int rw, rh;
struct struct
{ {
double time; double time;
@ -36,14 +41,4 @@ struct _Ethumb
void *cb_data; void *cb_data;
}; };
struct _Ethumb_File
{
Ethumb *ethumb;
const char *src_path;
const char *src_key;
const char *thumb_path;
const char *thumb_key;
int w, h;
};
#endif /* __ETHUMB_PRIVATE_H__ */ #endif /* __ETHUMB_PRIVATE_H__ */

16
legacy/ethumb/src/plugins/emotion/emotion.c
View File

@ -18,30 +18,28 @@ _shutdown(Ethumb_Plugin *plugin)
static void static void
_frame_resized_cb(void *data, Evas_Object *o, void *event_info) _frame_resized_cb(void *data, Evas_Object *o, void *event_info)
{ {
Ethumb_File *ef = data; Ethumb *e = data;
Ethumb *e = ef->ethumb;
Evas_Coord ww, hh; Evas_Coord ww, hh;
Evas_Coord mw, mh; Evas_Coord mw, mh;
emotion_object_size_get(o, &mw, &mh); emotion_object_size_get(o, &mw, &mh);
ethumb_calculate_aspect(e, mw, mh, &ww, &hh); ethumb_calculate_aspect(e, mw, mh, &ww, &hh);
ethumb_plugin_image_resize(ef, ww, hh); ethumb_plugin_image_resize(e, ww, hh);
evas_object_resize(o, ww, hh); evas_object_resize(o, ww, hh);
evas_object_move(o, 0, 0); evas_object_move(o, 0, 0);
ethumb_image_save(ef); ethumb_image_save(e);
evas_object_smart_callback_del(o, "frame_resize", _frame_resized_cb); evas_object_smart_callback_del(o, "frame_resize", _frame_resized_cb);
emotion_object_play_set(o, 0); emotion_object_play_set(o, 0);
evas_object_del(o); evas_object_del(o);
ethumb_finished_callback_call(ef); ethumb_finished_callback_call(e);
} }
static int static int
_generate_thumb(Ethumb_File *ef) _generate_thumb(Ethumb *e)
{ {
Ethumb *e = ef->ethumb;
Evas_Object *o; Evas_Object *o;
int r; int r;
@ -55,11 +53,11 @@ _generate_thumb(Ethumb_File *ef)
return r; return r;
} }
emotion_object_file_set(o, ef->src_path); emotion_object_file_set(o, e->src_path);
emotion_object_position_set(o, e->video.time); emotion_object_position_set(o, e->video.time);
emotion_object_play_set(o, 1); emotion_object_play_set(o, 1);
evas_object_smart_callback_add(o, "frame_resize", _frame_resized_cb, ef); evas_object_smart_callback_add(o, "frame_resize", _frame_resized_cb, e);
evas_object_show(o); evas_object_show(o);

15
legacy/ethumb/src/plugins/epdf/epdf.c
View File

@ -15,9 +15,8 @@ _shutdown(Ethumb_Plugin *plugin)
} }
static int static int
_generate_thumb(Ethumb_File *ef) _generate_thumb(Ethumb *e)
{ {
Ethumb *e = ef->ethumb;
Epdf_Document *document; Epdf_Document *document;
Epdf_Page *page; Epdf_Page *page;
Evas_Object *o; Evas_Object *o;
@ -25,17 +24,17 @@ _generate_thumb(Ethumb_File *ef)
int fx, fy, fw, fh; int fx, fy, fw, fh;
int npages; int npages;
document = epdf_document_new(ef->src_path); document = epdf_document_new(e->src_path);
if (!document) if (!document)
{ {
fprintf(stderr, "ERROR: could not read document: %s\n", ef->src_path); fprintf(stderr, "ERROR: could not read document: %s\n", e->src_path);
return 0; return 0;
} }
page = epdf_page_new(document); page = epdf_page_new(document);
if (!page) if (!page)
{ {
fprintf(stderr, "ERROR: could not read document: %s\n", ef->src_path); fprintf(stderr, "ERROR: could not read document: %s\n", e->src_path);
epdf_document_delete(document); epdf_document_delete(document);
return 0; return 0;
} }
@ -45,7 +44,7 @@ _generate_thumb(Ethumb_File *ef)
epdf_page_page_set(page, e->document.page); epdf_page_page_set(page, e->document.page);
epdf_page_size_get(page, &w, &h); epdf_page_size_get(page, &w, &h);
ethumb_calculate_aspect(e, w, h, &ww, &hh); ethumb_calculate_aspect(e, w, h, &ww, &hh);
ethumb_plugin_image_resize(ef, ww, hh); ethumb_plugin_image_resize(e, ww, hh);
o = evas_object_image_add(e->sub_e); o = evas_object_image_add(e->sub_e);
epdf_page_render(page, o); epdf_page_render(page, o);
@ -56,13 +55,13 @@ _generate_thumb(Ethumb_File *ef)
evas_object_image_fill_set(o, fx, fy, fw, fh); evas_object_image_fill_set(o, fx, fy, fw, fh);
evas_object_show(o); evas_object_show(o);
ethumb_image_save(ef); ethumb_image_save(e);
evas_object_del(o); evas_object_del(o);
epdf_page_delete(page); epdf_page_delete(page);
epdf_document_delete(document); epdf_document_delete(document);
ethumb_finished_callback_call(ef); ethumb_finished_callback_call(e);
return 1; return 1;
} }